Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2608 from riking/email-category-ui 

Improve email-in category settings UI
This commit is contained in:
Robin Ward 2014-07-30 13:12:03 -04:00
parent aeb0ea1f25 f9ef715357
commit becc2dca35
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/javascripts/discourse/templates/modal/edit-category-settings.js.handlebars
View File

@ -18,9 +18,9 @@
</div> </div>
</section> </section>
{{#if emailInEnabled}} <section class='field'>
<section class='field'> <div class="email-in-fields">
<div class="email-in-fields"> {{#if emailInEnabled}}
<div> <div>
<i class="fa fa-envelope-o"></i> <i class="fa fa-envelope-o"></i>
{{i18n category.email_in}} {{i18n category.email_in}}
@ -32,15 +32,19 @@
{{i18n category.email_in_allow_strangers}} {{i18n category.email_in_allow_strangers}}
</label> </label>
</div> </div>
</div> {{else}}
</section> {{i18n category.email_in_disabled}}
{{/if}} <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> <label>{{i18n category.position}}</label>
{{text-field value=position class="position-input"}} {{text-field value=position class="position-input"}}
</section> {{else}}
{{else}} {{i18n category.position_disabled}}
<p>{{i18n category.position_disabled}}</p> <a href="/admin/site_settings/category/email">{{i18n category.position_disabled_click}}</a>
{{/if}} {{/if}}
</section>

7
config/locales/client.en.yml
View File

@ -1201,13 +1201,16 @@ en:
auto_close_units: "hours" auto_close_units: "hours"
email_in: "Custom incoming email address:" email_in: "Custom incoming email address:"
email_in_allow_strangers: "Accept emails from anonymous users with no accounts" 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" edit_permissions: "Edit Permissions"
add_permission: "Add Permission" add_permission: "Add Permission"
this_year: "this year" this_year: "this year"
position: "position" position: "position"
default_position: "Default 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" parent: "Parent Category"
notifications: notifications:
title: '' title: ''