Author: chanaka Date: Mon Dec 17 03:12:44 2007 New Revision: 11233 Log:
the login got in to a popup page and new theme applied to Advanced search page Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-comment.gif (contents, props changed) trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-left.gif (contents, props changed) trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-rep.gif (contents, props changed) trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-right.gif (contents, props changed) Modified: trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment.gif trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-folder-up.jpg trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tag.gif trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp trunk/registry/modules/webapps/src/main/webapp/admin/signin.jsp Modified: trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp Mon Dec 17 03:12:44 2007 @@ -8,7 +8,7 @@ "http://www.w3.org/TR/html4/strict.dtd";> <html> <head> -<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js" /> +<script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js"></script> <link type="text/css" href="/wso2registry/admin/css/main.css" rel="stylesheet" /> <title>WSO2 Registry</title> </head> @@ -25,179 +25,186 @@ <! START body content --> <div class="content"> - <h1 class="headding-search">Advanced Search</h1> - <table cellpadding="0" cellspacing="0" border="0"> - <tr> - <td style="width:700px;" valign="top"> - - - <form id="advancedSearchForm" name="advancedSearch" onsubmit="return true;" action="/wso2registry/system/search/advanced" method="get"> - <div class="resource-head"> - <table cellpadding="0" cellspacing="0" border="0" class="form-table"> - <tr> - <td style="width:120px;">Search For</td> - <td> - <select name="" id="searchFor" onchange="showHideSearch();"> - <option value="0">Resource</option> - <option value="1">Comments</option> - </select> - - </td> - </tr> - </table> + <h1 class="headding-search">Advanced Search</h1> + <!-- Hear comes the box1 table --> + <div class="box1-head"> + <table cellspacing="0" cellpadding="0" border="0" style="width:100%"> + <tr> + <td valign="top" style="padding-top:0px;width:14px;"><img src="/wso2registry/admin/images/box1-lefttop.jpg" /></td> + <td valign="top"> + <h2>Search Activities</h2> + </td> + <td align="right" valign="top"> + <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');"> + <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" /> + <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" /> + </a> + </td> + <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td> + </tr> + </table> + </div> + <div class="box1-mid" id="userExpanded"> + <form id="advancedSearchForm" name="advancedSearch" onsubmit="return true;" action="/wso2registry/system/search/advanced" method="get"> + <table cellpadding="0" cellspacing="0" border="0" class="form-table"> + <tr> + <td class="leftColumn">Search For</td> + <td> + <select name="" id="searchFor" onchange="showHideSearch();"> + <option value="0">Resource</option> + <option value="1">Comments</option> + </select> + + </td> + </tr> + </table> + + + + <div id="resourceForm"> + + + <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="form-table" > + <tr> + <td class="leftColumn">Resource Name</td> + <td> + <input type="text" name="resourcePath" value="" id="#_resourceName" style="width:100px;"/> + + + </td> + + </tr> + <tr> + <td valign="top">Date</td> + <td> + <div style="width:200px;">Only find resource created</div> + From: <input type="text" name="createdAfter" value="" id="#_cfromDate" style="width:100px;"/> + + To: <input type="text" name="createdBefore" value="" id="#_ctoDate" style="width:100px;"/> + </td> + + </tr> + <tr> + <td valign="top">Date</td> + <td> + <div style="width:200px;">Only find resources updated</div> + From: <input type="text" name="updatedAfter" value="" id="#_ufromDate" style="width:100px;"/> + + To: <input type="text" name="updatedBefore" value="" id="#_utoDate" style="width:100px;"/> + </td> + + </tr> + <tr> + <td>Author</td> + <td> + <input type="text" name="author" value="" id="#_author"/> + + + </td> + + </tr> + <tr> + <td>Updated by</td> + <td> + <input type="text" name="updater" value="" id="#_author"/> + + + </td> + + </tr> + <tr> + <td>Tags</td> + <td> + <input type="text" name="tags" value="" id="#_tags"/> + + + </td> + </tr> + <tr> + + <td>Comments</td> + <td> + <input type="text" name="commentWords" value="" id="#_comments"/> + + + </td> + </tr> + </table> </div> - <div class="resource-content" style="background-color:#ffffff;"> - - <div id="resourceForm"> - - - <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="form-table" > - <tr> - <td style="width:120px;">Resource Name</td> - <td> - <input type="text" name="resourcePath" value="" id="#_resourceName" style="width:100px;"/> - - - </td> - - </tr> - <tr> - <td>Date</td> - <td> - <div style="width:200px;">Only find resource created</div> - From: <input type="text" name="createdAfter" value="" id="#_cfromDate" style="width:100px;"/> - - To: <input type="text" name="createdBefore" value="" id="#_ctoDate" style="width:100px;"/> - </td> - - </tr> - <tr> - <td>Date</td> - <td> - <div style="width:200px;">Only find resources updated</div> - From: <input type="text" name="updatedAfter" value="" id="#_ufromDate" style="width:100px;"/> - - To: <input type="text" name="updatedBefore" value="" id="#_utoDate" style="width:100px;"/> - </td> - - </tr> - <tr> - <td>Author</td> - <td> - <input type="text" name="author" value="" id="#_author"/> - - - </td> - - </tr> - <tr> - <td>Updated by</td> - <td> - <input type="text" name="updater" value="" id="#_author"/> - - - </td> - - </tr> - <tr> - <td>Tags</td> - <td> - <input type="text" name="tags" value="" id="#_tags"/> - - - </td> - </tr> - <tr> - - <td>Comments</td> - <td> - <input type="text" name="commentWords" value="" id="#_comments"/> - - - </td> - </tr> - <!--<tr>--> - <!--<td>Content</td>--> - - <!--<td>--> - <!--<input type="text" name="content" value="" id="#_content"/>--> - - - <!--</td>--> - <!--</tr>--> - </table> - </div> - - <div id="commentsForm" style="display:none;"> - - - <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="form-table" > - <tr> - <td style="width:120px;">Commented User</td> - <td> - <input type="text" name="commentedUser" value="" id="#_commentedUser" style="width:100px;"/> - - - </td> - </tr> - <tr> - - <td>Date</td> - <td> - <div style="width:200px;font-style:italic;">Only find results updated</div> - From: <input type="text" name="fromDate" value="" id="#_fromDate" style="width:100px;"/> - - To: <input type="text" name="toDate" value="" id="#_toDate" style="width:100px;"/> - - - </td> - - - </tr> - <tr> - <td>Resource Name</td> - <td> - <input type="text" name="resourceName" value="" id="#_resourceName"/> - - - </td> - </tr> - <tr> - - <td>Commented Text</td> - <td> - <input type="text" name="commentedText" value="" id="#_commentedText"/> - - - </td> - </tr> - <tr> - <td>Created By</td> - - <td> - <input type="text" name="createdBy" value="" id="#_createdBy"/> - - - </td> - </tr> - </table> - </div> - </div> - <div class="resource-footer"> - <table cellpadding="0" cellspacing="0" border="0" class="form-table"> + + <div id="commentsForm" style="display:none;"> + + + <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="form-table" > <tr> - <td style="width:120px;"></td> + <td class="leftColumn">Commented User</td> <td> - <input type="submit" id="#_0" value="Search" class="button" /> + <input type="text" name="commentedUser" value="" id="#_commentedUser" style="width:100px;"/> + + </td> + </tr> + <tr> + + <td valign="top">Date</td> + <td> + <div style="width:200px;font-style:italic;">Only find results updated</div> + From: <input type="text" name="fromDate" value="" id="#_fromDate" style="width:100px;"/> + + To: <input type="text" name="toDate" value="" id="#_toDate" style="width:100px;"/> + + + </td> + + + </tr> + <tr> + <td valign="top">Resource Name</td> + <td> + <input type="text" name="resourceName" value="" id="#_resourceName"/> + </td> </tr> - - </table> - </div> - </form> - <!-- Search results display --> + <tr> + + <td>Commented Text</td> + <td> + <input type="text" name="commentedText" value="" id="#_commentedText"/> + + + </td> + </tr> + <tr> + <td>Created By</td> + + <td> + <input type="text" name="createdBy" value="" id="#_createdBy"/> + + + </td> + </tr> + </table> + </div> + + + <table cellpadding="0" cellspacing="0" border="0" class="form-table"> + <tr> + <td class="leftColumn"></td> + <td> + <input type="submit" id="#_0" value="Search" class="button" /> + + + </td> + </tr> + + </table> + + </form> + + <!-- Search results starts here --> + + <!-- Search results display --> <h2 style="margin-top:20px;"> Search Results </h2> <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table"> <tr> @@ -239,23 +246,24 @@ <% } %> </table> + </div> + <div class="box1-bot"> + <table cellspacing="0" cellpadding="0" border="0" style="width:100%" > + <tr> + <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td> + <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td> + </tr> + </table> + </div> + + - </td> - <td valign="top" style="padding-left:10px;padding-right:10px;"> - <div class="title-heading">Help Tip</div> - <div class="cloude-text"> - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Praesent urna. Integer nec nibh. Integer tristique urna ut risus. Donec ornare, dui sed suscipit accumsan, massa nisi placerat nulla, - </div> - - </td> - </tr> - </table> - </div> - - - <!-- START footer content --> - <jsp:include page="footer.jsp" /> +</div> + +<!-- START footer content --> +<jsp:include page="footer.jsp" /> + </div> </body> -</html> \ No newline at end of file +</html> 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 Mon Dec 17 03:12:44 2007 @@ -77,7 +77,7 @@ line-height:35px; } .headding-search{ -background-image:url(../images/icon-search.gif); +background-image:url(../images/icon-search.jpg); background-repeat:no-repeat; background-position:3px 5px; text-indent:40px; @@ -214,6 +214,7 @@ background-repeat:no-repeat; background-position:0px 0px; margin-top:10px; +margin-bottom:10px; padding-left:30px; line-height:20px; font-size:14px; @@ -360,4 +361,75 @@ } .toolBarTable td{ padding-left:10px; +} +.helpText{ +color:#444444; +font-size:90%; +margin-bottom:15px; +} +.comments-bottom{ +background-color:#f6f6e8; +padding:5px; +color:#737b69; +} +.comments-header{ +padding-top:10px; +} +.userPermisionsDiv{ +padding-left:10px; +} +.rolePermisionsDiv{ +padding-left:10px; +} +.leftColumn{ +width:180px; +} + +/* popup page for login styles */ +.popup-main{ +position:absolute; +left:0px; +top:0px; +height:100%; +width:100%; +background-image:url(../images/popback.png); +background-repeat:repeat; +background-position:0px 0px; +background-color:#cccccc; +opacity:0.5; + +*background-color:transparent; +} +.popup{ +position:absolute; +width:400px; + +top:60px; +right:10px; +} +.popup-head{ +background-color:#555555; +border:solid 1px #1c1c1c; +height:25px; +color:#000000; +font-weight:bold; + +opacity:1; +} +.popup-bot{ +background-color:#e9e9e9; +border:solid 1px #2c2c2c; + +opacity:1; +padding:15px; +} +.login-menu{ +background-image:url(../images/login-box-rep.gif); +background-repeat:repeat-x; +background-position:0px 0px; +margin:0px; +padding:0px; +height:28px; +margin-top:5px; + } \ No newline at end of file Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Mon Dec 17 03:12:44 2007 @@ -1,5 +1,51 @@ <%@ page import="org.wso2.registry.RegistryConstants" %> <%@ page import="org.wso2.registry.web.UIConstants" %> +<div class="popup-main" id="popup-main" style="display:none;"> + +</div> +<div class="popup" id="popup" style="display:none;"> + + <table cellpadding="0" cellspacing="0" border="0" style="width:100%;border-bottom:solid 1px #989898;"> + <tr> + <td align="left" style="width:8px;"><img src="/wso2registry/admin/images/login-box-left.gif" /></td> + <td align="left" class="login-menu" ><h2>Login</h2></td> + <td align="right" style="padding-right:0px;width:8px;"><img src="/wso2registry/admin/images/login-box-right.gif" /></td> + </tr> + </table> + + + <div class="popup-bot"> + + <form action="/wso2registry/system/signin" method="post"> + <table class="form-table" border="0" cellspacing="0" cellpadding="0" style="widht:100%"> + <tr> + <td width="110"> </td> + <td> </td> + </tr> + <tr> + <td>User Name:</td> + <td><input type="text" name="userName" id="userName" /></td> + </tr> + <tr> + <td>Password:</td> + <td><input type="password" name="password" id="password" /></td> + </tr> + <tr> + <td></td> + <td> + <input id="signin" type="submit" class="button" value="Sign In"/> <input type="button" class="button" value="Cancel" onclick="showHideCommon('popup-main'); showHideCommon('popup');" style="margin-left:10px;" /> + </td> + </tr> + + </table> + </form> + + + </div> +</div> + +<!-- The login popup box --> + <div class="header"> <% String path = (String) request.getSession().getAttribute(UIConstants.PATH_ATTR); @@ -26,9 +72,10 @@ <table cellpadding="0" cellspacing="0" border="0" class="top-menu"> <tr> <td style="background-color:#ffffff;"> + <% if (!userName.equals(RegistryConstants.ANONYMOUS_USER)) {%> - <%=userName%> Logged in + <script language="javascript" type="text/javascript">doGreeting();</script> <%=userName%>! (Logged in) <% } %> </td> <td align="left"><img src="/wso2registry/admin/images/menu-left.jpg" /></td> @@ -51,7 +98,7 @@ <% if (userName.equals(RegistryConstants.ANONYMOUS_USER)) { %> - <a href="/wso2registry/admin/signin.jsp"> + <a href="#" onclick="showHideCommon('popup-main'); showHideCommon('popup');"> <img src="/wso2registry/admin/images/icon-logout.gif" border="0" align="top" /> Sign in </a> <% } else { %> Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-comment.gif ============================================================================== Binary file. No diff available. Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment.gif ============================================================================== Binary files. No diff available. Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-folder-up.jpg ============================================================================== Binary files. No diff available. Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tag.gif ============================================================================== Binary files. No diff available. Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-left.gif ============================================================================== Binary file. No diff available. Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-rep.gif ============================================================================== Binary file. No diff available. Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-right.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 Mon Dec 17 03:12:44 2007 @@ -332,3 +332,14 @@ rForm.submit(); } +function doGreeting(){ + datetoday = new Date(); + timenow=datetoday.getTime(); + datetoday.setTime(timenow); + thehour = datetoday.getHours(); + if (thehour > 18) display = "evening"; + else if (thehour >12) display = "afternoon"; + else display = "morning"; + var greeting = ("Good " + display); + document.write(greeting); +} Modified: trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp Mon Dec 17 03:12:44 2007 @@ -45,10 +45,17 @@ <h2>Users </h2> </td> <td align="right" valign="top"> - <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" /> - </a> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolBarTable"> + <tr> + <td><a href="#" onclick="showHideCommon('userAddBox');" title="Add New User"><img src="/wso2registry/admin/images/icon-add-user.gif" border="0" align="top" /></a></td> + <td> + <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');"> + <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" /> + <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" /> + </a> + </td> + </tr> + </table> </td> <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td> </tr> @@ -59,7 +66,56 @@ </div> <div class="box1-mid" id="userExpanded"> <!-- all the content goes here --> - + <!-- START user add box --> + + <div id="userAddBox" style="display:none;"> + <h3>Add New User</h3> + <form action="/wso2registry/system/addUser" method="post"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table"> + <tr> + <td style="width:180px;">User name</td> + <td><input type="text" name="newUserName" /></td> + </tr> + <tr> + <td>Password</td> + <td><input type="password" name="password"/></td> + </tr> + <tr> + <td>Confirm Password </td> + <td><input type="password" name="confirmedPassword"/></td> + </tr> + <tr> + <td>Role (optional) </td> + <td> + <select name="roleName" id="AddUser_roleName"> + <option value="1" + >-- None --</option> + + <% + List roleNames = userManagementAction.getRoleNames(); + Iterator i = roleNames.iterator(); + while (i.hasNext()) { + String role = (String) i.next(); + %> + + <option value="<%=role%>"><%=role%></option> + + <% } %> + </select> + </td> + </tr> + + <tr> + <td> </td> + <td> + <input type="submit" class="button" value="Add" style="margin-top:10px;" onclick="showHideCommon('userAddBox')"/> + <input type="button" class="button" value="Cancel" style="margin-top:10px;" onclick="showHideCommon('userAddBox')"/> + </td> + </tr> + </table> + </form> + </div> + <!-- End user add box --> <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table"> <tr> @@ -101,85 +157,7 @@ </div> - <!-- Hear comes the box1 table --> - <div class="box1-head"> - <table cellspacing="0" cellpadding="0" border="0" style="width:100%"> - <tr> - <td valign="top" style="padding-top:0px;width:14px;"><img src="/wso2registry/admin/images/box1-lefttop.jpg" /></td> - <td valign="top"> - <h2>Add New User </h2> - </td> - <td align="right" valign="top"> - <a href="#" onclick="showHideCommon('userAddIconExpanded');showHideCommon('userAddIconMinimized');showHideCommon('userAddExpanded');showHideCommon('userAddMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userAddIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userAddIconMinimized" style="display:none;" /> - </a> - </td> - <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td> - </tr> - </table> - </div> - <div class="box1-mid" id="userAddMinimized" style="display:none;"> - Expand to view details - </div> - <div class="box1-mid" id="userAddExpanded"> - <!-- all the content goes here --> - - <form action="/wso2registry/system/addUser" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table"> - <tr> - <td width="100">User name</td> - <td><input type="text" name="newUserName" /></td> - </tr> - <tr> - <td>Password</td> - <td><input type="password" name="password"/></td> - </tr> - <tr> - <td>Confirm Password </td> - <td><input type="password" name="confirmedPassword"/></td> - </tr> - <tr> - <td>Role (optional) </td> - <td> - <select name="roleName" id="AddUser_roleName"> - <option value="1" - >-- None --</option> - - <% - List roleNames = userManagementAction.getRoleNames(); - Iterator i = roleNames.iterator(); - while (i.hasNext()) { - String role = (String) i.next(); - %> - - <option value="<%=role%>"><%=role%></option> - - <% } %> - </select> - </td> - </tr> - - <tr> - <td> </td> - <td> - <input type="submit" class="button" value="Add" style="margin-top:10px;" onclick="showHide('add-resource-div')"/> <input type="submit" class="button" value="Cancel" style="margin-top:10px;" onclick="showHide('add-resource-div')"/> - </td> - </tr> - </table> - </form> - - - <!-- End box1-mid div --> - </div> - <div class="box1-bot"> - <table cellspacing="0" cellpadding="0" border="0" style="width:100%" > - <tr> - <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td> - <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td> - </tr> - </table> - </div> + </td> @@ -194,10 +172,17 @@ <h2>Roles </h2> </td> <td align="right" valign="top"> - <a href="#" onclick="showHideCommon('roleIconExpanded');showHideCommon('roleIconMinimized');showHideCommon('roleExpanded');showHideCommon('roleMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="roleIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="roleIconMinimized" style="display:none;" /> - </a> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolBarTable"> + <tr> + <td><a href="#" onclick="showHideCommon('addRoleBox');" title="Add New Role"><img src="/wso2registry/admin/images/icon-add-role.gif" border="0" align="top" /></a></td> + <td> + <a href="#" onclick="showHideCommon('roleIconExpanded');showHideCommon('roleIconMinimized');showHideCommon('roleExpanded');showHideCommon('roleMinimized');"> + <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="roleIconExpanded" /> + <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="roleIconMinimized" style="display:none;" /> + </a> + </td> + </tr> + </table> </td> <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg" /></td> </tr> @@ -208,7 +193,24 @@ </div> <div class="box2-mid" id="roleExpanded"> <!-- all the content goes here --> - + <div id="addRoleBox" style="display:none;"> + <h3>Add New Role</h3> + <form action="/wso2registry/system/addRole" method="post"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table"> + <tr> + <td width="130">Role name</td> + <td><input type="text" name="newRoleName"/></td> + </tr> + <tr> + <td> </td> + <td> + <input type="submit" class="button" value="Add" style="margin-top:10px;" onclick="showHideCommon('addRoleBox');"/> + <input type="button" class="button" value="Cancel" style="margin-top:10px;" onclick="showHideCommon('addRoleBox');"/> + </td> + </tr> + </table> + </form> + </div> <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table"> <tr> <th>Role Name</th> @@ -248,62 +250,7 @@ <!-- Roles box ends --> - <!-- Hear comes the roles box --> - <!-- Hear comes the box1 table --> - <div class="box2-head"> - <table cellspacing="0" cellpadding="0" border="0" style="width:100%"> - <tr> - <td valign="top" style="padding-top:0px;width:14px;"><img src="/wso2registry/admin/images/box2-lefttop.jpg" /></td> - <td valign="top"> - <h2>Add New Role</h2> - </td> - <td align="right" valign="top"> - <a href="#" onclick="showHideCommon('roleAddIconExpanded');showHideCommon('roleAddIconMinimized');showHideCommon('roleAddExpanded');showHideCommon('roleAddMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="roleAddIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="roleAddIconMinimized" style="display:none;" /> - </a> - </td> - <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg" /></td> - </tr> - </table> - </div> - <div class="box2-mid" id="roleAddMinimized" style="display:none;"> - Expand to view details - </div> - <div class="box2-mid" id="roleAddExpanded"> - <!-- all the content goes here --> - - <div class="add-folder-div"> - <form action="/wso2registry/system/addRole" method="post"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="form-table"> - <tr> - <td width="130">Role name</td> - <td><input type="text" name="newRoleName"/></td> - </tr> - <tr> - <td> </td> - <td> - <input type="submit" class="button" value="Add" style="margin-top:10px;"/> - - </td> - </tr> - </table> - </form> - </div> - - - <!-- End box2-mid div --> - </div> - <div class="box2-bot"> - <table cellspacing="0" cellpadding="0" border="0" style="width:100%" > - <tr> - <td><img src="/wso2registry/admin/images/box2-leftbot.jpg" /></td> - <td align="right"><img src="/wso2registry/admin/images/box2-rightbot.jpg" /></td> - </tr> - </table> - </div> - - <!-- Roles box ends --> + </td> </tr> </table> 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 Mon Dec 17 03:12:44 2007 @@ -6,6 +6,7 @@ <% ResourceDetailsAction resource = (ResourceDetailsAction) request.getSession().getAttribute(UIConstants.RESOURCE_BEAN); %> +<h3>User Permisions</h3> <div id="userPermisionsDiv" class="userPermisionsDiv leftSpace"> <h4>Add New Permisions</h4> @@ -85,7 +86,7 @@ </form> </div> - +<h3 style="padding-top:20px;">Role Permisions</h3> <div id="rolePermisionsDiv" class="rolePermisionsDiv leftSpace"> <h4>New Role Permisions</h4> <table width="100%" border="0" cellpadding="5" cellspacing="0"> Modified: trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp Mon Dec 17 03:12:44 2007 @@ -6,7 +6,7 @@ "http://www.w3.org/TR/html4/strict.dtd";> <html> <head> - <script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js" /> + <script language="JavaScript" type="text/JavaScript" src="/wso2registry/admin/js/common.js"></script> <link type="text/css" href="/wso2registry/admin/css/main.css" rel="stylesheet" /> <title>WSO2 Registry</title> </head> 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 Mon Dec 17 03:12:44 2007 @@ -44,18 +44,18 @@ request.getSession().setAttribute(UIConstants.ERROR_MESSAGE, null); } %> - + + + <jsp:include page="header.jsp" /> <div class="content"> + <% if (errorMessage != null) { %> <div><%=errorMessage%></div> <% } %> -<table cellspacing="0" cellpadding="0" border="0" style="width:100%"> - <tr> - <td class="leftColoumSizer" valign="top"> - <div style="height:40px;"> +<div style="height:40px;"> <% if (details.isCollection()) { %> <h1 class="h1collection"> <% } else { %> @@ -88,6 +88,10 @@ <a href="#" style="float:right; display:inline;margin-top:10px;margin-right:5px;"><img src="/wso2registry/admin/images/icon-folder-up.jpg" border="0" /></a> <span style="clear:both;" /> </div> +<table cellspacing="0" cellpadding="0" border="0" style="width:100%"> + <tr> + <td class="leftColoumSizer" valign="top"> + <!-- Hear comes the box1 table --> <div class="box1-head"> <table cellspacing="0" cellpadding="0" border="0" style="width:100%"> @@ -207,22 +211,31 @@ <h3>Add Resource</h3> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td width="100" valign="top">Fetch content from URL</td> - <td><input id="fetchURLID" type="text" name="fetchURL" style="margin-bottom:10px;" onchange="fillResourceDetailsForURLs()"/></td> + <td valign="top" style="width:180px;">Content URL</td> + <td> + <input id="fetchURLID" type="text" name="fetchURL" onchange="fillResourceDetailsForURLs()"/> + <div class="helpText">Give the full url of the resource to fetch content from URL</div> + </td> </tr> <tr> <td valign="top">Import content from file</td> - <td><input id="resourceFile" type="file" name="upload" onchange="fillResourceDetails()"/></td> + <td> + <input id="resourceFile" type="file" name="upload" onchange="fillResourceDetails()"/> + <div class="helpText">Give the url of a file to fetch content (xml,wsdl,jar etc..)</div> + </td> </tr> <tr> - <td width="100" valign="top">Name</td> + <td valign="top">Name</td> <td><input id="resourceName" type="text" name="filename" style="margin-bottom:10px;"/></td> </tr> <tr> - <td width="100" valign="top">Media type</td> + <td valign="top">Media type</td> - <td><input id="resourceMediaType" type="text" name="mediaType" style="margin-bottom:10px;"/></td> + <td> + <input id="resourceMediaType" type="text" name="mediaType" style="margin-bottom:10px;"/> + + </td> </tr> <tr> <td valign="top">Description</td> @@ -230,7 +243,7 @@ </tr> <tr> <td> </td> - <td><input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitResourceAddForm();showHide('add-resource-div')"/> <input type="submit" class="button" value="Cancel" style="margin-top:10px;" onclick="showHide('add-resource-div')"/></td> + <td><input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitResourceAddForm();showHide('add-resource-div')"/> <input type="button" class="button" value="Cancel" style="margin-top:10px;" onclick="showHide('add-resource-div')"/></td> </tr> </table> </form> @@ -240,18 +253,19 @@ <!-- Add folder div --> <div class="add-resource-div" id="add-folder-div" style="display:none;"> + <h3>Add Collection</h3> <form name="collectionForm" method="post" action="/wso2registry/system/addCollection"> <input type="hidden" name="parentPath" value="<%=details.getPath()%>"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td width="100" valign="top">Name</td> + <td valign="top" style="width:180px;">Name</td> <td><input type="text" name="collectionName" style="margin-bottom:10px;"/></td> </tr> <tr> <td valign="top">Media Type</td> <td> - <select name="mediaType"> + <select name="mediaType" style="margin-bottom:10px;"> <% Iterator iCollectionTypes = collection.getCollectionTypes().iterator(); while (iCollectionTypes.hasNext()) { @@ -268,7 +282,7 @@ </tr> <tr> <td> </td> - <td><input type="submit" class="button" value="Add" style="margin-top:10px;" onclick="showHide('add-folder-div')"/> <input type="submit" class="button" value="Cancel" style="margin-top:10px;" onclick="showHide('add-folder-div')"/></td> + <td><input type="submit" class="button" value="Add" style="margin-top:10px;" onclick="showHide('add-folder-div')"/> <input type="button" class="button" value="Cancel" style="margin-top:10px;" onclick="showHide('add-folder-div')"/></td> </tr> </table> </form> @@ -420,13 +434,11 @@ <td> <input type="text" name="tag" /> </td> - <td align="right"> - <input type="submit" class="button" value="Add Tag" /> - </td> + </tr> <tr> - <td style="font-style:italic;" colspan="2"> - <img src="/wso2registry/admin/images/help-small.jpg" style="margin-right:5px;" />Space seperate to add multiple tags. + <td style="font-style:italic;"> + <img src="/wso2registry/admin/images/help-small.jpg" style="margin-right:5px;" />Comma seperate to add multiple tags. </td> </tr> </table> @@ -449,10 +461,17 @@ <td valign="top" style="padding-top:0px;width:14px;"><img src="/wso2registry/admin/images/box2-lefttop.jpg" /></td> <td valign="top"><h2><img src="/wso2registry/admin/images/icon-comment.gif" /> Comments</h2></td> <td align="right" valign="top"> - <a href="#" onclick="showHideCommon('commentsIconExpanded');showHideCommon('commentsIconMinimized');showHideCommon('commentsExpanded');showHideCommon('commentsMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="commentsIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="commentsIconMinimized" style="display:none;" /> - </a> + <table cellpadding="0" cellspacing="0" border="0" class="toolBarTable"> + <tr> + <td><a href="#" onclick="showHideCommon('add-comment-div');"><img src="/wso2registry/admin/images/icon-add-comment.gif" border="0" /></a></td> + <td> + <a href="#" onclick="showHideCommon('commentsIconExpanded');showHideCommon('commentsIconMinimized');showHideCommon('commentsExpanded');showHideCommon('commentsMinimized');"> + <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="commentsIconExpanded" /> + <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="commentsIconMinimized" style="display:none;" /> + </a> + </td> + </tr> + </table> </td> <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg" /></td> </tr> @@ -462,7 +481,19 @@ Expand to view details </div> <div class="box2-mid" id="commentsExpanded"> - <!-- START comment box --> + + <!-- START add comment box --> + <div id="add-comment-div" style="display:none;margin-bottom:10px;"> + + <h3>Add Comment</h3> + <form action="/wso2registry/system/addComment" method="post"> + <textarea name="comment" class="comment-textbox" style="width:99%"></textarea> + <div style="margin-top:10px;"><input type="submit" class="button" value="Add" onclick="showHideCommon('add-comment-div');" /> <input type="button" class="button" value="Cancel" onclick="showHideCommon('add-comment-div');" /></div> + </form> + </div> + <!-- END add comment box --> + + <!-- START comments listing box --> <% Iterator iComments = details.getComments().iterator(); while (iComments.hasNext()) { @@ -478,18 +509,11 @@ <% } %> - <!-- END comment box --> + <!-- END comment listing box --> + + - <h3>Add Comment</h3> - <!-- START add comment box --> - <div id="add-comment-div"> - <form action="/wso2registry/system/addComment" method="post"> - <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 --> </div> <div class="box2-bot"> @@ -510,18 +534,18 @@ <td valign="top"><h2>Versions</h2></td> <td align="right" valign="top"> <a href="#" onclick="showHideCommon('versionsIconExpanded');showHideCommon('versionsIconMinimized');showHideCommon('versionsExpanded');showHideCommon('versionsMinimized');"> - <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="versionsIconExpanded" /> - <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="versionsIconMinimized" style="display:none;" /> + <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="versionsIconExpanded" style="display:none;" /> + <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="versionsIconMinimized" /> </a> </td> <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg" /></td> </tr> </table> </div> - <div class="box2-mid" id="versionsMinimized" style="display:none;"> + <div class="box2-mid" id="versionsMinimized"> Expand to view details </div> - <div class="box2-mid" id="versionsExpanded"> + <div class="box2-mid" id="versionsExpanded" style="display:none;"> <% Iterator iVersions = details.getVersionPaths().iterator(); Modified: trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp Mon Dec 17 03:12:44 2007 @@ -3,7 +3,6 @@ <%@ page import="java.util.Iterator" %> <%@ page import="org.wso2.registry.web.actions.utils.ResourceData" %> <%@ page import="org.wso2.registry.web.actions.SearchAction" %> -<%@ page import="java.util.Map" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";> @@ -63,23 +62,10 @@ <a href="#" title="Show Details" style="margin-left:5px;"><img src="images/icon-details.gif" border="0" /></a> <a href="#" title="Delete" style="margin-left:5px;"><img src="images/icon-trash.gif" border="0" /></a> </td> + + </tr> - <tr> - <td colspan="6"> - <% - Map tagCounts = resourceData.getTagCounts(); - Iterator iTags = tagCounts.keySet().iterator(); - while (iTags.hasNext()) { - String tag = (String) iTags.next(); - Long count = (Long) tagCounts.get(tag); - %> - - <a href="/wso2registry/system/search?criteria=<%=tag%>"><%=tag%></a> (<%=count.toString()%>)<% if (iTags.hasNext()) { %> | <% } %> - - <% } %> - </td> - </tr> - <tr id="1-des" style="display:none;"> + <tr id="1-des" style="display:none;"> <td colspan="6" class="table-description"> <%=resourceData.getDescription()%> </td> Modified: trunk/registry/modules/webapps/src/main/webapp/admin/signin.jsp ============================================================================== --- trunk/registry/modules/webapps/src/main/webapp/admin/signin.jsp (original) +++ trunk/registry/modules/webapps/src/main/webapp/admin/signin.jsp Mon Dec 17 03:12:44 2007 @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/strict.dtd";> <html> <head> -<script language="JavaScript" type="text/JavaScript" src="js/common.js" /> +<script language="JavaScript" type="text/JavaScript" src="js/common.js"></script> <link type="text/css" href="css/main.css" rel="stylesheet" /> <title>WSO2 Registry</title> </head> @@ -40,10 +40,7 @@ <input id="signin" type="submit" class="button" value="Sign In"/> </td> </tr> - <tr> - <td></td> - <td><a href="Changepassword.action">Change password</a></td> - </tr> + </table> </form> _______________________________________________ Registry-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
