AMBARI-9842. Top menu markup issue (onechiporenko)

ambari-web/app/app.js

@@ -64,6 +64,14 @@ module.exports = Em.Application.create({
     return this.get('upgradeState').contains("HOLDING");
   }.property('upgradeState'),
 
+  /**
+   * RU is running
+   * @type {boolean}
+   */
+  upgradeIsRunning: function() {
+    return this.get('upgradeInProgress') || this.get('upgradeHolding');
+  }.property('upgradeInProgress', 'upgradeHolding'),
+
   /**
    * compute user access rights by permission type
    * types:

ambari-web/app/styles/application.less

@@ -66,7 +66,6 @@ footer {
 
 .ru-badge {
   text-align: center;
-  margin: 10px 0;
 }
 
 #top-nav, .ru-badge {

ambari-web/app/templates/application.hbs

@@ -95,38 +95,40 @@
   </div>
   <div class="container main-container">
     <div id="content">
-      <div class="ru-badge span12">
-        <div class="navbar navbar-static-top clearfix">
-          <div class="span4 offset4">
-            {{#if isExistingClusterDataLoaded}}
-              <a class="brand cluster-name" href="#">
-                {{#if App.upgradeInProgress}}
-                  {{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
-                    <span
-                        class="label upgrade-in-progress" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
+      {{#if App.upgradeIsRunning}}
+        <div class="ru-badge span12">
+          <div class="navbar navbar-static-top clearfix">
+            <div class="span4 offset4">
+              {{#if isExistingClusterDataLoaded}}
+                <a class="brand cluster-name" href="#">
+                  {{#if App.upgradeInProgress}}
+                    {{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
+                      <span
+                          class="label upgrade-in-progress" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
                              <i class="icon-cog"></i>&nbsp;{{t admin.stackVersions.version.downgrade.running}}</span>
-                  {{else}}
-                    <span
-                        class="label upgrade-in-progress" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
+                    {{else}}
+                      <span
+                          class="label upgrade-in-progress" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
                              <i class="icon-cog"></i>&nbsp;{{t admin.stackVersions.version.upgrade.running}}</span>
+                    {{/if}}
                   {{/if}}
-                {{/if}}
-                {{#if App.upgradeHolding}}
-                  {{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
-                    <span
-                        class="label upgrade-holding" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
+                  {{#if App.upgradeHolding}}
+                    {{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
+                      <span
+                          class="label upgrade-holding" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
                           <i class="icon-pause"></i>&nbsp;{{t admin.stackVersions.version.downgrade.pause}}</span>
-                  {{else}}
-                    <span
-                        class="label upgrade-holding" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
+                    {{else}}
+                      <span
+                          class="label upgrade-holding" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}>
                           <i class="icon-pause"></i>&nbsp;{{t admin.stackVersions.version.upgrade.pause}}</span>
+                    {{/if}}
                   {{/if}}
-                {{/if}}
-              </a>
-            {{/if}}
+                </a>
+              {{/if}}
+            </div>
           </div>
         </div>
-      </div>
+      {{/if}}
       {{outlet}}
     </div>
   </div>

ambari-web/test/app_test.js

@@ -529,4 +529,31 @@ describe('App', function () {
 
   });
 
+  describe('#upgradeIsRunning', function () {
+
+    Em.A([
+        {
+          upgradeState: 'IN_PROGRESS',
+          m: 'should be true (1)',
+          e: true
+        },
+        {
+          upgradeState: 'HOLDING',
+          m: 'should be true (2)',
+          e: true
+        },
+        {
+          upgradeState: 'FAKE',
+          m: 'should be false',
+          e: false
+        }
+      ]).forEach(function (test) {
+        it(test.m, function () {
+          App.set('upgradeState', test.upgradeState);
+          expect(App.get('upgradeIsRunning')).to.equal(test.e);
+        });
+      });
+
+  });
+
 });