IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Don't link to theme source unless it's http(s)

Browse Source
This commit is contained in:
David Taylor 2019-02-28 17:01:59 +00:00
parent 1cd64f68f1
commit e67474daf4
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
View File

@ -147,6 +147,10 @@ export default Ember.Controller.extend({
"scss" "scss"
); );
}, },
sourceIsHttp: Ember.computed.match(
"model.remote_theme.remote_url",
/^http(s)?:\/\//
),
actions: { actions: {
updateToLatest() { updateToLatest() {
this.set("updatingRemote", true); this.set("updatingRemote", true);

6
app/assets/javascripts/admin/templates/customize-themes-show.hbs
View File

@ -38,7 +38,11 @@
{{#if model.remote_theme}} {{#if model.remote_theme}}
{{#if model.remote_theme.remote_url}} {{#if model.remote_theme.remote_url}}
<a class="remote-url" href="{{model.remote_theme.remote_url}}">{{i18n "admin.customize.theme.source_url"}} {{d-icon "link"}}</a> {{#if sourceIsHttp}}
<a class="remote-url" href="{{model.remote_theme.remote_url}}">{{i18n "admin.customize.theme.source_url"}} {{d-icon "link"}}</a>
{{else}}
<div class="remote-url"><code>{{model.remote_theme.remote_url}}</code></div>
{{/if}}
{{/if}} {{/if}}
{{#if model.remote_theme.about_url}} {{#if model.remote_theme.about_url}}
<a class="url about-url" href="{{model.remote_theme.about_url}}">{{i18n "admin.customize.theme.about_theme"}} {{d-icon "link"}}</a> <a class="url about-url" href="{{model.remote_theme.about_url}}">{{i18n "admin.customize.theme.about_theme"}} {{d-icon "link"}}</a>

11
app/assets/stylesheets/common/admin/customize.scss
View File

@ -140,9 +140,14 @@
} }
} }
.remote-url, div.remote-url {
.about-url, font-size: $font-down-1;
.license-url { margin-bottom: 7px;
}
a.remote-url,
a.about-url,
a.license-url {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }