paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

org settings: Split "Language and notifications" section.

Browse Source 
This splits "Language and notifications" section into "Default user
settings" and "Notifications".
With this, we can easily add other default user settings in the
same place.
This commit is contained in:
Shubham Dhama
2018-03-31 11:09:22 +05:30
committed by Tim Abbott
parent e04b8271ca
commit f4d6b2a853
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/casper_tests/10-admin.js
View File

@@ -378,14 +378,14 @@ casper.then(function () {
casper.evaluate(function () {
$('#id_realm_default_language').val('de').change();
});
casper.test.assertSelectorHasText('#org-submit-language-notify', "Save");
casper.click('#org-submit-language-notify');
casper.test.assertSelectorHasText('#org-submit-user-defaults', "Save");
casper.click('#org-submit-user-defaults');
});
});
casper.then(function () {
casper.waitUntilVisible('#org-submit-language-notify[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-language-notify',
casper.waitUntilVisible('#org-submit-user-defaults[data-status="saved"]', function () {
casper.test.assertSelectorHasText('#org-submit-user-defaults',
'Saved');
});
});

4
static/js/settings_org.js
View File

@@ -39,10 +39,12 @@ var org_settings = {
type: 'bool',
},
},
language_notify: {
user_defaults: {
default_language: {
type: 'text',
},
},
notifications: {
send_welcome_emails: {
type: 'bool',
},

16
static/templates/settings/organization-settings-admin.handlebars
View File

@@ -117,11 +117,12 @@
</div>
</div>
<div id="org-language-notify" class="org-subsection-parent">
<div id="org-user-defaults" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Language &amp; notifications" }}</h3>
{{ partial "settings-save-discard-widget" "section_name" "language-notify" }}
<h3>{{t "Default user settings" }}</h3>
{{ partial "settings-save-discard-widget" "section_name" "user-defaults" }}
</div>
<p>{{t "Configure default settings for new users joining this organization." }}</p>
<div class="inline-block organization-settings-parent">
<div class="input-group">
<label for="realm_default_language" class="dropdown-title">{{t "Default language" }}:</label>
@@ -131,6 +132,15 @@
{{/each}}
</select>
</div>
</div>
</div>
<div id="org-notifications" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Notifications" }}</h3>
{{ partial "settings-save-discard-widget" "section_name" "notifications" }}
</div>
<div class="inline-block organization-settings-parent">
<div class="input-group">
<label class="checkbox">
<input type="checkbox" id="id_realm_send_welcome_emails" name="realm_send_welcome_emails"