Author: chanaka
Date: Wed Dec 5 00:57:40 2007
New Revision: 10523
Log:
resource page modifications
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/arrowDown.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/arrowUp.gif
(contents, props changed)
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css Wed Dec
5 00:57:40 2007
@@ -47,6 +47,15 @@
padding:0px;
}
h3{
+font-size:13px;
+font-weight:bold;
+margin:0px;
+padding:0px;
+}
+h4{
+color:#515151;
+font-size:12px;
+font-weight:bold;
margin:0px;
padding:0px;
}
@@ -54,6 +63,13 @@
font-size:12px;
font-weight:bold;
}
+.h3link{
+font-size:13px;
+font-weight:bold;
+margin:0px;
+padding:0px;
+text-decoration:none;
+}
/* Form styles */
.normal-textarea{
width:100%;
@@ -338,17 +354,19 @@
}
/* Comment styles */
.comments-header{
-padding-left:5px;
-padding-top:3px;
-padding-bottom:3px;
+padding:5px;
background-color:#EDEDD1;
border:solid 1px #c6c6c6;
margin-top:10px;
}
.comments-bottom{
-border-left:solid 1px #c6c6c6;
-border-right:solid 1px #c6c6c6;
-border-bottom:solid 1px #c6c6c6;
+border:solid 1px #c6c6c6;
background-color:#ffffff;
padding:5px;
+}
+.comment-textbox{
+width:99%;
+}
+.leftSpace{
+padding-left:10px;
}
\ No newline at end of file
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/arrowDown.gif
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/arrowUp.gif
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Wed Dec
5 00:57:40 2007
@@ -144,4 +144,25 @@
document.getElementById("pRoleInput").value = msgBody;
pForm.submit();
+}
+function showHideCommon(divxName){
+ divx=document.getElementById(divxName);
+
+ /* show the intialy hidden object */
+ if(divx.style.display=='none'){
+ if(divx.nodeName == 'DIV')
+ divx.style.display='block';
+ if(divx.nodeName == 'IMG')
+ divx.style.display='inline';
+ //link.innerHTML=textHidden;
+ }
+ /* hide the initaly shown object */
+ else
+ {
+ divx.style.display='none';
+
+ //link.innerHTML=textShown;
+ }
+
+
}
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp Wed Dec
5 00:57:40 2007
@@ -2,12 +2,17 @@
<%@ page import="org.wso2.registry.web.UIConstants" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="org.wso2.registry.web.actions.utils.Permission" %>
-<a href="#" class="add-permisions">Add Permission</a>
-
+<fieldset>
+<legend>
+<a href="#userPermisions" name="userPermisions" class="h3link"
onclick="showHideCommon('userPermisionsArrowDown');showHideCommon('userPermisionsArrowUp');showHideCommon('userPermisionsDiv');">User
Permisions <img src="/wso2registry/admin/images/arrowDown.gif" border="0"
id="userPermisionsArrowDown" /> <img
src="/wso2registry/admin/images/arrowUp.gif" border="0"
id="userPermisionsArrowUp" style="display:none;" /></a>
+</legend>
<%
ResourceDetailsAction resource = (ResourceDetailsAction)
request.getSession().getAttribute(UIConstants.RESOURCE_BEAN);
%>
-<table width="100%" border="0" cellpadding="5" cellspacing="0"
bgcolor="#ECECEC">
+<div id="userPermisionsDiv" class="userPermisionsDiv leftSpace"
style="display:none">
+
+<h4>Add New Permisions</h4>
+<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<form action="/wso2registry/system/authorize" theme="simple"
method="post">
<input type="hidden" name="pathToAuthorize" value="%{path}"/>
@@ -36,17 +41,17 @@
<td>
<input type="radio" name="permissionType" value="1" />Allow
<input type="radio" name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="submit" class="button"
value="Apply"/></td>
+ <td align="right"><input type="submit" class="button" value="Add
Permision"/></td>
</form>
</tr>
-</table><br>
-
+</table>
+<h4 style="margin-top:10px;">Defined User Permisions</h4>
<form name="permissions" action="/wso2registry/system/authorize/mass"
theme="simple" method="post">
<input type="hidden" id="pInput" name="permissionInput" value=""/>
<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" >User Name </th>
+ <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>
@@ -77,24 +82,19 @@
</tr>
<% } %>
<tr>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
+ <td colspan="7" align="right"><input type="submit" class="button"
value="Apply All Permissions" onclick="processPermissions();"
style="margin-top:5px; float:right;" /><span style="clear:both;" /></td>
</tr>
</table>
-
-
- <img src="/wso2registry/admin/images/blank.gif" width="10" height="12"
/><br/>
- <input type="submit" class="button" value="Apply All Permissions"
onclick="processPermissions();" />
-
</form>
-
-<br/><br/>
-<table width="100%" border="0" cellpadding="5" cellspacing="0"
bgcolor="#ECECEC">
+</div>
+</fieldset>
+<fieldset>
+ <legend>
+ <a href="#rolePermisions" name="rolePermisions" class="h3link"
onclick="showHideCommon('rolePermisionsArrowDown');showHideCommon('rolePermisionsArrowUp');showHideCommon('rolePermisionsDiv');">Role
Permisions <img src="/wso2registry/admin/images/arrowDown.gif" border="0"
id="rolePermisionsArrowDown" /> <img
src="/wso2registry/admin/images/arrowUp.gif" border="0"
id="rolePermisionsArrowUp" style="display:none;" /></a>
+ </legend>
+<div id="rolePermisionsDiv" class="rolePermisionsDiv leftSpace"
style="display:none">
+<h4>New Role Permisions</h4>
+<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<form action="/wso2registry/system/authorizeRole" theme="simple"
method="post">
<input type="hidden" name="pathToAuthorize" value="%{path}"/>
@@ -123,11 +123,11 @@
<td>
<input type="radio" name="permissionType" value="1" />Allow
<input type="radio" name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="submit" class="button"
value="Apply"/></td>
+ <td align="right"><input type="submit" class="button" value="Add
Permision"/></td>
</form>
</tr>
-</table><br>
-
+</table>
+<h4 style="margin-top:10px;">Defined Role Permisions</h4>
<form name="rolePermissions" action="/wso2registry/system/authorizeRoles"
theme="simple" method="post">
<input type="hidden" id="pRoleInput" name="permissionInput" value=""/>
<input type="hidden" name="pathToAuthorize" value="%{path}"/>
@@ -164,18 +164,12 @@
</tr>
<% } %>
<tr>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
+ <td colspan="7" align="right"><input type="submit" class="button"
value="Apply All Permissions" onclick="processRolePermissions();"
style="float:right;margin-top:5px;" /><span style="clear:both;" /></td>
</tr>
</table>
-
- <img src="/wso2registry/admin/images/blank.gif" width="10" height="12"
/><br/>
- <input type="submit" class="button" value="Apply All Permissions"
onclick="processRolePermissions();" />
+
</form>
+</div>
+</legend>
\ No newline at end of file
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Wed Dec 5 00:57:40 2007
@@ -188,35 +188,28 @@
while (iComments.hasNext()) {
Comment comment = (Comment) iComments.next();
%>
-<div class="comments-bottom">
- <%=comment.getCommentText()%>
-</div>
<div class="comments-header">
<strong>Commented on
</strong><%=comment.getCommentedTime().toString()%><strong> by</strong> <a
href="#"><%=comment.getCommentedUser()%></a>
+ <div class="comments-bottom">
+ <%=comment.getCommentText()%>
</div>
+</div>
+
<% } %>
<!-- END comment box -->
-<a href="#" class="add-comment" onclick="showHide('add-comment-div')">Add
Comment</a>
+<h3>Add Comment</h3>
<!-- START add comment box -->
<div id="add-comment-div">
<form action="/wso2registry/system/addComment" method="post">
- <table cellpadding="0" cellspacing="0" border="0" class="form-table">
- <tr>
- <td valign="top">Comment</td>
- <td><textarea name="comment"></textarea></td>
- </tr>
- <tr>
- <td valign="top"></td>
- <td><input type="submit" class="button" value="Add" /> <input
type="submit" class="button" value="Cancel" /></td>
- </tr>
- </table>
+ <textarea name="comment" class="comment-textbox"></textarea>
+ <div style="margin-top:10px;"><input type="submit" class="button"
value="Add" /> <input type="submit" class="button" value="Cancel" /></div>
</form>
</div>
<!-- END add comment box -->
-<h2>Permisions</h2>
+<h2>Permisions </h2>
<jsp:include page="permisions.jsp" />
</td>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
