Repository: ambari Updated Branches: refs/heads/trunk 49d5d587b -> e2932d482
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/ce9bc3f0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce9bc3f0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce9bc3f0 Branch: refs/heads/trunk Commit: ce9bc3f060fcfc316c1fc0242daa14347282dd5a Parents: 49d5d58 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Jun 7 15:45:28 2016 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Jun 8 11:07:22 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/ce9bc3f0/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 54aedd5..1030405 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}} </button> {{#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}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/ce9bc3f0/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>
