Repository: ambari Updated Branches: refs/heads/branch-2.0.0 d210c360c -> ce5f1c823
AMBARI-9842. Top menu markup issue (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce5f1c82 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce5f1c82 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce5f1c82 Branch: refs/heads/branch-2.0.0 Commit: ce5f1c823c1ac46ca517903f89ed54fdbca8d343 Parents: d210c36 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Mar 3 12:15:44 2015 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Mar 3 12:15:44 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/app.js | 8 +++++ ambari-web/app/styles/application.less | 3 +- ambari-web/app/templates/application.hbs | 52 ++++++++++++++------------- ambari-web/test/app_test.js | 27 ++++++++++++++ 4 files changed, 63 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5f1c82/ambari-web/app/app.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js index b5ca7d8..bd5090e 100644 --- a/ambari-web/app/app.js +++ b/ambari-web/app/app.js @@ -65,6 +65,14 @@ module.exports = Em.Application.create({ }.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: * - ADMIN http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5f1c82/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index d7b8c06..775aa6b 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -66,7 +66,6 @@ footer { .ru-badge { text-align: center; - margin: 10px 0; } #top-nav, .ru-badge { @@ -5537,4 +5536,4 @@ input[type="checkbox"].align-checkbox { .bottom-border { border-bottom: 1px solid #dddddd; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5f1c82/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index 12eda07..8752280 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -95,39 +95,41 @@ </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> {{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> {{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> {{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> {{t admin.stackVersions.version.upgrade.pause}}</span> + {{/if}} {{/if}} - {{/if}} - </a> - {{/if}} + </a> + {{/if}} + </div> </div> </div> - </div> + {{/if}} {{outlet}} </div> </div> -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5f1c82/ambari-web/test/app_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/app_test.js b/ambari-web/test/app_test.js index 8f6a30a..9a2a0f6 100644 --- a/ambari-web/test/app_test.js +++ b/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); + }); + }); + + }); + });
