Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Rename settings-status to account-settings-status.

This commit is contained in:
Tim Abbott 2017-03-10 10:19:25 -08:00
parent 05f0d1953b
commit 900891b072
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/casper_tests/06-settings.js
View File

@ -53,8 +53,8 @@ casper.then(function () {
});
casper.then(function () {
casper.waitUntilVisible('#settings-status', function () {
casper.test.assertSelectorHasText('#settings-status', 'Updated settings!');
casper.waitUntilVisible('#account-settings-status', function () {
casper.test.assertSelectorHasText('#account-settings-status', 'Updated settings!');
casper.click('[data-section="your-bots"]');
casper.click('#api_key_button');

12
static/js/settings.js
View File

@ -232,7 +232,7 @@ function _setup_page() {
});
$(".settings-box").html(settings_tab);
$("#settings-status").hide();
$("#account-settings-status").hide();
$("#notify-settings-status").hide();
$("#display-settings-status").hide();
$("#ui-settings-status").hide();
@ -302,14 +302,14 @@ function _setup_page() {
// Scroll to the top so the error message is visible.
// We would scroll anyway if we end up submitting the form.
viewport.scrollTop(0);
ui.report_error(message, xhr, $('#settings-status').expectOne());
ui.report_error(message, xhr, $('#account-settings-status').expectOne());
}
function settings_change_success(message) {
// Scroll to the top so the error message is visible.
// We would scroll anyway if we end up submitting the form.
viewport.scrollTop(0);
ui.report_success(message, $('#settings-status').expectOne());
ui.report_success(message, $('#account-settings-status').expectOne());
}
$("form.your-account-settings").ajaxForm({
@ -639,7 +639,7 @@ function _setup_page() {
window.location.href = "/login";
},
error: function (xhr) {
ui.report_error(i18n.t("Error deactivating account"), xhr, $('#settings-status').expectOne());
ui.report_error(i18n.t("Error deactivating account"), xhr, $('#account-settings-status').expectOne());
},
});
});
@ -650,7 +650,7 @@ function _setup_page() {
dataType: 'json', // This seems to be ignored. We still get back an xhr.
success: function (resp, statusText, xhr) {
var result = JSON.parse(xhr.responseText);
var settings_status = $('#settings-status').expectOne();
var settings_status = $('#account-settings-status').expectOne();
$("#get_api_key_password").val("");
$("#api_key_value").text(result.api_key);
@ -659,7 +659,7 @@ function _setup_page() {
settings_status.hide();
},
error: function (xhr) {
ui.report_error(i18n.t("Error getting API key"), xhr, $('#settings-status').expectOne());
ui.report_error(i18n.t("Error getting API key"), xhr, $('#account-settings-status').expectOne());
$("#show_api_key_box").hide();
$("#get_api_key_box").show();
},

2
static/styles/settings.css
View File

@ -421,7 +421,7 @@ input[type=checkbox].inline-block {
text-align: right;
}
#settings-status {
#account-settings-status {
text-align: center;
width: 50%;
margin: auto;

2
static/templates/settings/account-settings.handlebars
View File

@ -3,7 +3,7 @@
<i class="icon-vector-user settings-section-icon"></i>
{{t "Your account" }}
</div>
<div class="alert" id="settings-status"></div>
<div class="alert" id="account-settings-status"></div>
<div class="account-settings-form">
<form class="email-change-form">
<p for="change_email" class="inline-block title">