Repository: ambari Updated Branches: refs/heads/trunk 1cb8b0c10 -> d1655dc57
AMBARI-15725: RBAC: Help page UI edits (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1655dc5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1655dc5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1655dc5 Branch: refs/heads/trunk Commit: d1655dc571accf913e720992d7645b764665aa98 Parents: 1cb8b0c Author: Richard Zang <[email protected]> Authored: Wed Apr 6 11:48:29 2016 -0700 Committer: Richard Zang <[email protected]> Committed: Wed Apr 6 11:49:04 2016 -0700 ---------------------------------------------------------------------- .../resources/ui/admin-web/app/styles/main.css | 28 ++++++++++++++++-- .../app/views/modals/RoleDetailsModal.html | 30 ++++++++++++-------- 2 files changed, 43 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d1655dc5/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 e5ebb68..edf8524 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 @@ -1505,9 +1505,6 @@ thead.view-permission-header > tr > th { .pull-up { margin-top: -2px; } -.role-select { - font-size: 20px; -} .role-name-column { width: 40%; @@ -1524,3 +1521,28 @@ thead.view-permission-header > tr > th { .cursor-pointer { cursor: pointer; } + +.role-details-modal table { + table-layout: fixed; + width: 100%; +} + +.role-details-modal .fixed-header { + font-weight: bold; + margin: 0px; +} + +.role-details-modal .first-column{ + width: 28%; +} + +.role-details-modal .not-first-column{ + width: 12%; +} + +.role-details-modal .role-detail-content-wrapper { + height: 500px; + overflow-y: auto; + border: 0px; + margin:0px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d1655dc5/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html index e2222a8..3dc82a3 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html @@ -19,19 +19,25 @@ <div class="modal-header text-center"> <h4 class="modal-title">{{'common.rbac' | translate}}</h4> </div> -<div class="modal-body"> - <table class="table table-hover table-bordered"> - <tr> - <th></th> - <th ng-repeat="role in roles">{{role.permission_label}}</th> - </tr> - <tr ng-repeat="auth in orderedAuthorizations"> - <td>{{authHash[auth]}}</td> - <td ng-repeat="role in roles" class="text-center"> - <i class="glyphicon glyphicon-ok green-icon" ng-show="role.authHash[auth]"></i> - </td> - </tr> +<div class="modal-body role-details-modal"> + <table class="table table-hover table-bordered fixed-header"> + <tbody> + <tr> + <td class="first-column"></td> + <td class="not-first-column" ng-repeat="role in roles">{{role.permission_label}}</td> + </tr> + </tbody> </table> + <div class="role-detail-content-wrapper"> + <table class="table table-hover table-bordered"> + <tr ng-repeat="auth in orderedAuthorizations"> + <td class="first-column">{{authHash[auth]}}</td> + <td class="not-first-column" ng-repeat="role in roles" class="text-center"> + <i class="glyphicon glyphicon-ok green-icon" ng-show="role.authHash[auth]"></i> + </td> + </tr> + </table> + </div> </div> <div class="modal-footer text-center"> <button class="btn btn-primary" ng-click="ok()">{{'common.controls.close' | translate}}</button>
