github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-07 08:34:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow HTML in site setting descriptions.

Browse Source
This commit is contained in:
Robin Ward
2015-05-28 11:34:44 -04:00
parent 6e8be12816
commit d9e2a685b2
6 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/components/site-setting.hbs
View File

@ -9,8 +9,6 @@
{{d-button class="ok no-text" action="save" icon="check"}} {{d-button class="ok no-text" action="save" icon="check"}}
{{d-button class="cancel no-text" action="cancel" icon="times"}} {{d-button class="cancel no-text" action="cancel" icon="times"}}
</div> </div>
{{else}} {{else if setting.overridden}}
{{#if setting.overridden}} {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
{{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
{{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/site-settings/bool.hbs
View File

@ -1,4 +1,4 @@
<label> <label>
{{input type="checkbox" checked=enabled}} {{input type="checkbox" checked=enabled}}
{{unbound setting.description}} {{{unbound setting.description}}}
</label> </label>

2
app/assets/javascripts/admin/templates/site-settings/enum.hbs
View File

@ -1,4 +1,4 @@
{{combo-box valueAttribute="value" content=setting.validValues value=buffered.value none=setting.allowsNone}} {{combo-box valueAttribute="value" content=setting.validValues value=buffered.value none=setting.allowsNone}}
{{preview}} {{preview}}
{{setting-validation-message message=validationMessage}} {{setting-validation-message message=validationMessage}}
<div class='desc'>{{unbound setting.description}}</div> <div class='desc'>{{{unbound setting.description}}}</div>

2
app/assets/javascripts/admin/templates/site-settings/list.hbs
View File

@ -1,3 +1,3 @@
{{list-setting settingValue=buffered.value choices=setting.choices settingName=setting.setting}} {{list-setting settingValue=buffered.value choices=setting.choices settingName=setting.setting}}
{{setting-validation-message message=validationMessage}} {{setting-validation-message message=validationMessage}}
<div class='desc'>{{unbound setting.description}}</div> <div class='desc'>{{{unbound setting.description}}}</div>

2
app/assets/javascripts/admin/templates/site-settings/string.hbs
View File

@ -1,3 +1,3 @@
{{text-field value=buffered.value classNames="input-setting-string"}} {{text-field value=buffered.value classNames="input-setting-string"}}
{{setting-validation-message message=validationMessage}} {{setting-validation-message message=validationMessage}}
<div class='desc'>{{unbound setting.description}}</div> <div class='desc'>{{{unbound setting.description}}}</div>

2
app/assets/javascripts/admin/templates/site-settings/url_list.hbs
View File

@ -1,3 +1,3 @@
{{url-list value=buffered.value}} {{url-list value=buffered.value}}
{{setting-validation-message message=validationMessage}} {{setting-validation-message message=validationMessage}}
<div class='desc'>{{unbound setting.description}}</div> <div class='desc'>{{{unbound setting.description}}}</div>