Repository: ambari Updated Branches: refs/heads/trunk 3ad2ffb85 -> c41208dc9
AMBARI-19212. Fix styles for disabled buttons (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c41208dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c41208dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c41208dc Branch: refs/heads/trunk Commit: c41208dc980a546dc058bf917650e3726dc0e682 Parents: 3ad2ffb Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Dec 15 15:30:41 2016 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Dec 15 15:30:41 2016 +0200 ---------------------------------------------------------------------- .../templates/main/admin/highAvailability/nameNode/step3.hbs | 2 +- .../main/admin/highAvailability/resourceManager/step3.hbs | 2 +- ambari-web/app/templates/main/admin/kerberos/step1.hbs | 2 +- ambari-web/app/templates/main/admin/kerberos/step2.hbs | 6 +++--- .../app/templates/main/alerts/add_alert_definition/step2.hbs | 4 ++-- .../app/templates/main/alerts/add_alert_definition/step3.hbs | 4 ++-- .../app/templates/main/alerts/manage_alert_groups_popup.hbs | 4 ++-- ambari-web/app/templates/main/service/reassign/step1.hbs | 2 +- ambari-web/app/templates/main/service/reassign/step5.hbs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs index de303c6..116845c 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs @@ -75,7 +75,7 @@ <div class="wizard-footer col-md-12"> <div class="btn-area"> <a class="btn btn-default" {{action back}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" {{bindAttr disabled="controller.isNextDisabled"}} {{action next}}>{{t common.next}} →</a> + <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isNextDisabled"}} {{action next}}>{{t common.next}} →</button> {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="pull-right"}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs index d6bcbac..1956263 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/resourceManager/step3.hbs @@ -58,6 +58,6 @@ <div class="wizard-footer col-md-12"> <div class="btn-area"> <a class="btn btn-default" {{action back}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</a> + <button class="btn btn-success pull-right" {{action submit target="controller"}} {{bindAttr disabled="controller.isSubmitDisabled"}}>{{t common.next}} →</button> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/admin/kerberos/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step1.hbs b/ambari-web/app/templates/main/admin/kerberos/step1.hbs index e53db25..19e5596 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step1.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/step1.hbs @@ -57,6 +57,6 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a id="submit-kerberos-step1" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "next" target="controller"}}>{{t common.next}} →</a> + <button id="submit-kerberos-step1" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action "next" target="controller"}}>{{t common.next}} →</button> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/admin/kerberos/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos/step2.hbs b/ambari-web/app/templates/main/admin/kerberos/step2.hbs index 384a25d..c17347c 100644 --- a/ambari-web/app/templates/main/admin/kerberos/step2.hbs +++ b/ambari-web/app/templates/main/admin/kerberos/step2.hbs @@ -34,9 +34,9 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a id="back-kerberos-step2" class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> - <a id="submit-kerberos-step2" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} - {{action submit target="controller"}}>{{t common.next}} →</a> + <button id="back-kerberos-step2" class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</button> + <button id="submit-kerberos-step2" class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} + {{action submit target="controller"}}>{{t common.next}} →</button> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs b/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs index f9278d0..8d685fd 100644 --- a/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs +++ b/ambari-web/app/templates/main/alerts/add_alert_definition/step2.hbs @@ -25,7 +25,7 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> + <button class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</button> + <button class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</button> </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs b/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs index 89c3253..c615f02 100644 --- a/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs +++ b/ambari-web/app/templates/main/alerts/add_alert_definition/step3.hbs @@ -30,7 +30,7 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</a> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action done}}>{{t common.done}} </a> + <button class="btn btn-default" {{bindAttr disabled="isBackBtnDisabled"}} {{action back}}>← {{t common.back}}</button> + <button class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action done}}>{{t common.done}} </button> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs index 9e4b07f..db9a560 100644 --- a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs +++ b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs @@ -36,8 +36,8 @@ <div class="btn-toolbar pull-right"> <button rel="button-info" class="btn btn-default add-group-button" {{bindAttr data-original-title="view.addButtonTooltip"}} {{action addAlertGroup target="controller"}}><i class="glyphicon glyphicon-plus"></i></button> - <a rel="button-info" class="btn btn-default remove-group-button" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}} - {{action confirmDelete target="controller"}}><i class="glyphicon glyphicon-minus"></i></a> + <button rel="button-info" class="btn btn-default remove-group-button" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}} + {{action confirmDelete target="controller"}}><i class="glyphicon glyphicon-minus"></i></button> <div class="btn-group"> <button class="btn btn-default dropdown-toggle actions-group-button" data-toggle="dropdown"> <i class="glyphicon glyphicon-cog"></i> <span class="caret"></span> http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/service/reassign/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step1.hbs b/ambari-web/app/templates/main/service/reassign/step1.hbs index f34a9a1..fd6e570 100644 --- a/ambari-web/app/templates/main/service/reassign/step1.hbs +++ b/ambari-web/app/templates/main/service/reassign/step1.hbs @@ -25,6 +25,6 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> + <button class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</button> </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/c41208dc/ambari-web/app/templates/main/service/reassign/step5.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/reassign/step5.hbs b/ambari-web/app/templates/main/service/reassign/step5.hbs index a9cfb45..09e6646 100644 --- a/ambari-web/app/templates/main/service/reassign/step5.hbs +++ b/ambari-web/app/templates/main/service/reassign/step5.hbs @@ -28,7 +28,7 @@ </div> <div class="wizard-footer col-md-12"> <div class="btn-area"> - <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</a> + <button class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} →</button> </div> </div>
