Updated Branches: refs/heads/trunk 9ef4a4137 -> a70322329
AMBARI-3230. NameNode HA wizard (rollback): Wrong size of progress bar Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/9f183346 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9f183346 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9f183346 Branch: refs/heads/trunk Commit: 9f1833461c0632789f3a9871510f4f47221a4f41 Parents: 9ef4a41 Author: Alex Antonenko <[email protected]> Authored: Fri Sep 13 21:46:44 2013 +0300 Committer: Alex Antonenko <[email protected]> Committed: Mon Sep 16 19:05:20 2013 +0300 ---------------------------------------------------------------------- .../main/admin/highAvailability/progress_controller.js | 1 + .../main/admin/highAvailability/rollback_controller.js | 1 + .../app/templates/main/admin/highAvailability/progress.hbs | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9f183346/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js index f55bd49..aff94f0 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -31,6 +31,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle POLL_INTERVAL: 4000, isSubmitDisabled: true, serviceTimestamp: null, + isRollback: false, loadStep: function () { this.clearStep(); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9f183346/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js index 74f941c..401f1d2 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js @@ -27,6 +27,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl configsSaved: false, deletedHdfsClients: 0, numOfDelOperations: 0, + isRollback: true, content: Em.Object.create({ http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9f183346/ambari-web/app/templates/main/admin/highAvailability/progress.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs index 3a9d9f9..fef68fb 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs @@ -22,12 +22,12 @@ {{#each task in controller.tasks}} {{#view view.taskView contentBinding="task"}} <div class="item"> - <div class="pull-left span4"> + <div {{bindAttr class=":pull-left controller.isRollback::span4 controller.isRollback:span3"}}> <i {{bindAttr class="view.icon view.iconColor"}}></i> <a {{bindAttr class="view.linkClass"}} {{action "hostsLogPopup" task target="view"}} >{{task.title}}</a> </div> <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}> - <div class="progress-bar span8"> + <div {{bindAttr class=":progress-bar controller.isRollback::span8 controller.isRollback:span3"}}> <div class="progress-striped active progress-info progress"> <div class="bar" {{bindAttr style="view.barWidth"}}></div> </div>
