Repository: ambari Updated Branches: refs/heads/branch-1.7.0 57c4d722f -> f2e62d3a6
AMBARI-7755. Admin View: when Create Instance button is disabled while the view is deploying, the hover cursor should be "disallow" and should show tooltip text. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2e62d3a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2e62d3a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2e62d3a Branch: refs/heads/branch-1.7.0 Commit: f2e62d3a67967da0673e627e4d5a573f499a4a7d Parents: 57c4d72 Author: Jaimin Jetly <[email protected]> Authored: Mon Oct 13 10:50:16 2014 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon Oct 13 10:50:29 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/ui/admin-web/app/styles/main.css | 6 +++--- .../ui/admin-web/app/views/ambariViews/listTable.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f2e62d3a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index 789af82..00ec56c 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -363,10 +363,10 @@ a.gotoinstance{ -o-transform: translateY(2px); transform: translateY(2px); } -.btn.deleteuser-btn.disabled, .btn.deleteuser-btn[disabled], .btn.btn-delete-instance.disabled{ +.btn.deleteuser-btn.disabled, .btn.deleteuser-btn[disabled], .btn.btn-delete-instance.disabled, .btn-default.disabled{ pointer-events: auto; - cursor: not-allowed; - background-color: #e6e6e6; + cursor: not-allowed !important; + background-color: #e6e6e6 !important; } .about .logo{ http://git-wip-us.apache.org/repos/asf/ambari/blob/f2e62d3a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html index d2ab32a..41fb450 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html @@ -80,7 +80,7 @@ <tr> <td class="col-sm-3"></td> <td class="col-sm-3"> - <a class="btn btn-default createisntance-btn {{view.canCreateInstance ? '' : 'disabled'}}" href="#/views/{{view.view_name}}/versions/{{view.versionsList[view.versionsList.length-1].ViewVersionInfo.version}}/new"><span class="glyphicon glyphicon-plus" ></span> Create Instance</a> + <a tooltip="{{view.canCreateInstance ? '' : 'Unable to create view instances'}}" class="btn btn-default createisntance-btn {{view.canCreateInstance ? '' : 'disabled'}}" href="#/views/{{view.view_name}}/versions/{{view.versionsList[view.versionsList.length-1].ViewVersionInfo.version}}/new"><span class="glyphicon glyphicon-plus"></span> Create Instance</a> </td> <td class="col-sm-3"></td> <td class="col-sm-3">
