You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2014/10/01 04:20:24 UTC
git commit: ARGUS-89:Main screen streamlining
Repository: incubator-argus
Updated Branches:
refs/heads/master cc6c4394e -> 24526c6ec
ARGUS-89:Main screen streamlining
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/24526c6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/24526c6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/24526c6e
Branch: refs/heads/master
Commit: 24526c6ec55a2c529cec84dc32652c6127433eba
Parents: cc6c439
Author: vperiasamy <vp...@hortonworks.com>
Authored: Tue Sep 30 18:18:02 2014 -0700
Committer: sneethiraj <sn...@apache.org>
Committed: Tue Sep 30 19:10:45 2014 -0700
----------------------------------------------------------------------
.../src/main/webapp/images/data-grey.png | Bin 0 -> 1468 bytes
.../src/main/webapp/images/folder-grey.png | Bin 0 -> 1372 bytes
.../src/main/webapp/images/router-grey.png | Bin 0 -> 1533 bytes
.../src/main/webapp/images/task-grey.png | Bin 0 -> 1187 bytes
security-admin/src/main/webapp/styles/xa.css | 20 ++++--
.../common/PolicyManagerLayout_tmpl.html | 64 +++++++++++++------
6 files changed, 60 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/images/data-grey.png
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/images/data-grey.png b/security-admin/src/main/webapp/images/data-grey.png
new file mode 100644
index 0000000..dabec13
Binary files /dev/null and b/security-admin/src/main/webapp/images/data-grey.png differ
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/images/folder-grey.png
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/images/folder-grey.png b/security-admin/src/main/webapp/images/folder-grey.png
new file mode 100644
index 0000000..0149cf2
Binary files /dev/null and b/security-admin/src/main/webapp/images/folder-grey.png differ
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/images/router-grey.png
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/images/router-grey.png b/security-admin/src/main/webapp/images/router-grey.png
new file mode 100644
index 0000000..5424139
Binary files /dev/null and b/security-admin/src/main/webapp/images/router-grey.png differ
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/images/task-grey.png
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/images/task-grey.png b/security-admin/src/main/webapp/images/task-grey.png
new file mode 100644
index 0000000..6c76084
Binary files /dev/null and b/security-admin/src/main/webapp/images/task-grey.png differ
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/styles/xa.css
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css
index 6882315..290cb76 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -1524,9 +1524,6 @@ table.table.backgrid thead th.repoName {
display: block;
margin-top: 6%;
}
-.policy-manager img {
- max-height: 40px;
-}
/* Login Page */
body.login {
@@ -1638,6 +1635,21 @@ tr.disable-policy td {
.policy-disabled .formHeader,
.policy-disabled .control-label {
color:#aaa;
-}td.html-cell.renderable:last-child {
+}
+
+td.html-cell.renderable:last-child {
text-align:center;
+}
+
+.policy-manager span.policy-title {
+ font-size: 20px;
+ line-height: 32px;
+ text-transform: uppercase;
+ color: #707070;
+}
+.policy-manager table thead tr th:first-child {
+ background-color: #d8d8d8;
+}
+.policy-manager table thead tr th:first-child a {
+ color: #707070;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/24526c6e/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html b/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html
index 13c7ad4..18a21c0 100644
--- a/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html
@@ -8,10 +8,15 @@
<!-- table-policy -->
<thead>
<tr>
- <th><img alt="HDFS" src="images/hdfs.jpg">
- {{#if isSysAdmin}} <a href="{{assetCreateHref}}/{{hdfsVal}}"
- class="pull-right" title="Add"> <i class="icon-plus"></i>
- </a> {{/if}}</th>
+ <th>
+ <span class="policy-title">
+ <img alt="HDFS" src="images/folder-grey.png">
+ HDFS
+ {{#if isSysAdmin}}
+ <a href="{{assetCreateHref}}/{{hdfsVal}}"class="pull-right" title="Add"> <i class="icon-plus"></i></a>
+ {{/if}}
+ </span>
+ </th>
</tr>
</thead>
<tbody>
@@ -54,10 +59,15 @@
<!-- table-policy -->
<thead>
<tr>
- <th><img alt="Hive" src="images/hive.png" >
- {{#if isSysAdmin}} <a href="{{assetCreateHref}}/{{hiveVal}}"
- class="pull-right" title="Add"><i class="icon-plus"></i></a></th>
- {{/if}}
+ <th>
+ <span class="policy-title">
+ <img alt="Hive" src="images/data-grey.png" >
+ Hive
+ {{#if isSysAdmin}}
+ <a href="{{assetCreateHref}}/{{hiveVal}}" class="pull-right" title="Add"><i class="icon-plus"></i></a>
+ {{/if}}
+ </span>
+ </th>
</tr>
</thead>
<tbody>
@@ -99,10 +109,15 @@
<!-- table-policy -->
<thead>
<tr>
- <th><img alt="HBase" src="images/hbase.jpg" >
- {{#if isSysAdmin}} <a href="{{assetCreateHref}}/{{hbaseVal}}"
- class="pull-right" title="Add"><i class="icon-plus"></i></a></th>
- {{/if}}
+ <th>
+ <span class="policy-title">
+ <img alt="HBase" src="images/data-grey.png" >
+ Hbase
+ {{#if isSysAdmin}}
+ <a href="{{assetCreateHref}}/{{hbaseVal}}" class="pull-right" title="Add"><i class="icon-plus"></i></a>
+ {{/if}}
+ </span>
+ </th>
</tr>
</thead>
<tbody>
@@ -146,10 +161,15 @@
<!-- table-policy -->
<thead>
<tr>
- <th><img alt="KNOX" src="images/knox.gif" >
- {{#if isSysAdmin}} <a href="{{assetCreateHref}}/{{knoxVal}}"
- class="pull-right" title="Add"> <i class="icon-plus"></i>
- </a> {{/if}}</th>
+ <th>
+ <span class="policy-title">
+ <img alt="KNOX" src="images/router-grey.png" >
+ Knox
+ {{#if isSysAdmin}}
+ <a href="{{assetCreateHref}}/{{knoxVal}}" class="pull-right" title="Add"> <i class="icon-plus"></i></a>
+ {{/if}}
+ </span>
+ </th>
</tr>
</thead>
<tbody>
@@ -191,10 +211,14 @@
<!-- table-policy -->
<thead>
<tr>
- <th><img alt="STORM" src="images/storm.png" >
- {{#if isSysAdmin}} <a href="{{assetCreateHref}}/{{stormVal}}"
- class="pull-right" title="Add"> <i class="icon-plus"></i>
- </a> {{/if}}</th>
+ <th>
+ <span class="policy-title">
+ <img alt="STORM" src="images/task-grey.png" >
+ Storm
+ {{#if isSysAdmin}}
+ <a href="{{assetCreateHref}}/{{stormVal}}" class="pull-right" title="Add"> <i class="icon-plus"></i></a>
+ {{/if}}
+ </th>
</tr>
</thead>
<tbody>