[Registry-dev] svn commit r17943 - in
branches/registry/1_1/modules/webapps/src/main/webapp/admin:
. ajax css images
chanaka at wso2.com
chanaka at wso2.com
Wed Jun 4 22:05:03 PDT 2008
Author: chanaka
Date: Wed Jun 4 22:05:03 2008
New Revision: 17943
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17943
Log:
Advanced search page UI issues fixed, error message image quality improved
Added:
branches/registry/1_1/modules/webapps/src/main/webapp/admin/images/error-message.gif (contents, props changed)
Modified:
branches/registry/1_1/modules/webapps/src/main/webapp/admin/ajax/advanced-search-results.jsp
branches/registry/1_1/modules/webapps/src/main/webapp/admin/css/main.css
branches/registry/1_1/modules/webapps/src/main/webapp/admin/error.jsp
branches/registry/1_1/modules/webapps/src/main/webapp/admin/people.jsp
Modified: branches/registry/1_1/modules/webapps/src/main/webapp/admin/ajax/advanced-search-results.jsp
URL: http://wso2.org/svn/browse/wso2/branches/registry/1_1/modules/webapps/src/main/webapp/admin/ajax/advanced-search-results.jsp?rev=17943&r1=17942&r2=17943&view=diff
==============================================================================
--- branches/registry/1_1/modules/webapps/src/main/webapp/admin/ajax/advanced-search-results.jsp (original)
+++ branches/registry/1_1/modules/webapps/src/main/webapp/admin/ajax/advanced-search-results.jsp Wed Jun 4 22:05:03 2008
@@ -89,7 +89,9 @@
ResourceData resourceData = (ResourceData) i.next();
%>
<tr id="1">
- <td><a href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getResourcePath()%></a></td>
+ <% if(resourceData.getResourceType().equals(ResourceData.COLLECTION)){ %><td><img src="/wso2registry/admin/images/icon-folder-small.gif" style="margin-right:5px;" align="top"/><a href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getResourcePath()%></a></td><% } %>
+ <% if(resourceData.getResourceType().equals(ResourceData.RESOURCE)){ %><td style="padding-left:25px;"><a href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getResourcePath()%></a></td><% } %>
+
<td><%=resourceData.getFormattedCreatedOn()%></td>
<td><%=resourceData.getAuthorUserName()%></td>
<td>
Modified: branches/registry/1_1/modules/webapps/src/main/webapp/admin/css/main.css
URL: http://wso2.org/svn/browse/wso2/branches/registry/1_1/modules/webapps/src/main/webapp/admin/css/main.css?rev=17943&r1=17942&r2=17943&view=diff
==============================================================================
--- branches/registry/1_1/modules/webapps/src/main/webapp/admin/css/main.css (original)
+++ branches/registry/1_1/modules/webapps/src/main/webapp/admin/css/main.css Wed Jun 4 22:05:03 2008
@@ -372,7 +372,7 @@
color:#414e6b;
}
.error-message{
-background-image:url(../images/error-message.jpg);
+background-image:url(../images/error-message.gif);
background-repeat:no-repeat;
background-position:0px 0px;
margin-top:10px;
Modified: branches/registry/1_1/modules/webapps/src/main/webapp/admin/error.jsp
URL: http://wso2.org/svn/browse/wso2/branches/registry/1_1/modules/webapps/src/main/webapp/admin/error.jsp?rev=17943&r1=17942&r2=17943&view=diff
==============================================================================
--- branches/registry/1_1/modules/webapps/src/main/webapp/admin/error.jsp (original)
+++ branches/registry/1_1/modules/webapps/src/main/webapp/admin/error.jsp Wed Jun 4 22:05:03 2008
@@ -32,7 +32,7 @@
<% } %>
<br/>
- <font color="red"><img src="/wso2registry/admin/images/error-message.jpg" align="bottom" /> <%=msg%></font>
+ <font color="red"><img src="/wso2registry/admin/images/error-message.gif" align="bottom" /> <%=msg%></font>
<br/>
</div>
</div>
Added: branches/registry/1_1/modules/webapps/src/main/webapp/admin/images/error-message.gif
URL: http://wso2.org/svn/browse/wso2/branches/registry/1_1/modules/webapps/src/main/webapp/admin/images/error-message.gif?pathrev=17943
==============================================================================
Binary file. No diff available.
Modified: branches/registry/1_1/modules/webapps/src/main/webapp/admin/people.jsp
URL: http://wso2.org/svn/browse/wso2/branches/registry/1_1/modules/webapps/src/main/webapp/admin/people.jsp?rev=17943&r1=17942&r2=17943&view=diff
==============================================================================
--- branches/registry/1_1/modules/webapps/src/main/webapp/admin/people.jsp (original)
+++ branches/registry/1_1/modules/webapps/src/main/webapp/admin/people.jsp Wed Jun 4 22:05:03 2008
@@ -30,7 +30,7 @@
<!-- START header content -->
<jsp:include page="header.jsp" />
<!--This is the START of main table which seperates 2 coloums for promotions and content of the site -->
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
+<table cellpadding="0" cellspacing="0" border="0" style="width:100%;*width:98%;">
<tr>
<td class="promotionDiv" valign="top">
<jsp:include page="promotion.jsp" />
@@ -42,36 +42,36 @@
<% if (errorMessage != null) { %>
<div class="error-message"><%=errorMessage%></div>
<% } %>
-<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+<table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
<tr>
<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>
+ <h2 style="margin-bottom:10px;">Users </h2>
</td>
<td align="right" valign="top">
-
+
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolBarTable">
<tr>
- <td><% if (userManagementAction.isAddAllowed()) { %><a onclick="showHideCommon('userAddBox');$('newUserName').focus();" title="Add New User"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" /></a><% } %></td>
+ <td><% if (userManagementAction.isAddAllowed()) { %><a onclick="showHideCommon('userAddBox');$('newUserName').focus();" title="Add New User"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" style="*margin-right:10px;" /></a><% } %></td>
<td>
-
+
</td>
</tr>
</table>
</td>
</tr>
</table>
-
+
</div>
<div>
<!-- START user add box -->
-
+
<div id="userAddBox" style="display:none;">
<h3 class="forPeople">Add New User</h3>
<div id="newUserReason" class="validationError" style="display: none;"></div>
@@ -99,7 +99,7 @@
<select name="roleName" id="AddUser_roleName">
<option value="1"
>-- None --</option>
-
+
<%
List roleNames = userManagementAction.getRoleNames();
Iterator i = roleNames.iterator();
@@ -107,34 +107,34 @@
String role = (String) i.next();
if (!RegistryConstants.EVERYONE_ROLE.equals(role)) {
%>
-
+
<option value="<%=role%>"><%=role%></option>
-
+
<% }} %>
</select>
</td>
</tr>
-
+
<tr>
<td> </td>
<td>
- <input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitUserAddForm();"/>
+ <input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitUserAddForm();"/>
<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%;margin-left:10px;" class="data-table">
+ <!-- End user add box -->
+
+ <table cellpadding="0" cellspacing="0" border="0" style="width:100%;*width:98%;" class="data-table">
<tr>
<th>Username</th>
- <th>Display name</th>
+ <th>Display name</th>
<th style="width:50px;" align="right">Action</th>
-
+
</tr>
-
+
<%
Map userNames = userManagementAction.getUserNames();
Iterator iUsers = userNames.keySet().iterator();
@@ -142,11 +142,11 @@
String regUser = (String) iUsers.next();
String friendlyName = (String) userNames.get(regUser);
%>
-
+
<tr>
<td><a href="/wso2registry/system/people/<%=regUser%>"><%=regUser%></a></td>
<td> <%=friendlyName%></td>
-
+
<td align="left">
<%
if (!RegistryConstants.SYSTEM_USER.equals(regUser) &&
@@ -159,15 +159,15 @@
%>
</td>
</tr>
-
+
<% } %>
-
+
</table>
<!-- End box1-mid div -->
</div>
-
-
+
+
</td>
<td valign="top" style="width:5px;" align="center">
<img src="/wso2registry/admin/images/colSep.jpg" border="0" hspace="10" />
@@ -175,14 +175,14 @@
<td style="width:50%;" valign="top">
<!-- Hear comes the roles box -->
<!-- Hear comes the box1 table -->
-
+
<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
<tr>
<td valign="top">
- <h2>Roles </h2>
+ <h2 style="margin-bottom:10px;">Roles </h2>
</td>
<td align="right" valign="top">
- <% if (userManagementAction.isAddAllowed()) { %><a onclick="showHideCommon('addRoleBox');$('newRoleName').focus();" title="Add New Role"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" /></a><% } %>
+ <% if (userManagementAction.isAddAllowed()) { %><a onclick="showHideCommon('addRoleBox');$('newRoleName').focus();" title="Add New Role"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" style="*margin-right:10px;" /></a><% } %>
</td>
</tr>
</table>
@@ -201,20 +201,20 @@
<tr>
<td> </td>
<td>
- <input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitRoleAddForm();"/>
- <input type="button" class="button" value="Cancel" style="margin-top:10px;" onclick="showHideCommon('addRoleBox');"/>
+ <input type="button" class="button" value="Add" style="margin-top:10px;" onclick="submitRoleAddForm();"/>
+ <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%;margin-left:10px;" class="data-table">
+ </div>
+ <table cellpadding="0" cellspacing="0" border="0" style="width:100%;*width:98%;" class="data-table">
<tr>
<th>Role Name</th>
<th style="width:50px;" align="left">Action</th>
-
+
</tr>
-
+
<%
List roles = userManagementAction.getRoleNames();
Iterator iRoles = roles.iterator();
@@ -223,7 +223,7 @@
%>
<tr>
<td><%=role%></td>
- <td>
+ <td>
<%
if (!RegistryConstants.EVERYONE_ROLE.equals(role) &&
!RegistryConstants.ADMIN_ROLE.equals(role) &&
@@ -235,20 +235,20 @@
%>
</td>
</tr>
-
- <% } %>
-
+
+ <% } %>
+
</table>
<!-- End box2-mid div -->
</div>
-
-
+
+
<!-- Roles box ends -->
-
-
-
+
+
+
</div>
</td>
More information about the Registry-dev
mailing list