Author: chanaka
Date: Thu Feb 7 22:12:18 2008
New Revision: 13421
Log:
alignment issues with permissions page were fixed
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/css/main.css
branches/registry/1_0/modules/webapps/src/main/webapp/admin/permisions.jsp
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/css/main.css
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/css/main.css
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/css/main.css
Thu Feb 7 22:12:18 2008
@@ -469,7 +469,7 @@
}
.data-table td{
-border-bottom:solid 1px #ededd1;
+border-bottom:solid 1px #d7d7bd;
padding-top:3px;
padding-left:5px;
text-align:left;
@@ -481,6 +481,23 @@
padding-left:5px;
text-align:left;
}
+.subTH{
+background-color:#e1e1b2;
+text-align:center !important;
+font-weight:bold;
+border-right:solid 1px #d7d7bd;
+}
+.importantArea{
+padding:5px;
+border:solid 1px #d7d7bd;
+background-color:#ededd1;
+}
+.importantAreaSeperation{
+border-top:solid 1px #d7d7bd;
+}
+.lineSeperationRight{
+border-right:solid 1px #d7d7bd;
+}
.form-table td{
padding-top:10px;
}
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/permisions.jsp
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/permisions.jsp
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/permisions.jsp
Thu Feb 7 22:12:18 2008
@@ -20,11 +20,12 @@
<h4>Add New Permissions</h4>
<form theme="simple">
+<div class="importantArea" style="margin-top:10px;">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td>User</td>
<td>
- <select id="userToAuthorize" name="userToAuthorize">
+ <select id="userToAuthorize" name="userToAuthorize"
style="width:100px;">
<%
Iterator iUsers = resource.getUserNames().iterator();
while (iUsers.hasNext()) {
@@ -38,7 +39,7 @@
<td align="right">Action</td>
<td>
<select id="actionToAuthorize" name="actionToAuthorize">
- <option value="1">-- Select an action --</option>
+ <option value="1">-Select-</option>
<option value="2">Read</option>
<option value="3">Write</option>
<option value="4">Delete</option>
@@ -48,9 +49,12 @@
<td>
<input type="radio" id="permissionAllow" name="permissionType"
value="1" checked="checked" />Allow <input type="radio" id="permissionDeny"
name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="button" class="button" value="Add
Permission" onclick="addUserPermission('<%=resource.getPath()%>')"/></td>
+ </tr>
+ <tr>
+ <td colspan="5" align="right" class="importantAreaSeperation"><input
type="button" class="button" value="Add Permission"
onclick="addUserPermission('<%=resource.getPath()%>')"/></td>
</tr>
</table>
+</div>
</form>
<h4 style="margin-top:10px;">Defined User Permissions</h4>
<form name="permissions" theme="simple" method="post">
@@ -58,21 +62,22 @@
<input type="hidden" name="pathToAuthorize"
value="<%=resource.getPath()%>"/>
<table width="100%" class="data-table" border="0" cellpadding="3"
cellspacing="0">
<tr >
- <th rowspan="2" align="left" style="width:120px;" >User Name </th>
- <th colspan="2" align="center">Read</th>
- <th colspan="2" align="center">Write</th>
- <th colspan="2" align="center">Delete</th>
- <th colspan="2" align="center">Authorize</th>
- </tr>
- <tr>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
+ <td align="left" style="width:120px;" valign="top"
class="subTH">User</td>
+ <td colspan="2" align="center" class="subTH">Read</td>
+ <td colspan="2" align="center" class="subTH">Write</td>
+ <td colspan="2" align="center" class="subTH">Delete</td>
+ <td colspan="2" align="center" class="subTH">Authorize</td>
+ </tr>
+ <tr>
+ <th align="center" class="lineSeperationRight"></th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;">Deny</th>
</tr>
<%
@@ -82,19 +87,19 @@
%>
<tr>
- <td><%=permission.getUserName()%></td>
+ <td class="lineSeperationRight"><%=permission.getUserName()%></td>
<td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^ra"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^ra',
'<%=permission.getUserName()%>^rd')" name="<%=permission.getUserName()%>"
value="ra" <% if (permission.isReadAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rd',
'<%=permission.getUserName()%>^ra')" name="<%=permission.getUserName()%>"
value="rd" <% if (permission.isReadDeny()) { %> checked <% } %>/></td>
+ <td width="100" class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^rd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rd',
'<%=permission.getUserName()%>^ra')" name="<%=permission.getUserName()%>"
value="rd" <% if (permission.isReadDeny()) { %> checked <% } %>/></td>
<td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^wa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^wa',
'<%=permission.getUserName()%>^wd')" name="<%=permission.getUserName()%>"
value="wa" <% if (permission.isWriteAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^wd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^wd',
'<%=permission.getUserName()%>^wa')" name="<%=permission.getUserName()%>"
value="wd" <% if (permission.isWriteDeny()) { %> checked <% } %>/></td>
+ <td width="100" class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^wd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^wd',
'<%=permission.getUserName()%>^wa')" name="<%=permission.getUserName()%>"
value="wd" <% if (permission.isWriteDeny()) { %> checked <% } %>/></td>
<td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^da"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^da',
'<%=permission.getUserName()%>^dd')" name="<%=permission.getUserName()%>"
value="da" <% if (permission.isDeleteAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^dd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^dd',
'<%=permission.getUserName()%>^da')" name="<%=permission.getUserName()%>"
value="dd" <% if (permission.isDeleteDeny()) { %> checked <% } %>/></td>
+ <td width="100" class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^dd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^dd',
'<%=permission.getUserName()%>^da')" name="<%=permission.getUserName()%>"
value="dd" <% if (permission.isDeleteDeny()) { %> checked <% } %>/></td>
<td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^aa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^aa',
'<%=permission.getUserName()%>^ad')" name="<%=permission.getUserName()%>"
value="aa" <% if (permission.isAuthorizeAllow()) { %> checked <% } %>/></td>
<td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^ad"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^ad',
'<%=permission.getUserName()%>^aa')" name="<%=permission.getUserName()%>"
value="ad" <% if (permission.isAuthorizeDeny()) { %> checked <% } %>/></td>
</tr>
<% } %>
<tr>
- <td colspan="7" align="right"><input type="button" class="button"
value="Apply All Permissions"
onclick="processPermissions('<%=resource.getPath()%>');" style="margin-top:5px;
float:right;" /><span style="clear:both;" /></td>
+ <td colspan="9" align="right"><input type="button" class="button"
value="Apply All Permissions"
onclick="processPermissions('<%=resource.getPath()%>');" style="margin-top:5px;
float:right;" /><span style="clear:both;" /></td>
</tr>
</table>
</form>
@@ -104,6 +109,7 @@
<div id="rolePermisionsDiv" class="rolePermisionsDiv leftSpace">
<h4>New Role Permissions</h4>
<form theme="simple">
+<div class="importantArea" style="margin-top:10px;">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td>Role</td>
@@ -121,8 +127,8 @@
</td>
<td align="right">Action</td>
<td>
- <select id="roleActionToAuthorize" name="actionToAuthorize">
- <option value="1">-- Select an action --</option>
+ <select id="roleActionToAuthorize" name="actionToAuthorize"
style="width:100px;">
+ <option value="1">-Select-</option>
<option value="2">Read</option>
<option value="3">Write</option>
<option value="4">Delete</option>
@@ -132,9 +138,12 @@
<td>
<input type="radio" id="rolePermissionAllow"
name="permissionType" value="1" checked="checked" />Allow <input type="radio"
id="rolePermissionDeny" name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="button" class="button" value="Add
Permission" onclick="addRolePermission('<%=resource.getPath()%>')"/></td>
+ </tr>
+ <tr>
+ <td colspan="5" class="importantAreaSeperation"
align="right"><input type="button" class="button" value="Add Permission"
onclick="addRolePermission('<%=resource.getPath()%>')"/></td>
</tr>
</table>
+</div>
</form>
<h4 style="margin-top:10px;">Defined Role Permissions</h4>
<form name="rolePermissions" theme="simple">
@@ -142,21 +151,22 @@
<input type="hidden" name="pathToAuthorize" value="%{path}"/>
<table width="100%" class="data-table" border="0" cellpadding="3"
cellspacing="0">
<tr >
- <th rowspan="2" align="left" >Role Name </th>
- <th colspan="2" align="center">Read</th>
- <th colspan="2" align="center">Write</th>
- <th colspan="2" align="center">Delete</th>
- <th colspan="2" align="center">Authorize</th>
- </tr>
- <tr>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
- <th align="center">Allow</th>
- <th align="center">Deny</th>
+ <td align="left" class="subTH">Role</td>
+ <td colspan="2" align="center" class="subTH">Read</td>
+ <td colspan="2" align="center" class="subTH">Write</td>
+ <td colspan="2" align="center" class="subTH">Delete</td>
+ <td colspan="2" align="center" class="subTH">Authorize</td>
+ </tr>
+ <tr>
+ <th class="lineSeperationRight"></th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
+ <th align="center" style="font-weight:normal;">Allow</th>
+ <th align="center" style="font-weight:normal;"
class="lineSeperationRight">Deny</th>
</tr>
<%
@@ -166,19 +176,19 @@
%>
<tr>
- <td><%=permission.getUserName()%></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rra"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rra',
'<%=permission.getUserName()%>^rrd')" name="<%=permission.getUserName()%>"
value="ra" <% if (permission.isReadAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rrd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rrd',
'<%=permission.getUserName()%>^rra')" name="<%=permission.getUserName()%>"
value="rd" <% if (permission.isReadDeny()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rwa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rwa',
'<%=permission.getUserName()%>^rwd')" name="<%=permission.getUserName()%>"
value="wa" <% if (permission.isWriteAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rwd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rwd',
'<%=permission.getUserName()%>^rwa')" name="<%=permission.getUserName()%>"
value="wd" <% if (permission.isWriteDeny()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rda"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rda',
'<%=permission.getUserName()%>^rdd')" name="<%=permission.getUserName()%>"
value="da" <% if (permission.isDeleteAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rdd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rdd',
'<%=permission.getUserName()%>^rda')" name="<%=permission.getUserName()%>"
value="dd" <% if (permission.isDeleteDeny()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^raa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^raa',
'<%=permission.getUserName()%>^rad')" name="<%=permission.getUserName()%>"
value="aa" <% if (permission.isAuthorizeAllow()) { %> checked <% } %>/></td>
- <td width="100"><input type="checkbox"
id="<%=permission.getUserName()%>^rad"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rad',
'<%=permission.getUserName()%>^raa')" name="<%=permission.getUserName()%>"
value="ad" <% if (permission.isAuthorizeDeny()) { %> checked <% } %>/></td>
+ <td class="lineSeperationRight"><%=permission.getUserName()%></td>
+ <td><input type="checkbox" id="<%=permission.getUserName()%>^rra"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rra',
'<%=permission.getUserName()%>^rrd')" name="<%=permission.getUserName()%>"
value="ra" <% if (permission.isReadAllow()) { %> checked <% } %>/></td>
+ <td class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^rrd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rrd',
'<%=permission.getUserName()%>^rra')" name="<%=permission.getUserName()%>"
value="rd" <% if (permission.isReadDeny()) { %> checked <% } %>/></td>
+ <td><input type="checkbox" id="<%=permission.getUserName()%>^rwa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rwa',
'<%=permission.getUserName()%>^rwd')" name="<%=permission.getUserName()%>"
value="wa" <% if (permission.isWriteAllow()) { %> checked <% } %>/></td>
+ <td class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^rwd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rwd',
'<%=permission.getUserName()%>^rwa')" name="<%=permission.getUserName()%>"
value="wd" <% if (permission.isWriteDeny()) { %> checked <% } %>/></td>
+ <td><input type="checkbox" id="<%=permission.getUserName()%>^rda"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rda',
'<%=permission.getUserName()%>^rdd')" name="<%=permission.getUserName()%>"
value="da" <% if (permission.isDeleteAllow()) { %> checked <% } %>/></td>
+ <td class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^rdd"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rdd',
'<%=permission.getUserName()%>^rda')" name="<%=permission.getUserName()%>"
value="dd" <% if (permission.isDeleteDeny()) { %> checked <% } %>/></td>
+ <td><input type="checkbox" id="<%=permission.getUserName()%>^raa"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^raa',
'<%=permission.getUserName()%>^rad')" name="<%=permission.getUserName()%>"
value="aa" <% if (permission.isAuthorizeAllow()) { %> checked <% } %>/></td>
+ <td class="lineSeperationRight"><input type="checkbox"
id="<%=permission.getUserName()%>^rad"
onchange="handlePeerCheckbox('<%=permission.getUserName()%>^rad',
'<%=permission.getUserName()%>^raa')" name="<%=permission.getUserName()%>"
value="ad" <% if (permission.isAuthorizeDeny()) { %> checked <% } %>/></td>
</tr>
<% } %>
<tr>
- <td colspan="7" align="right"><input type="button" class="button"
value="Apply All Permissions"
onclick="processRolePermissions('<%=resource.getPath()%>');"
style="float:right;margin-top:5px;" /><span style="clear:both;" /></td>
+ <td colspan="9" align="right"><input type="button" class="button"
value="Apply All Permissions"
onclick="processRolePermissions('<%=resource.getPath()%>');"
style="float:right;margin-top:5px;" /><span style="clear:both;" /></td>
</tr>
</table>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
