You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2016/05/06 21:54:16 UTC
ambari git commit: Revert AMBARI-16126. Ambari Admin: table header
and body in RBAC popup are misaligned (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 65834423f -> 766ad0a70
Revert AMBARI-16126. Ambari Admin: table header and body in RBAC popup are misaligned (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/766ad0a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/766ad0a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/766ad0a7
Branch: refs/heads/trunk
Commit: 766ad0a70fd5e027b8d94bfb09e1b0019127c1e5
Parents: 6583442
Author: Richard Zang <rz...@apache.org>
Authored: Fri May 6 14:51:35 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Fri May 6 14:51:35 2016 -0700
----------------------------------------------------------------------
.../resources/ui/admin-web/app/styles/main.css | 67 ++++----------------
.../app/views/modals/RoleDetailsModal.html | 36 +++++------
2 files changed, 30 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/766ad0a7/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 0f78d34..4c81507 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
@@ -1601,68 +1601,29 @@ thead.view-permission-header > tr > th {
cursor: pointer;
}
-.role-details-modal .table-head-wrapper {
- position: relative;
-}
-
-.role-details-modal .table-head {
- width: 100%;
- overflow-x: hidden;
- overflow-y: scroll;
- border-width: 1px 0;
- border-style: solid;
- border-color: #ddd;
-}
-
-.role-details-modal .table-body {
- height: 500px;
- width: 100%;
- overflow-y: auto;
-}
-
-.role-details-modal .table-row-wrapper {
- width: 100%;
- display: table;
+.role-details-modal table {
table-layout: fixed;
+ width: 100%;
}
-.role-details-modal .table-row {
- display: table-row;
-}
-
-.role-details-modal .table-cell {
- width: 12.5%;
- display: table-cell;
- border-color: #ddd;
- border-style: solid;
- border-width: 0 1px 1px 0;
- padding: 8px;
- line-height: 1.42857143;
- vertical-align: top;
+.role-details-modal .fixed-header {
+ font-weight: bold;
+ margin: 0px;
}
-.role-details-modal .table-cell:first-of-type {
- width: 25%;
- border-left-width: 1px;
+.role-details-modal .first-column{
+ width: 28%;
}
-.role-details-modal .table-head-wrapper .table-cell {
- border-bottom-width: 0;
- font-weight: bold;
+.role-details-modal .not-first-column{
+ width: 12%;
}
-.role-details-modal .table-head-wrapper > .table-cell:last-of-type {
- position: absolute;
- right: 0;
- top: 1px;
- bottom: 1px;
- padding-left: 0;
- background-color: #fff;
- text-align: center;
-}
-
-.role-details-modal .table-head .table-cell:last-of-type {
- visibility: hidden;
+.role-details-modal .role-detail-content-wrapper {
+ height: 500px;
+ overflow-y: auto;
+ border: 0px;
+ margin:0px;
}
.cluster-inherited-permission {
http://git-wip-us.apache.org/repos/asf/ambari/blob/766ad0a7/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 5878fab..74a1807 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
@@ -20,27 +20,23 @@
<h4 class="modal-title">{{'common.rbac' | translate}}</h4>
</div>
<div class="modal-body role-details-modal">
- <div class="table-head-wrapper">
- <div class="table-head">
- <div class="table-row-wrapper">
- <div class="table-row">
- <div class="table-cell"></div>
- <div class="table-cell" ng-repeat="role in roles">{{role.permission_label}}</div>
- </div>
- </div>
- </div>
- </div>
- <div class="table-cell">{{roles[roles.length - 1].permission_label}}</div>
- </div>
- <div class="table-body">
- <div class="table-row-wrapper">
- <div class="table-row" ng-repeat="auth in orderedAuthorizations">
- <div class="table-cell">{{authHash[auth]}}</div>
- <div class="table-cell text-center" ng-repeat="role in roles">
+ <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>
- </div>
- </div>
- </div>
+ </td>
+ </tr>
+ </table>
</div>
</div>
<div class="modal-footer text-center">