You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/06/01 20:56:41 UTC
ambari git commit: AMBARI-16985. "Wizard in progress" bar should not
look clickable (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 29f9fa341 -> 2c51b64c6
AMBARI-16985. "Wizard in progress" bar should not look clickable (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c51b64c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c51b64c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c51b64c
Branch: refs/heads/trunk
Commit: 2c51b64c63dc424f35a1849c9b4588a157d13218
Parents: 29f9fa3
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jun 1 16:51:10 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jun 1 23:56:20 2016 +0300
----------------------------------------------------------------------
.../app/controllers/global/wizard_watcher_controller.js | 5 -----
ambari-web/app/templates/application.hbs | 12 +++++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c51b64c/ambari-web/app/controllers/global/wizard_watcher_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/wizard_watcher_controller.js b/ambari-web/app/controllers/global/wizard_watcher_controller.js
index 8332384..e2770fa 100644
--- a/ambari-web/app/controllers/global/wizard_watcher_controller.js
+++ b/ambari-web/app/controllers/global/wizard_watcher_controller.js
@@ -38,11 +38,6 @@ App.WizardWatcherController = Em.Controller.extend(App.UserPref, {
controllerName: null,
/**
- * @type {Function}
- */
- mock: Em.K,
-
- /**
* define whether Wizard is running
* @type {boolean}
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c51b64c/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 49cb18a..9c17223 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -107,12 +107,14 @@
<div class="span11">
{{#if isExistingClusterDataLoaded}}
<p class="span4 offset4">
+ {{#if App.router.wizardWatcherController.isNonWizardUser}}
+ <span class="brand cluster-name">
+ <span class="label upgrade-in-progress">
+ <i class="icon-cog"></i> {{App.router.wizardWatcherController.wizardDisplayName}}
+ </span>
+ </span>
+ {{/if}}
<a class="brand cluster-name" href="#">
- {{#if App.router.wizardWatcherController.isNonWizardUser}}
- <span class="label upgrade-in-progress" {{action "mock" target="App.router.wizardWatcherController"}}>
- <i class="icon-cog"></i> {{App.router.wizardWatcherController.wizardDisplayName}}
- </span>
- {{/if}}
{{#if App.upgradeInProgress}}
{{#if App.router.mainAdminStackAndUpgradeController.isDowngrade}}
<span