codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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="cancel no-text" action="cancel" icon="times"}}
</div>
{{else}}
{{#if setting.overridden}}
{{else if setting.overridden}}
{{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
{{/if}}
{{/if}}

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

@ -1,4 +1,4 @@
<label>
{{input type="checkbox" checked=enabled}}
{{unbound setting.description}}
{{{unbound setting.description}}}
</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}}
{{preview}}
{{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}}
{{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"}}
{{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}}
{{setting-validation-message message=validationMessage}}
<div class='desc'>{{unbound setting.description}}</div>
<div class='desc'>{{{unbound setting.description}}}</div>