AMBARI-3782. User settings and background op UI tweaks. (xiwang via yusaku)

ambari-web/app/controllers/application.js

@@ -114,10 +114,10 @@ App.ApplicationController = Em.Controller.extend({
         header: Em.I18n.t('common.userSettings'),
         bodyClass: Em.View.extend({
           templateName: require('templates/common/settings'),
-          isShowBgChecked: initValue,
+          isNotShowBgChecked: !initValue,
           updateValue: function () {
-            curValue = this.get('isShowBgChecked');
-          }.observes('isShowBgChecked')
+            curValue = !this.get('isNotShowBgChecked');
+          }.observes('isNotShowBgChecked')
         }),
         primary: Em.I18n.t('common.save'),
         onPrimary: function() {

ambari-web/app/controllers/global/background_operations_controller.js

@@ -233,6 +233,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
         $(self.get('popupView.element')).appendTo('#wrapper');
       } else {
         self.set('popupView', App.HostPopup.initPopup("", self, true));
+        self.set ('popupView.isNotShowBgChecked', !initValue);
       }
     });
   }

ambari-web/app/messages.js

@@ -26,7 +26,7 @@ Em.I18n.translations = {
   'app.loadingPlaceholder': 'Loading...',
   'app.signout':'Sign out',
   'app.settings':'Settings',
-  'app.settings.showBgOperations': 'Show background operations dialog when an operation is started',
+  'app.settings.notshowBgOperationsPopup': 'Do not show the Background Operations dialog when starting an operation',
   'app.settings.notShowBgOperations': 'Do not show this dialog again when starting a background operation',
 
   'apply':'apply',

ambari-web/app/templates/application.hbs

@@ -25,18 +25,17 @@
           <a class="brand" {{translateAttr href="topnav.logo.href"}} target="_blank" alt="Apache Ambari" title="Apache Ambari">{{t app.name}}</a>
 
           {{#if isClusterDataLoaded}}
-              <a class="brand cluster-name" href="javascript:void(null);" {{bindAttr title="clusterName"}}>
-                <span {{action "showPopup" target="App.router.backgroundOperationsController"}} >{{clusterDisplayName}} </span>
+            <a class="brand cluster-name" href="javascript:void(null);" {{bindAttr title="clusterName"}}>
+              <span {{action "showPopup" target="App.router.backgroundOperationsController"}} >{{clusterDisplayName}} </span>
 
-                {{#with App.router.backgroundOperationsController}}
-                  {{#if allOperationsCount}}
-                      <span class="label operations-count" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
-                      {{else}}
-                      <span class="label" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
-                  {{/if}}
-                {{/with}}
-
-              </a>
+              {{#with App.router.backgroundOperationsController}}
+                {{#if allOperationsCount}}
+                  <span class="label operations-count" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
+                {{else}}
+                  <span class="label" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
+                {{/if}}
+              {{/with}}
+            </a>
           {{/if}}
 
           {{#if App.router.loggedIn}}
@@ -45,8 +44,8 @@
                 {{App.router.loginName}}&nbsp;<span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
-                <li><a href="" {{action logoff}}>{{t app.signout}}</a></li>
                 <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li>
+                <li><a href="" {{action logoff}}>{{t app.signout}}</a></li>
               </ul>
             </div>
           {{/if}}

ambari-web/app/templates/common/settings.hbs

@@ -19,8 +19,8 @@
 <div class="admin-user-settings">
   <div>
     <label>
-      {{view Ember.Checkbox checkedBinding="view.isShowBgChecked" class="checkbox"}}
-      {{t app.settings.showBgOperations}}
+      {{view Ember.Checkbox checkedBinding="view.isNotShowBgChecked" class="checkbox"}}
+      {{t app.settings.notshowBgOperationsPopup}}
     </label>
   </div>
 </div>