Author: chanaka
Date: Thu Feb 7 00:58:50 2008
New Revision: 13386
Log:
Fixed issue "Password and friend name values should be aligned properly" JIRA
issue and some other usability issues
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-password-edit.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-registryResources.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/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/user.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
Thu Feb 7 00:58:50 2008
@@ -265,8 +265,22 @@
<!-- Search results starts here -->
<!-- Search results display -->
+<%
+ List resourceDataList = advancedSearchAction.getResourceDataList();
+ Iterator i = resourceDataList.iterator();
+ if(!resourceDataList.isEmpty()){
+%>
<h2 style="margin-top:20px;"> Search Results </h2>
+<%
+ }
+%>
<table cellpadding="0" cellspacing="0" border="0" style="width:100%"
class="data-table">
+ <%
+ if(!resourceDataList.isEmpty()){
+ %>
+ <tr>
+ <td colspan="4"></td>
+ </tr>
<tr>
<th></th>
<th>Created Date</th>
@@ -275,13 +289,12 @@
</tr>
<%
- List resourceDataList = advancedSearchAction.getResourceDataList();
- Iterator i = resourceDataList.iterator();
+ }
while (i.hasNext()) {
ResourceData resourceData = (ResourceData) i.next();
%>
<tr id="1">
- <td><a href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
class="folder-small"><%=resourceData.getResourcePath()%></a></td>
+ <td><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getResourcePath()%></a></td>
<td><%=resourceData.getFormattedCreatedOn()%></td>
<td><%=resourceData.getAuthorUserName()%></td>
<td>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-password-edit.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-password-edit.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-password-edit.jsp
Thu Feb 7 00:58:50 2008
@@ -21,8 +21,7 @@
</a>
<% } %>
</td>
- <td>
- - - - - - - -
+ <td> - - - - - - -
</td>
</tr>
<tr id="passwordEdit1" style="display:none;">
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 Thu Feb
7 00:58:50 2008
@@ -53,12 +53,6 @@
margin:0px;
padding:3px;
}
-.promotionDiv h2{
-font-family:verdana;
-color:#5b5b5b;
-font-size:13px;
-font-weight:bold;
-}
.promotionDiv h3{
background-image:url(../images/external.png);
background-repeat:no-repeat;
@@ -176,35 +170,35 @@
background-repeat:no-repeat;
background-position:0px 0px;
text-indent:28px;
-line-height:32px;
+line-height:25px;
}
.sub-headding-permisions{
background-image:url(../images/lock.gif);
background-repeat:no-repeat;
background-position:0px 0px;
text-indent:28px;
-line-height:32px;
+line-height:25px;
}
.sub-headding-tags{
background-image:url(../images/icon-tag.gif);
background-repeat:no-repeat;
background-position:0px 0px;
text-indent:28px;
-line-height:32px;
+line-height:25px;
}
.sub-headding-comments{
background-image:url(../images/icon-comment.gif);
background-repeat:no-repeat;
background-position:0px 0px;
text-indent:28px;
-line-height:32px;
+line-height:25px;
}
.sub-headding-resources{
background-image:url(../images/icon-home-big.gif);
background-repeat:no-repeat;
background-position:0px 0px;
text-indent:28px;
-line-height:32px;
+line-height:25px;
}
.sub-headding-resources a{
color:#6e6b66;
@@ -281,7 +275,6 @@
}
.box1-mid{
/* border:solid 1px #7e7e7e; */
-border-top:solid 1px #dedede;
padding-left:25px;
padding-right:5px;
padding-bottom:10px;
@@ -311,8 +304,6 @@
background-color:#E2F0D0;
}
.box2-mid{
-/* border:solid 1px #7e7e7e; */
-border-top:solid 1px #dedede;
padding-left:25px;
padding-right:5px;
padding-bottom:10px;
@@ -705,4 +696,11 @@
width:100px;
height:12px;
font-size:10px;
+}
+.normalList li{
+padding-top:5px;
+}
+.forPeople{
+margin-top:10px;
+margin-left:10px;
}
\ No newline at end of file
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-registryResources.gif
==============================================================================
Binary files. 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 Thu Feb
7 00:58:50 2008
@@ -187,17 +187,17 @@
divx.style.display='block';
if(divx.nodeName == 'IMG')
try {
- divx.style.display='inline';
- } catch(e) {
- divx.style.display = 'block';
- }
-
+ divx.style.display='inline';
+ } catch(e) {
+ divx.style.display = 'block';
+ }
+
if(divx.nodeName == 'TR'){
- try {
- divx.style.display='table-row';
- } catch(e) {
- divx.style.display = 'block';
- }
+ try {
+ divx.style.display='table-row';
+ } catch(e) {
+ divx.style.display = 'block';
+ }
}
if(divx.nodeName == 'TD')
divx.style.display='table-cell';
@@ -222,12 +222,12 @@
}
function so_clearInnerHTML(obj) {
- // perform a shallow clone on obj
- nObj = obj.cloneNode(false);
- // insert the cloned object into the DOM before the original one
- obj.parentNode.insertBefore(nObj,obj);
- // remove the original object
- obj.parentNode.removeChild(obj);
+ // perform a shallow clone on obj
+ nObj = obj.cloneNode(false);
+ // insert the cloned object into the DOM before the original one
+ obj.parentNode.insertBefore(nObj,obj);
+ // remove the original object
+ obj.parentNode.removeChild(obj);
}
function processDescription() {
@@ -236,24 +236,24 @@
var edit_button = document.getElementById('editButton');
var save_button = document.getElementById('saveButton');
var save_button_on = false;
-
- if(save_button.style.display=='block')
- save_button_on=true;
+
+ if(save_button.style.display=='block')
+ save_button_on=true;
if (save_button_on) {
tinyMCE.triggerSave();
var desc = tinyMCE.getContent();
tinyMCE.execCommand('mceRemoveControl', false, 'descEdit');
new Ajax.Updater('descView', '/wso2registry/system/setDescription', {
method: 'post', parameters: {description: desc} });
-
-
-
+
+
+
}
if(normal_div.style.display=='block'){
-
+
var tmpNormalContent = normal_div.innerHTML;
-
+
normal_div.style.display='none';
//edit_div.style.display='block';
edit_div.style.width="100%";
@@ -263,8 +263,8 @@
tinyMCE.execCommand('mceAddControl', false, 'descEdit');
//alert("active Editor thing 2" + tmpNormalContent);
tinyMCE.setContent(tmpNormalContent);
-
-
+
+
}
else {
normal_div.style.display='block';
@@ -428,7 +428,7 @@
showHideCommon('passwordEdit3');
new Ajax.Updater('passwordDiv',
'/wso2registry/system/saveNewPassword', { method: 'post', parameters:
{userName: userName, newPassword: newPassword} });
- }
+ }
}
// media type map to store file_extension -> media type pairs.
@@ -598,10 +598,19 @@
{ var x = name+'Expanded';
var expanded=true;
if(document.getElementById(name+'Expanded').style.display=='none'){
- showHideCommon(name+'IconExpanded');
- showHideCommon(name+'IconMinimized');
- showHideCommon(name+'Expanded');
- showHideCommon(name+'Minimized');
+ showHideCommon(name+'IconExpanded');
+ showHideCommon(name+'IconMinimized');
+ showHideCommon(name+'Expanded');
+ showHideCommon(name+'Minimized');
}
+}
+
+function handlePeerCheckbox(myID, peerID) {
+
+ var me = document.getElementById(myID);
+ var peer = document.getElementById(peerID);
+ if (me.checked == true && peer.checked == true) {
+ peer.checked = false;
+ }
}
\ No newline at end of file
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 Thu Feb
7 00:58:50 2008
@@ -46,39 +46,35 @@
<td style="width:50%;" valign="top">
<!-- Hear comes the box1 table -->
-
+ <div>
<table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
<tr>
<td valign="top">
<h2>Users </h2>
</td>
- <td align="right" valign="bottom">
- <table width="100%" border="0" cellspacing="0"
cellpadding="0" class="toolBarTable">
- <tr>
- <td><% if
(userManagementAction.isAddAllowed()) { %><a href="#"
onclick="showHideCommon('userAddBox');expandIfNot('user');" title="Add New
User"><img src="/wso2registry/admin/images/universal-add.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" style="" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- </tr>
+ <td align="right" valign="top">
+
+ <table width="100%" border="0"
cellspacing="0" cellpadding="0" class="toolBarTable">
+ <tr>
+ <td><% if
(userManagementAction.isAddAllowed()) { %><a href="#"
onclick="showHideCommon('userAddBox');expandIfNot('user');" title="Add New
User"><img src="/wso2registry/admin/images/universal-add.gif" border="0"
align="top" /></a><% } %></td>
+ <td>
+
+ </td>
+ </tr>
</table>
</td>
</tr>
</table>
-
- <div class="box1-mid" id="userMinimized"
style="display:none;">
- Expand to view details
+
</div>
- <div class="box1-mid" id="userExpanded">
- <!-- all the content goes here -->
+ <div>
+
<!-- START user add box -->
<div id="userAddBox" style="display:none;">
- <h3>Add New User</h3>
+ <h3 class="forPeople">Add New User</h3>
<form action="/wso2registry/system/addUser"
method="post">
- <table width="100%" border="0" cellspacing="0"
cellpadding="0" class="form-table">
+ <table width="100%" border="0" cellspacing="0"
cellpadding="0" class="form-table" style="margin-left:10px;margin-top:-5px;">
<tr>
<td style="width:180px;">User name</td>
<td><input type="text"
name="newUserName" /></td>
@@ -129,11 +125,11 @@
</div>
<!-- End user add box -->
- <table cellpadding="0" cellspacing="0" border="0"
style="width:100%" class="data-table">
+ <table cellpadding="0" cellspacing="0" border="0"
style="width:100%;margin-left:10px;" class="data-table">
<tr>
<th>Username</th>
<th>Display name</th>
- <th style="width:100px;"
align="left">Action</th>
+ <th style="width:50px;"
align="right">Action</th>
</tr>
@@ -184,30 +180,17 @@
<h2>Roles </h2>
</td>
<td align="right" valign="top">
- <table width="100%" border="0"
cellspacing="0" cellpadding="0" class="toolBarTable">
- <tr>
- <td
valign="top"><% if (userManagementAction.isAddAllowed()) { %><a href="#"
onclick="showHideCommon('addRoleBox');expandIfNot('role');" title="Add New
Role"><img src="/wso2registry/admin/images/universal-add.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>
+ <% if
(userManagementAction.isAddAllowed()) { %><a href="#"
onclick="showHideCommon('addRoleBox');expandIfNot('role');" title="Add New
Role"><img src="/wso2registry/admin/images/universal-add.gif" border="0"
align="top" /></a><% } %>
</td>
</tr>
- </table>
-
- <div class="box2-mid" id="roleMinimized"
style="display:none;">
- Expand to view details
- </div>
- <div class="box2-mid" id="roleExpanded">
+ </table>
+
+ <div>
<!-- all the content goes here -->
<div id="addRoleBox" style="display:none;">
- <h3>Add New Role</h3>
+ <h3 class="forPeople">Add New Role</h3>
<form action="/wso2registry/system/addRole"
method="post">
- <table width="100%" border="0"
cellspacing="0" cellpadding="0" class="form-table">
+ <table width="100%" border="0"
cellspacing="0" cellpadding="0" class="form-table"
style="margin-left:10px;margin-top:-5px;">
<tr>
<td width="130">Role name</td>
<td><input type="text"
name="newRoleName"/></td>
@@ -222,10 +205,10 @@
</table>
</form>
</div>
- <table cellpadding="0" cellspacing="0"
border="0" style="width:100%" class="data-table">
+ <table cellpadding="0" cellspacing="0"
border="0" style="width:100%;margin-left:10px;" class="data-table">
<tr>
<th>Role Name</th>
- <th style="width:100px;"
align="left">Action</th>
+ <th style="width:50px;"
align="left">Action</th>
</tr>
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
Thu Feb 7 00:58:50 2008
@@ -60,9 +60,6 @@
<!-- Hear comes the box1 table -->
-
-
- <h2>Search Activities</h2>
@@ -126,19 +123,23 @@
<tr>
<td></td>
- <td><input class="button" type="submit"
value="Search"/></td>
+ <td><input class="button" type="submit" value="Search
Activities"/></td>
</tr>
</table>
</form>
<table cellpadding="0" cellspacing="0" border="0" style="width:100%"
class="data-table">
+ <%
+ Iterator i = recentActivity.getActivity().iterator();
+ if(!recentActivity.getActivity().isEmpty()){
+ %>
<tr>
<th>Activities</th>
</tr>
<%
- Iterator i = recentActivity.getActivity().iterator();
+ }
while (i.hasNext()) {
String activity = (String) i.next();
%>
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
Thu Feb 7 00:58:50 2008
@@ -72,7 +72,7 @@
<tr>
<td class="leftColoumSizer" valign="top">
-<div class="box1-head">
+<div class="box1-head" >
<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
<tr>
@@ -88,8 +88,7 @@
List iNavPaths = details.getNavigatablePaths();
if (iNavPaths.size() > 0) {
ResourcePath rootPath = (ResourcePath) iNavPaths.get(0);
- %>
- <a href="/wso2registry/web<%=rootPath.getNavigatePath()%>"
title="root"><root></a>/<%
+ %><a href="/wso2registry/web<%=rootPath.getNavigatePath()%>"
title="root"><root></a>/<%
if (iNavPaths.size() > 1) {
ResourcePath childPath = (ResourcePath) iNavPaths.get(1);
@@ -156,10 +155,10 @@
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
<tr>
- <th style="width:140px;height:25px;">
+ <th style="width:140px;height:25px;" valign="top">
Properties:
</th>
- <td>
+ <td valign="top">
<% if (!details.isPutAllowed()) { %>
<!-- span class="helpText">Sorry. You don't
have Permissions to add new properties.</span -->
<%
@@ -170,16 +169,20 @@
} else {
%>
<a onclick="showHideCommon('propertiesAddDiv');" href="#">
- <img border="0" title="Add New Property"
style="margin-top: -10px;" valign="top"
src="/wso2registry/admin/images/universal-add.gif"/>
+ <img border="0" title="Add New Property" valign="top"
src="/wso2registry/admin/images/universal-add.gif"/>
</a>
<% } %>
</td>
<td class="propertiesCol">
- <div id="propertiesAddDiv" style="display:none;"><form>
- <input type="hidden" id="propRPath"
value="<%=details.getPath()%>" />
- Name: <input type="text" id="propName"
class="small-text-box" /> Value: <input type="text" id="propValue"
class="small-text-box" />
- <input type="button" class="button" value="Add"
onclick="setProperty();showHideCommon('propertiesAddDiv');" />
+ <div id="propertiesAddDiv" style="display:none;">
+ <form>
+ <input type="hidden" id="propRPath"
value="<%=details.getPath()%>" />
+ <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
+ <tr><th>Name: </th><td><input type="text"
id="propName" /></td></tr>
+ <tr><th>Value: </th><td><input type="text"
id="propValue" /></td></tr>
+ <tr><td></td><td><input type="button"
class="button" value="Add"
onclick="setProperty();showHideCommon('propertiesAddDiv');" /></td></tr>
+ </table>
</form>
</div>
</td>
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 Thu Feb
7 00:58:50 2008
@@ -42,18 +42,39 @@
<!-- all the content goes here -->
<!-- Search results display -->
-
+ <%
+ List resourceDataList = searchAction.getResourceDataList();
+ Iterator i = resourceDataList.iterator();
+ if(resourceDataList.isEmpty()){
+ %>
+ Your search did not match any resources taged with <h3
style="display:inline;margin-left:0px;"><%=request.getParameter("criteria")%></h3>.
+ <ul class="normalList">
+ <li>Make sure all words are spelled correctly.</li>
+ <li>Try different keywords.</li>
+ <li>Try more general keywords.</li>
+ <li>Try fewer keywords.</li>
+ <li>Try <a
href="/wso2registry/system/search/advanced/new">Advanced Search</a>.</li>
+ </ul>
+<% } %>
<table cellpadding="0" cellspacing="0" border="0" style="width:100%"
class="data-table">
+ <%
+ if(!resourceDataList.isEmpty()){
+ %>
<tr>
<th></th>
<th>Created Date</th>
<th>Author</th>
<th>Rating</th>
</tr>
-
<%
- List resourceDataList = searchAction.getResourceDataList();
- Iterator i = resourceDataList.iterator();
+ }
+ else{
+ %>
+ <tr>
+ <td colspan="4" style="border:none;"></td>
+ </tr>
+ <%
+ }
while (i.hasNext()) {
ResourceData resourceData = (ResourceData) i.next();
%>
@@ -96,6 +117,11 @@
<% } %>
</table>
+ <%
+ if(!resourceDataList.isEmpty()){
+ %>
+ <div>Try <a href="/wso2registry/system/search/advanced/new">Advanced
Search</a>.</div>
+ <% } %>
<!-- End box1-mid div -->
</div>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp Thu Feb
7 00:58:50 2008
@@ -43,12 +43,10 @@
<!-- Hear comes the box1 table -->
-<h2><%=userDetailsAction.getDisplayUserName()%></h2>
-
-
<div class="box1-mid">
<!-- all the content goes here -->
+ <h3>Personal information - <%=userDetailsAction.getDisplayUserName()%></h3>
<div id="friendlyNameDiv">
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table" style="width:400px;margin-bottom:10px;">
<tr id="friendlyNameView">
@@ -89,8 +87,7 @@
</a>
<% } %>
</td>
- <td>
- - - - - - - -
+ <td> - - - - - - -
</td>
</tr>
<tr id="passwordEdit1" style="display:none;">
@@ -132,7 +129,7 @@
<% } %>
<h3><%=userDetailsAction.getDisplayUserName()%>'s roles</h3>
- <table cellpadding="0" cellspacing="0" border="0" style="width:600px;"
class="data-table">
+ <table cellpadding="0" cellspacing="0" border="0"
style="width:600px;margin-top:3px;" class="data-table">
<tr>
<th>Role Name</th>
<th style="width:100px;" align="left">Action</th>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
