You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2016/06/08 08:11:22 UTC
ambari git commit: AMBARI-17090. Next and Back buttons in Ambari UI
install wizard should follow common patterns (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 8b88170da -> 8a38959c4
AMBARI-17090. Next and Back buttons in Ambari UI install wizard should follow common patterns (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a38959c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a38959c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a38959c
Branch: refs/heads/branch-2.4
Commit: 8a38959c4c943981700ad8f735c4c3ffc48cab11
Parents: 8b88170
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Jun 7 15:45:28 2016 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Jun 8 11:11:15 2016 +0300
----------------------------------------------------------------------
ambari-web/app/templates/common/assign_master_components.hbs | 2 +-
ambari-web/app/templates/wizard/step2.hbs | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a38959c/ambari-web/app/templates/common/assign_master_components.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/assign_master_components.hbs b/ambari-web/app/templates/common/assign_master_components.hbs
index fc19508..7d61bc3 100644
--- a/ambari-web/app/templates/common/assign_master_components.hbs
+++ b/ambari-web/app/templates/common/assign_master_components.hbs
@@ -155,7 +155,7 @@
{{view.acceptButtonText}}
</a>
{{#if view.isCancelButtonVisible}}
- <a class="btn pull-right mrm" {{action onCancel target="controller"}}>{{t common.cancel}}</a>
+ <button class="btn pull-right mrm" {{action onCancel target="controller"}}>{{t common.cancel}}</button>
{{/if}}
{{#if App.router.nextBtnClickInProgress}}
{{view App.SpinnerView tagName="span" classNames="pull-right"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a38959c/ambari-web/app/templates/wizard/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step2.hbs b/ambari-web/app/templates/wizard/step2.hbs
index 790d23d..42db6cc 100644
--- a/ambari-web/app/templates/wizard/step2.hbs
+++ b/ambari-web/app/templates/wizard/step2.hbs
@@ -145,19 +145,19 @@
<div class="btn-area">
{{#unless view.parentView.controller.hideBackButton}}
- <a class="btn pull-left installer-back-btn" {{action back}} {{bindAttr disabled="App.router.btnClickInProgress"}}>
+ <button class="btn pull-left installer-back-btn" {{action back}} {{bindAttr disabled="App.router.btnClickInProgress"}}>
← {{t common.back}}
{{#if App.router.backBtnClickInProgress}}
{{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
{{/if}}
- </a>
+ </button>
{{/unless}}
- <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action evaluateStep target="controller"}}>
+ <button class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action evaluateStep target="controller"}}>
{{#if App.router.nextBtnClickInProgress}}
{{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
{{/if}}
{{t installer.step2.registerAndConfirm}} →
- </a>
+ </button>
</div>
</div>