From f9ef715357eb40b4072a0e0137b01c867436ffe7 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 30 Jul 2014 09:58:41 -0700
Subject: [PATCH] Improve email-in category settings UI

---
 .../edit-category-settings.js.handlebars      | 28 +++++++++++--------
 config/locales/client.en.yml                  |  7 +++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.js.handlebars
index 8162cb6a483..eac35809d14 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.js.handlebars
@@ -18,9 +18,9 @@
   </div>
 </section>
 
-{{#if emailInEnabled}}
-  <section class='field'>
-    <div class="email-in-fields">
+<section class='field'>
+  <div class="email-in-fields">
+    {{#if emailInEnabled}}
       <div>
         <i class="fa fa-envelope-o"></i>
         {{i18n category.email_in}}
@@ -32,15 +32,19 @@
           {{i18n category.email_in_allow_strangers}}
         </label>
       </div>
-    </div>
-  </section>
-{{/if}}
+    {{else}}
+      {{i18n category.email_in_disabled}}
+      <a href="/admin/site_settings/category/email">{{i18n category.email_in_disabled_click}}</a>
+    {{/if}}
+  </div>
+</section>
 
-{{#if showPositionInput}}
-  <section class='field'>
+<section class='field'>
+  {{#if showPositionInput}}
     <label>{{i18n category.position}}</label>
     {{text-field value=position class="position-input"}}
-  </section>
-{{else}}
-  <p>{{i18n category.position_disabled}}</p>
-{{/if}}
+  {{else}}
+    {{i18n category.position_disabled}}
+    <a href="/admin/site_settings/category/email">{{i18n category.position_disabled_click}}</a>
+  {{/if}}
+</section>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 95b768431d0..e0b73f670f8 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1201,13 +1201,16 @@ en:
       auto_close_units: "hours"
       email_in: "Custom incoming email address:"
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
-      allow_badges_label: "Allow badges"
+      email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
+      email_in_disabled_click: 'enable the "email in" setting.'
+      allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
       add_permission: "Add Permission"
       this_year: "this year"
       position: "position"
       default_position: "Default Position"
-      position_disabled: 'Categories will be displayed in order of activity. To control the order of categories in lists, enable the "fixed category positions" setting.'
+      position_disabled: "Categories will be displayed in order of activity. To control the order of categories in lists, "
+      position_disabled_click: 'enable the "fixed category positions" setting.'
       parent: "Parent Category"
       notifications:
         title: ''