From b7edd5df2f86078b712a9985b81146c0eaa3d4a9 Mon Sep 17 00:00:00 2001
From: Ganesh Pawar <pawarg256@gmail.com>
Date: Sun, 20 Mar 2022 22:28:28 +0530
Subject: [PATCH] settings: Place the saving indicator in the header.

Fixes #21441.
---
 static/styles/settings.css                                 | 7 -------
 static/templates/settings/account_settings.hbs             | 2 +-
 static/templates/settings/bot_list_admin.hbs               | 2 +-
 static/templates/settings/deactivated_users_admin.hbs      | 2 +-
 static/templates/settings/invites_list_admin.hbs           | 2 +-
 static/templates/settings/linkifier_settings_admin.hbs     | 3 +--
 static/templates/settings/profile_field_settings_admin.hbs | 2 +-
 static/templates/settings/user_list_admin.hbs              | 2 +-
 8 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/static/styles/settings.css b/static/styles/settings.css
index aa397b0b98..7d4189a708 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -699,13 +699,6 @@ input[type="checkbox"] {
     text-align: right;
 }
 
-#account-settings-status {
-    text-align: center;
-    width: 50%;
-    margin: auto;
-    margin-bottom: 20px;
-}
-
 .add-new-emoji-box,
 .add-new-user-group-box,
 .add-new-alert-word-box,
diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs
index b949909f55..ee623357a1 100644
--- a/static/templates/settings/account_settings.hbs
+++ b/static/templates/settings/account_settings.hbs
@@ -4,8 +4,8 @@
         <div class="inline-block">
             <div id="user_details_section">
                 <h3 class="inline-block">{{t "Account" }}</h3>
+                <div class="alert-notification" id="account-settings-status"></div>
                 <form class="email-change-form grid">
-                    <div class="alert-notification" id="account-settings-status"></div>
                     <div class="input-group">
                         <label class="inline-block title">{{t "Email" }}</label>
                         <button id='change_email' type="button" class="button btn-link small rounded inline-block"
diff --git a/static/templates/settings/bot_list_admin.hbs b/static/templates/settings/bot_list_admin.hbs
index 97aba4f412..c831c387f8 100644
--- a/static/templates/settings/bot_list_admin.hbs
+++ b/static/templates/settings/bot_list_admin.hbs
@@ -1,10 +1,10 @@
 <div id="admin-bot-list" class="settings-section" data-name="bot-list-admin">
     <div class="tip bot-settings-tip"></div>
-    <div class="alert-notification" id="bot-field-status"></div>
     <div class="clear-float"></div>
 
     <div class="settings_panel_list_header">
         <h3>{{t "Bots"}}</h3>
+        <div class="alert-notification" id="bot-field-status"></div>
         <input type="text" class="search" placeholder="{{t 'Filter bots' }}" aria-label="{{t 'Filter bots' }}"/>
     </div>
 
diff --git a/static/templates/settings/deactivated_users_admin.hbs b/static/templates/settings/deactivated_users_admin.hbs
index a8b6e11715..e6c66ecf59 100644
--- a/static/templates/settings/deactivated_users_admin.hbs
+++ b/static/templates/settings/deactivated_users_admin.hbs
@@ -1,11 +1,11 @@
 <div id="admin-deactivated-users-list" class="settings-section" data-name="deactivated-users-admin">
-    <div class="alert-notification" id="deactivated-user-field-status"></div>
     <div class="clear-float"></div>
 
     <div class="settings_panel_list_header">
         <h3>{{t "Deactivated users" }}
             {{> ../help_link_widget link="/help/deactivate-or-reactivate-a-user" }}
         </h3>
+        <div class="alert-notification" id="deactivated-user-field-status"></div>
         <input type="text" class="search" placeholder="{{t 'Filter deactivated users' }}" aria-label="{{t 'Filter deactivated users' }}"/>
     </div>
 
diff --git a/static/templates/settings/invites_list_admin.hbs b/static/templates/settings/invites_list_admin.hbs
index 2ee01ba071..31d0b5dd3a 100644
--- a/static/templates/settings/invites_list_admin.hbs
+++ b/static/templates/settings/invites_list_admin.hbs
@@ -5,10 +5,10 @@
     {{#if can_invite_others_to_realm}}
     <a class="invite-user-link" href="#invite"><i class="fa fa-user-plus" aria-hidden="true"></i>{{t "Invite more users" }}</a>
     {{/if}}
-    <div class="alert-notification" id="invites-field-status"></div>
 
     <div class="settings_panel_list_header">
         <h3>{{t "Invites"}}</h3>
+        <div class="alert-notification" id="invites-field-status"></div>
         <input type="text" class="search" placeholder="{{t 'Filter invites' }}" aria-label="{{t 'Filter invites' }}"/>
     </div>
 
diff --git a/static/templates/settings/linkifier_settings_admin.hbs b/static/templates/settings/linkifier_settings_admin.hbs
index 2b7f080374..6e389ecf4a 100644
--- a/static/templates/settings/linkifier_settings_admin.hbs
+++ b/static/templates/settings/linkifier_settings_admin.hbs
@@ -65,10 +65,9 @@
         </form>
         {{/if}}
 
-        <div class="alert-notification edit-linkifier-status" id="linkifier-field-status"></div>
-
         <div class="settings_panel_list_header">
             <h3>{{t "Linkifiers"}}</h3>
+            <div class="alert-notification edit-linkifier-status" id="linkifier-field-status"></div>
             <input type="text" class="search" placeholder="{{t 'Filter linkifiers' }}" aria-label="{{t 'Filter linkifiers' }}"/>
         </div>
 
diff --git a/static/templates/settings/profile_field_settings_admin.hbs b/static/templates/settings/profile_field_settings_admin.hbs
index e8cc711d8c..5bc90e8a5b 100644
--- a/static/templates/settings/profile_field_settings_admin.hbs
+++ b/static/templates/settings/profile_field_settings_admin.hbs
@@ -1,7 +1,7 @@
 <div id="profile-field-settings" class="settings-section" data-name="profile-field-settings">
-    <div class="alert-notification" id="admin-profile-field-status"></div>
     <div class="settings_panel_list_header">
         <h3>{{t "Custom profile fields"}}</h3>
+        <div class="alert-notification" id="admin-profile-field-status"></div>
     </div>
     <div class="admin-table-wrapper">
         <table class="table table-condensed table-striped admin_profile_fields_table">
diff --git a/static/templates/settings/user_list_admin.hbs b/static/templates/settings/user_list_admin.hbs
index cf9799bc50..90c5d8c182 100644
--- a/static/templates/settings/user_list_admin.hbs
+++ b/static/templates/settings/user_list_admin.hbs
@@ -1,10 +1,10 @@
 <div id="admin-user-list" class="settings-section" data-name="user-list-admin">
 
-    <div class="alert-notification" id="user-field-status"></div>
     <div class="clear-float"></div>
 
     <div class="settings_panel_list_header">
         <h3>{{t "Users"}}</h3>
+        <div class="alert-notification" id="user-field-status"></div>
         <input type="text" class="search" placeholder="{{t 'Filter users' }}" aria-label="{{t 'Filter users' }}"/>
     </div>