Repository: ambari Updated Branches: refs/heads/trunk 93fc4221d -> 5bcb0ff4e
AMBARI-8712 Upgrade progress window should occupy available vertical space. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5bcb0ff4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5bcb0ff4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5bcb0ff4 Branch: refs/heads/trunk Commit: 5bcb0ff4eb72ab4db31f5aeb3cae585cc94ba918 Parents: 93fc422 Author: Andrii Tkach <atk...@hortonworks.com> Authored: Mon Dec 15 17:34:50 2014 +0200 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Mon Dec 15 19:47:48 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/routes/stack_upgrade_routes.js | 12 ++++++++ .../stack_upgrade/stack_upgrade_dialog.hbs | 30 +++++++++++--------- 2 files changed, 28 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5bcb0ff4/ambari-web/app/routes/stack_upgrade_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/stack_upgrade_routes.js b/ambari-web/app/routes/stack_upgrade_routes.js index 5899618..eddc2d2 100644 --- a/ambari-web/app/routes/stack_upgrade_routes.js +++ b/ambari-web/app/routes/stack_upgrade_routes.js @@ -36,6 +36,18 @@ module.exports = App.WizardRoute.extend({ secondary: null, didInsertElement: function () { this.fitHeight(); + this.fitInnerHeight(); + }, + + /** + * fir height of scrollable block inside of modal body + */ + fitInnerHeight: function () { + var block = this.$().find('#modal > .modal-body'); + var scrollable = this.$().find('#modal .scrollable-block'); + + scrollable.css('max-height', Number(block.css('max-height').slice(0, -2)) - block.height()); + block.css('max-height', 'none'); }, onClose: function() { var self = this, header, body; http://git-wip-us.apache.org/repos/asf/ambari/blob/5bcb0ff4/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_dialog.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_dialog.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_dialog.hbs index 8509801..3b09640 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_dialog.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_dialog.hbs @@ -17,25 +17,27 @@ }} <div id="stack-upgrade-dialog"> - {{#if view.isLoaded}} - <div class="row-fluid"> - <div class="span2">{{statusIcon controller.upgradeData.Upgrade.request_status}} {{view.upgradeStatusLabel}}</div> - <div class="span9"> - <div class="progress progress-striped active"> - <div class="bar" {{bindAttr style="view.progressWidth"}}></div> - </div> - </div> - <div class="span1"> - {{view.overallProgress}}% + <div {{bindAttr class="view.isLoaded::hidden :row-fluid"}}> + <div class="span2">{{statusIcon controller.upgradeData.Upgrade.request_status}} + {{view.upgradeStatusLabel}}</div> + <div class="span9"> + <div class="progress progress-striped active"> + <div class="bar" {{bindAttr style="view.progressWidth"}}></div> </div> </div> + <div class="span1"> + {{view.overallProgress}}% + </div> + </div> - <div class="task-list limited-height-2"> + <div class="task-list scrollable-block"> + {{#if view.isLoaded}} {{#each group in controller.upgradeData.upgradeGroups}} {{view App.upgradeGroupView contentBinding="group"}} {{/each}} - </div> - {{else}} + {{/if}} + </div> + {{#unless view.isLoaded}} <div class="spinner"></div> - {{/if}} + {{/unless}} </div>
