diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-03 15:07:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 15:07:42 +0200 |
| commit | ac4927809c2cf8d66c9f6aa84a7009b521a8d0d7 (patch) | |
| tree | a2cec81b3b5da84a3462adff4e03a1f07ceb9321 /settings/js | |
| parent | 7de9eb16d80d31162b5f3930daa45f8e0df45ccc (diff) | |
| parent | bb865a55febe7b712a0e6cc7e1e93034f60a0e8b (diff) | |
| download | nextcloud-server-ac4927809c2cf8d66c9f6aa84a7009b521a8d0d7.tar.gz nextcloud-server-ac4927809c2cf8d66c9f6aa84a7009b521a8d0d7.zip | |
Merge branch 'master' into clean-settings-layout
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 4 | ||||
| -rw-r--r-- | settings/js/federationsettingsview.js | 4 | ||||
| -rw-r--r-- | settings/js/settings/personalInfo.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 957ad395f94..278c307b1f3 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -479,7 +479,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $.post(OC.webroot + '/index.php/disableapp', {appid: appId}, function() { OC.Settings.Apps.showErrorMessage( appId, - t('settings', 'Error: this app cannot be enabled because it makes the server unstable') + t('settings', 'Error: This app can not be enabled because it makes the server unstable') ); appItems.forEach(function(appItem) { appItem.data('errormsg', t('settings', 'Error while enabling app')); @@ -493,7 +493,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }).fail(function() { OC.Settings.Apps.showErrorMessage( appId, - t('settings', 'Error: could not disable broken app') + t('settings', 'Error: Could not disable broken app') ); appItems.forEach(function(appItem) { appItem.data('errormsg', t('settings', 'Error while disabling broken app')); diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js index d5537d19404..46d92027a97 100644 --- a/settings/js/federationsettingsview.js +++ b/settings/js/federationsettingsview.js @@ -182,7 +182,7 @@ var $icon = this.$('#' + field + 'form > h2 > span'); $icon.removeClass('icon-password'); - $icon.removeClass('icon-contacts-dark'); + $icon.removeClass('icon-contacts'); $icon.removeClass('icon-link'); $icon.addClass('hidden'); @@ -192,7 +192,7 @@ $icon.removeClass('hidden'); break; case 'contacts': - $icon.addClass('icon-contacts-dark'); + $icon.addClass('icon-contacts'); $icon.removeClass('hidden'); break; case 'public': diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js index 306994a7094..89b37d291c5 100644 --- a/settings/js/settings/personalInfo.js +++ b/settings/js/settings/personalInfo.js @@ -169,7 +169,6 @@ $(document).ready(function () { if (data.status === "success") { $("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>"); removeloader(); - $(".personal-show-label").show(); $('#pass1').val(''); $('#pass2').val('').change(); } @@ -185,6 +184,7 @@ $(document).ready(function () { } ); } + $(".personal-show-label").show(); $(".password-loading").remove(); $("#passwordbutton").removeAttr('disabled'); }); |