Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3852419c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3852419c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3852419c Branch: refs/heads/master Commit: 3852419c32e5f42452f7a83f495f04b9c7c48817 Parents: 9da461d d3c8b3a Author: Madhan Neethiraj <[email protected]> Authored: Sun Sep 20 19:11:18 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Sun Sep 20 19:11:18 2015 -0700 ---------------------------------------------------------------------- .../ranger/audit/queue/AuditBatchQueue.java | 2 +- .../ranger/audit/queue/AuditFileSpool.java | 12 ++- .../apache/ranger/audit/queue/AuditQueue.java | 2 +- .../java/org/apache/ranger/biz/XUserMgr.java | 106 +++++++++++++++++++ .../apache/ranger/service/XAuditMapService.java | 43 +------- .../apache/ranger/service/XPermMapService.java | 47 +------- .../bootstrap-notify/js/bootstrap-notify.js | 44 ++++++-- .../src/main/webapp/scripts/utils/XAUtils.js | 26 ++++- .../views/policies/RangerPolicyCreate.js | 12 ++- .../scripts/views/service/ServiceCreate.js | 23 ++-- security-admin/src/main/webapp/styles/xa.css | 8 +- .../org/apache/ranger/audit/TestAuditQueue.java | 2 +- 12 files changed, 203 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3852419c/security-admin/src/main/webapp/scripts/utils/XAUtils.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3852419c/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3852419c/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3852419c/security-admin/src/main/webapp/styles/xa.css ---------------------------------------------------------------------- diff --cc security-admin/src/main/webapp/styles/xa.css index 6b3d3a8,f0c7530..d17f947 --- a/security-admin/src/main/webapp/styles/xa.css +++ b/security-admin/src/main/webapp/styles/xa.css @@@ -1839,67 -1839,8 +1839,73 @@@ td.select-row-cell #r_topNav .dropdown-menu { margin:0; } + +.table-policy-condition th, +.table-policy-condition td { + border: none !important; + white-space: nowrap; + color: #444444 !important; +} + +.table-policy-condition tr:nth-child(even) td, .table-policy-condition tr:nth-child(even) th {background-color: #FFFFFF;} +.table-policy-condition tr:nth-child(odd) td, .table-policy-condition tr:nth-child(odd) th {background-color: #EEEEEE;} + +.table-policy-condition label { + float: left; + margin-right: 10px; +} +.label-lightblue, .label-lightgreen {text-shadow:none; display: block; margin-bottom: 2px;} +.label-lightblue {background-color: #DEEEF9; color: #000;} +.label-lightgreen {background-color: #E4F4D8; color: #000;} + +input[type="radio"], input[type="checkbox"] {margin-top: 0;} + +.table-policy-condition td:nth-child(3) { + border-left: 2px solid #fff !important; +} +.table-policy-condition td:nth-child(3) label { + float: none; + text-align: center; + margin-left: 10px; +} +.white-space-normal{ + white-space: normal; + word-break: break-all; +} +.margin-top-6{ + margin-top: 6px; +} +.tag-fixed-popover { + top: 50px !important; + left: 55% !important; + margin-left: -350px !important; + max-width: 700px !important; + max-height: 500px; + overflow-y: auto; +} +.tag-fixed-popover-wrapper { + position: fixed !important; + top: 0 !important; + bottom: 0 !important; + right: 0 !important; + left: 0 !important; + z-index: 99 !important; + background-color: rgba(0,0,0,0.5); +} +.table-policy-condition label { + font-size: 12px; + text-align: left; +} +.table-policy-condition tr[data-id=storm] td label { + min-width: 170px; +} +/* align all component +.table-policy-condition td label { + min-width: 170px; - } */ ++} */ ++======= + .pause-play-close{ + margin-left: -5px; + margin-top: -2px; + font-size: 11px; -} ++}
