osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FEATURE: Site setting for words to censor in posts

Browse Source
This commit is contained in:
Robin Ward
2014-10-02 13:58:36 -04:00
parent b58435de90
commit 9564ecde76
7 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/templates/site_settings.hbs
+1 -1
View File
@@ -28,7 +28,7 @@
</div>
<div class="site-settings-detail pull-left">
{{ outlet }}
{{outlet}}
</div>
<div class="clearfix"></div>
app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
+1 -1
View File
@@ -3,7 +3,7 @@
</div>
<div class="setting-value">
{{list-setting settingValue=value choices=choices settingName=setting}}
<div class='desc'>{{unbound description}}</div>
<div class='desc'>{{{unbound description}}}</div>
</div>
{{#if dirty}}
<div class='setting-controls'>
app/assets/javascripts/admin/views/site_setting_view.js
+2 -2
View File
@@ -14,10 +14,10 @@ Discourse.SiteSettingView = Discourse.View.extend(Discourse.ScrollTop, {
if (this.get('content.type') === 'bool') return 'admin/templates/site_settings/setting_bool';
// If we're editing an enum field, show a dropdown
if (this.get('content.type') === 'enum' ) return 'admin/templates/site_settings/setting_enum';
if (this.get('content.type') === 'enum') return 'admin/templates/site_settings/setting_enum';
// If we're editing a list, show a list editor
if (this.get('content.type') === 'list' ) return 'admin/templates/site_settings/setting_list';
if (this.get('content.type') === 'list') return 'admin/templates/site_settings/setting_list';
// Default to string editor
return 'admin/templates/site_settings/setting_string';