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 2015/01/26 18:30:30 UTC
ambari git commit: AMBARI-9335. Kerberos: Show progress spinner
during Kerberize Cluster step in UI. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk f28c64f8d -> 6a4925f59
AMBARI-9335. Kerberos: Show progress spinner during Kerberize Cluster step in UI. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a4925f5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a4925f5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a4925f5
Branch: refs/heads/trunk
Commit: 6a4925f5904e5319677ea80ae3c42b22c5fd13ea
Parents: f28c64f
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Jan 26 18:59:07 2015 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Jan 26 19:29:43 2015 +0200
----------------------------------------------------------------------
ambari-web/app/templates/common/progress.hbs | 78 ++++++++++++-----------
1 file changed, 41 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a4925f5/ambari-web/app/templates/common/progress.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/progress.hbs b/ambari-web/app/templates/common/progress.hbs
index 409bf31..92942d9 100644
--- a/ambari-web/app/templates/common/progress.hbs
+++ b/ambari-web/app/templates/common/progress.hbs
@@ -25,46 +25,50 @@
</a>
{{/if}}
</div>
- {{#each task in controller.tasks}}
- {{#view view.taskView contentBinding="task"}}
- <div class="item">
- <div {{bindAttr class=":pull-left view.linkClass isKerberosWizard:span4 controller.isHA:span4 controller.isRMHA:span5 controller.isRollback:span3 controller.isReassign:span5"}}>
- <i {{bindAttr class="view.icon view.iconColor"}}></i>
- <a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a>
- </div>
- <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
- <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>
+ {{#if controller.tasks.length}}
+ {{#each task in controller.tasks}}
+ {{#view view.taskView contentBinding="task"}}
+ <div class="item">
+ <div {{bindAttr class=":pull-left view.linkClass isKerberosWizard:span4 controller.isHA:span4 controller.isRMHA:span5 controller.isRollback:span3 controller.isReassign:span5"}}>
+ <i {{bindAttr class="view.icon view.iconColor"}}></i>
+ <a {{action "showHostProgressPopup" task target="controller"}} >{{task.title}}</a>
+ </div>
+ <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
+ <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>
</div>
+ <div {{bindAttr class=":span1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
+ </div>
+ <div>
+ {{#if task.showRetry}}
+ <a {{action retryTask target="controller"}} class="btn btn-primary retry"
+ rel="tooltip"
+ data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
+ <i class="icon-repeat icon-white"></i>
+ {{t common.retry}}
+ </a>
+ {{/if}}
+ {{#if task.showRollback}}
+ <a {{action rollback target="controller"}} class="btn btn-primary retry">
+ <i class="icon-repeat icon-white"></i>
+ {{t common.rollBack}}
+ </a>
+ {{/if}}
+ {{#if task.showSkip}}
+ <a {{action skipTask target="controller"}} class="btn btn-primary retry">
+ <i class="icon-step-forward icon-white"></i>
+ {{t common.skip}}
+ </a>
+ {{/if}}
</div>
- <div {{bindAttr class=":span1 view.hidePercent:noDisplay"}}>{{task.progress}}%</div>
- </div>
- <div>
- {{#if task.showRetry}}
- <a {{action retryTask target="controller"}} class="btn btn-primary retry"
- rel="tooltip"
- data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
- <i class="icon-repeat icon-white"></i>
- {{t common.retry}}
- </a>
- {{/if}}
- {{#if task.showRollback}}
- <a {{action rollback target="controller"}} class="btn btn-primary retry">
- <i class="icon-repeat icon-white"></i>
- {{t common.rollBack}}
- </a>
- {{/if}}
- {{#if task.showSkip}}
- <a {{action skipTask target="controller"}} class="btn btn-primary retry">
- <i class="icon-step-forward icon-white"></i>
- {{t common.skip}}
- </a>
- {{/if}}
</div>
- </div>
- {{/view}}
- {{/each}}
+ {{/view}}
+ {{/each}}
+ {{else}}
+ <div class="spinner"></div>
+ {{/if}}
<div class="btn-area">
{{#if view.showBackButton}}
<button class="btn pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}} {{action back target="controller"}}>← {{t common.back}}</button>