github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-26 22:08:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Switch placeholder to an SSH url if importing a private theme

Browse Source
This commit is contained in:
Rishabh 2018-12-20 17:01:38 +05:30
parent a06d310855
commit 3d2c72dd33
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/controllers/modals/admin-import-theme.js.es6
View File

@ -17,6 +17,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
checkPrivate: Ember.computed.match("uploadUrl", /^git/), checkPrivate: Ember.computed.match("uploadUrl", /^git/),
localFile: null, localFile: null,
uploadUrl: null, uploadUrl: null,
urlPlaceholder: "https://github.com/discourse/sample_theme",
@computed("loading", "remote", "uploadUrl", "local", "localFile") @computed("loading", "remote", "uploadUrl", "local", "localFile")
importDisabled(isLoading, isRemote, uploadUrl, isLocal, localFile) { importDisabled(isLoading, isRemote, uploadUrl, isLocal, localFile) {
@ -25,6 +26,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
@observes("privateChecked") @observes("privateChecked")
privateWasChecked() { 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"); const checked = this.get("privateChecked");
if (checked && !this._keyLoading) { if (checked && !this._keyLoading) {
this._keyLoading = true; this._keyLoading = true;

2
app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
View File

@ -15,7 +15,7 @@
{{#if remote}} {{#if remote}}
<div class="inputs"> <div class="inputs">
<div class='repo'> <div class='repo'>
{{input value=uploadUrl placeholder="https://github.com/discourse/sample_theme"}} {{input value=uploadUrl placeholder=urlPlaceholder}}
<span class="description">{{i18n 'admin.customize.theme.import_web_tip'}}</span> <span class="description">{{i18n 'admin.customize.theme.import_web_tip'}}</span>
</div> </div>
<div class='branch'> <div class='branch'>