You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/04/28 18:53:56 UTC
[3/3] ambari git commit: AMBARI-16126. Ambari Admin: table header and
body in RBAC popup are misaligned (alexantonenko)
AMBARI-16126. Ambari Admin: table header and body in RBAC popup are misaligned (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c16c306b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c16c306b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c16c306b
Branch: refs/heads/trunk
Commit: c16c306b63509a167f60d1785c26005a1b315cda
Parents: f9ee4a0
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Apr 28 13:42:06 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Apr 28 19:53:48 2016 +0300
----------------------------------------------------------------------
.../resources/ui/admin-web/app/styles/main.css | 75 +++++++++++++++-----
.../app/views/modals/RoleDetailsModal.html | 38 +++++-----
2 files changed, 78 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c16c306b/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 b55d89c..b4e70f6 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
@@ -1430,11 +1430,11 @@ thead.view-permission-header > tr > th {
}
.left-menu-all-repos .repos-table {
- margin-bottom: 0px;
+ margin-bottom: 0;
}
.left-menu-all-repos .panel-body {
- padding: 15px 0px;
+ padding: 15px 0;
}
.left-menu-all-repos .repos-table .repos-td{
@@ -1492,8 +1492,8 @@ thead.view-permission-header > tr > th {
.register-version-form .repos-panel .remove-icon {
color: red;
- margin: 20px 0px;
- padding: 0px;
+ margin: 20px 0;
+ padding: 0;
text-align: center;
cursor: pointer;
}
@@ -1529,27 +1529,66 @@ thead.view-permission-header > tr > th {
cursor: pointer;
}
-.role-details-modal table {
- table-layout: fixed;
+.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 .fixed-header {
- font-weight: bold;
- margin: 0px;
+.role-details-modal .table-body {
+ height: 500px;
+ width: 100%;
+ overflow-y: auto;
}
-.role-details-modal .first-column{
- width: 28%;
+.role-details-modal .table-row-wrapper {
+ width: 100%;
+ display: table;
+ table-layout: fixed;
}
-.role-details-modal .not-first-column{
- width: 12%;
+.role-details-modal .table-row {
+ display: table-row;
}
-.role-details-modal .role-detail-content-wrapper {
- height: 500px;
- overflow-y: auto;
- border: 0px;
- margin:0px;
+.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 .table-cell:first-of-type {
+ width: 25%;
+ border-left-width: 1px;
+}
+
+.role-details-modal .table-head-wrapper .table-cell {
+ border-bottom-width: 0;
+ font-weight: bold;
+}
+
+.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;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/c16c306b/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 3dc82a3..5878fab 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,24 +20,28 @@
<h4 class="modal-title">{{'common.rbac' | translate}}</h4>
</div>
<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 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">
+ <i class="glyphicon glyphicon-ok green-icon" ng-show="role.authHash[auth]"></i>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div class="modal-footer text-center">
<button class="btn btn-primary" ng-click="ok()">{{'common.controls.close' | translate}}</button>