From d9e2a685b2f4e27d32a0d7e69fe3a6284507af4a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 28 May 2015 11:34:44 -0400
Subject: [PATCH] FIX: Allow HTML in site setting descriptions.

---
 .../javascripts/admin/templates/components/site-setting.hbs | 6 ++----
 .../javascripts/admin/templates/site-settings/bool.hbs      | 2 +-
 .../javascripts/admin/templates/site-settings/enum.hbs      | 2 +-
 .../javascripts/admin/templates/site-settings/list.hbs      | 2 +-
 .../javascripts/admin/templates/site-settings/string.hbs    | 2 +-
 .../javascripts/admin/templates/site-settings/url_list.hbs  | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 768be98e1cb..eb117c0f4dc 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -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}}
-    {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
-  {{/if}}
+{{else if setting.overridden}}
+  {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/site-settings/bool.hbs
index bf51ed900d1..1f441c421ce 100644
--- a/app/assets/javascripts/admin/templates/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/bool.hbs
@@ -1,4 +1,4 @@
 <label>
   {{input type="checkbox" checked=enabled}}
-  {{unbound setting.description}}
+  {{{unbound setting.description}}}
 </label>
diff --git a/app/assets/javascripts/admin/templates/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/site-settings/enum.hbs
index b6676e3c33e..67cbfc92ace 100644
--- a/app/assets/javascripts/admin/templates/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/enum.hbs
@@ -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>
diff --git a/app/assets/javascripts/admin/templates/site-settings/list.hbs b/app/assets/javascripts/admin/templates/site-settings/list.hbs
index 588d8d3388f..bc1cf2b51e7 100644
--- a/app/assets/javascripts/admin/templates/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/list.hbs
@@ -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>
diff --git a/app/assets/javascripts/admin/templates/site-settings/string.hbs b/app/assets/javascripts/admin/templates/site-settings/string.hbs
index 9770efb755f..f8427094abb 100644
--- a/app/assets/javascripts/admin/templates/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/string.hbs
@@ -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>
diff --git a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
index e3751f3178e..bd22e1b0334 100644
--- a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs
@@ -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>