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

FEATURE: remove override stylesheet option, too confusing

Browse Source
This commit is contained in:
Sam
2014-12-22 16:18:32 +11:00
parent 5d33dee817
commit f23eb475a4
8 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/models/site_customization.js
View File

@@ -7,7 +7,7 @@
@module Discourse
**/
Discourse.SiteCustomization = Discourse.Model.extend({
trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer', 'override_default_style'],
trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer'],
description: function() {
return "" + this.name + (this.enabled ? ' (*)' : '');
@@ -26,7 +26,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
return changed;
}.property('override_default_style', 'enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer', 'originals'),
}.property('enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer', 'originals'),
startTrackingChanges: function() {
var self = this;
@@ -51,8 +51,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
footer: this.footer,
mobile_stylesheet: this.mobile_stylesheet,
mobile_header: this.mobile_header,
mobile_footer: this.mobile_footer,
override_default_style: this.override_default_style
mobile_footer: this.mobile_footer
};
var siteCustomization = this;

1
app/assets/javascripts/admin/templates/customize_css_html.hbs
View File

@@ -35,7 +35,6 @@
</div>
<br>
<div class='status-actions'>
<span>{{i18n 'admin.customize.override_default'}} {{input type="checkbox" checked=selectedItem.override_default_style}}</span>
<span>{{i18n 'admin.customize.enabled'}} {{input type="checkbox" checked=selectedItem.enabled}}</span>
{{#unless selectedItem.changed}}
<a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>

3
app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
View File

@@ -17,6 +17,3 @@
<section class="field">
<b>{{i18n 'admin.customize.enabled'}}</b>: {{enabled}}
</section>
<section class="field">
<b>{{i18n 'admin.customize.override_default'}}</b>: {{override_default_style}}
</section>