From 3d2c72dd33d5d392d60b26b8d6860483e8440393 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Thu, 20 Dec 2018 17:01:38 +0530 Subject: [PATCH] UX: Switch placeholder to an SSH url if importing a private theme --- .../admin/controllers/modals/admin-import-theme.js.es6 | 5 +++++ .../javascripts/admin/templates/modal/admin-import-theme.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 index e69ada3b55b..75514b409b3 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 +++ b/app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6 @@ -17,6 +17,7 @@ export default Ember.Controller.extend(ModalFunctionality, { checkPrivate: Ember.computed.match("uploadUrl", /^git/), localFile: null, uploadUrl: null, + urlPlaceholder: "https://github.com/discourse/sample_theme", @computed("loading", "remote", "uploadUrl", "local", "localFile") importDisabled(isLoading, isRemote, uploadUrl, isLocal, localFile) { @@ -25,6 +26,10 @@ export default Ember.Controller.extend(ModalFunctionality, { @observes("privateChecked") privateWasChecked() { + this.get("privateChecked") + ? this.set("urlPlaceholder", "git@github.com:discourse/sample_theme.git") + : this.set("urlPlaceholder", "https://github.com/discourse/sample_theme"); + const checked = this.get("privateChecked"); if (checked && !this._keyLoading) { this._keyLoading = true; diff --git a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs index 9a42c1846b7..b5fbe4a0782 100644 --- a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs +++ b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs @@ -15,7 +15,7 @@ {{#if remote}}
- {{input value=uploadUrl placeholder="https://github.com/discourse/sample_theme"}} + {{input value=uploadUrl placeholder=urlPlaceholder}} {{i18n 'admin.customize.theme.import_web_tip'}}