Author: chathura
Date: Mon Jan 28 00:50:50 2008
New Revision: 13037
Log:
blocked rename for old versions of resources.
Formatted dates.
Fixed the user guide link in the about page.
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
branches/registry/1_0/modules/webapps/src/main/webapp/admin/about.jsp
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
Mon Jan 28 00:50:50 2008
@@ -18,6 +18,7 @@
import org.wso2.registry.LogEntry;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.web.utils.CommonUtil;
import org.wso2.registry.secure.SecureRegistry;
import javax.servlet.http.HttpServletRequest;
@@ -82,23 +83,23 @@
LogEntry logEntry = logs[i];
if (logEntry.getAction() == LogEntry.UPDATE) {
- String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has updated
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> on " + logEntry.getDate().toString()
+ ".";
+ String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has updated
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> on " +
CommonUtil.formatDate(logEntry.getDate()) + ".";
activity.add(entry);
} else if (logEntry.getAction() == LogEntry.DELETE_RESOURCE) {
- String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has deleted
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> on " + logEntry.getDate().toString()
+ ".";
+ String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has deleted
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> on " +
CommonUtil.formatDate(logEntry.getDate()) + ".";
activity.add(entry);
} else if (logEntry.getAction() == LogEntry.COMMENT) {
- String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has
commented on resource '" + "<a href='/wso2registry/web" +
logEntry.getResourcePath() + "'>" + logEntry.getResourcePath() + "</a> on " +
logEntry.getDate().toString() + " with the following comment.<br/>" +
logEntry.getActionData();
+ String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has
commented on resource '" + "<a href='/wso2registry/web" +
logEntry.getResourcePath() + "'>" + logEntry.getResourcePath() + "</a> on " +
CommonUtil.formatDate(logEntry.getDate()) + " with the following comment.<br/>"
+ logEntry.getActionData();
activity.add(entry);
} else if (logEntry.getAction() == LogEntry.TAG) {
- String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has tagged
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> with tag '" +
logEntry.getActionData() + "' on " + logEntry.getDate().toString() + ".";
+ String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has tagged
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> with tag '" +
logEntry.getActionData() + "' on " + CommonUtil.formatDate(logEntry.getDate())
+ ".";
activity.add(entry);
} else if (logEntry.getAction() == LogEntry.RATING) {
- String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has rated
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> with rating " +
logEntry.getActionData() + " on " + logEntry.getDate().toString() + ".";
+ String entry = "<a href='/wso2registry/system/people/" +
logEntry.getUserName() + "'>" + logEntry.getUserName() + "</a>" + " has rated
the resource '" + "<a href='/wso2registry/web" + logEntry.getResourcePath() +
"'>" + logEntry.getResourcePath() + "</a> with rating " +
logEntry.getActionData() + " on " + CommonUtil.formatDate(logEntry.getDate()) +
".";
activity.add(entry);
}
Modified: branches/registry/1_0/modules/webapps/src/main/webapp/admin/about.jsp
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/about.jsp
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/about.jsp
Mon Jan 28 00:50:50 2008
@@ -66,7 +66,7 @@
<h3>User guide</h3>
<p>
Registry user guide is available at
- <a
href="http://wso2.org/wiki/display/registry/User+guide";
target="_blank">http://wso2.org/wiki/display/registry/User+guide</a>
+ <a
href="http://wso2.org/wiki/display/registry/User+guide";
target="_blank">http://wso2.org/wiki/display/registry/WSO2+Registry+User%27s+Guide</a>
</p>
</div>
<div class="box2-bot">
@@ -195,7 +195,7 @@
</table>
</div>
<div class="box1-mid">
- WSO2 offers �Live Online Training� and �Onsite
Training� training courses.
+ WSO2 offers �Live Online Training� and �Onsite
Training� training courses.
<h3>Live Online Training</h3>
<p>Our live online training sessions bring you all the advantages of a
classroom training no matter where you are. You can share data, ask questions
from the instructor, speak with the other participants, and even request for a
coffee break when you need one!</p>
<h3>Onsite Training</h3>
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
(original)
+++
branches/registry/1_0/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
Mon Jan 28 00:50:50 2008
@@ -54,13 +54,13 @@
<a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView<%=entryNumber%>"><%=resourceData.getName()%></a>
<input type="text" id="resourceEdit<%=entryNumber%>"
style="display:none" value="<%=resourceData.getName()%>" />
| <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
- <% if (resourceData.isDeleteAllowed()) { %>| <a href="#"
title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
+ <% if (resourceData.isDeleteAllowed() &&
!details.isVersionView()) { %>| <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
<a href="#" onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>',
'resourceEdit<%=entryNumber%>');showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceSaveButton<%=entryNumber%>" style="display:none;"><img border="0"
align="top" title="Save" src="/wso2registry/admin/images/save-button.gif"
/></a>
<% } %>
</div>
<% } %>
</td>
- <td><%=resourceData.getCreatedOn()%></td>
+ <td><%=resourceData.getFormattedCreatedOn()%></td>
<td><%=resourceData.getAuthorUserName()%></td>
<td>
<img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[0]%>.gif"
align="top" />
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++
branches/registry/1_0/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Mon Jan 28 00:50:50 2008
@@ -112,8 +112,8 @@
<% } %>
<!-- all the content goes here -->
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
- <tr><th style="width:140px;">Created:</th><td
style="width:170px;"><%=details.getCreatedOn().toString()%></td><th>Author:</th><td><%=details.getAuthor()%></td></tr>
- <tr><th>Last
Updated:</th><td><%=details.getLastModified().toString()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
+ <tr><th style="width:140px;">Created:</th><td
style="width:170px;"><%=details.getFormattedCreatedOn()%></td><th>Author:</th><td><%=details.getAuthor()%></td></tr>
+ <tr><th>Last
Updated:</th><td><%=details.getFormattedLastModified()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
<tr><th>Media Type:</th><td colspan="3"><% if (details.getMediaType()
!= null) { %><%=details.getMediaType()%><% } else { %>Unknown<% } %></td> </tr>
<% if (details.isCollection()) { %>
<tr><th>Permalink:</th><td colspan="3"><a
href="/wso2registry/web<%=details.getPermalink()%>"><%=details.getPermalink()%></a></td></tr>
@@ -404,19 +404,20 @@
%>
<tr id="1">
<td>
- <% if (resourceData.getResourceType() ==
ResourceData.COLLECTION) { %>
- <img
src="/wso2registry/admin/images/icon-folder-small.gif"
style="margin-right:5px;" /><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getName()%></a>
- <% } else { %>
- <div style="margin-left:20px;">
- <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView<%=entryNumber%>"><%=resourceData.getName()%></a>
- <input type="text" id="resourceEdit<%=entryNumber%>"
style="display:none" value="<%=resourceData.getName()%>" />
- | <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
- | <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
- <a href="#"
onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>',
'resourceEdit<%=entryNumber%>');showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceSaveButton<%=entryNumber%>" style="display:none;"><img border="0"
align="top" title="Save" src="/wso2registry/admin/images/save-button.gif"
/></a>
- </div>
- <% } %>
+ <% if (resourceData.getResourceType() == ResourceData.COLLECTION)
{ %>
+ <img src="/wso2registry/admin/images/icon-folder-small.gif"
style="margin-right:5px;" /><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getName()%></a>
+ <% } else { %>
+ <div style="margin-left:20px;">
+ <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView<%=entryNumber%>"><%=resourceData.getName()%></a>
+ <input type="text" id="resourceEdit<%=entryNumber%>"
style="display:none" value="<%=resourceData.getName()%>" />
+ | <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
+ <% if (resourceData.isDeleteAllowed() &&
!details.isVersionView()) { %>| <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
+ <a href="#" onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>',
'resourceEdit<%=entryNumber%>');showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceSaveButton<%=entryNumber%>" style="display:none;"><img border="0"
align="top" title="Save" src="/wso2registry/admin/images/save-button.gif"
/></a>
+ <% } %>
+ </div>
+ <% } %>
</td>
- <td><%=resourceData.getCreatedOn()%></td>
+ <td><%=resourceData.getFormattedCreatedOn()%></td>
<td><%=resourceData.getAuthorUserName()%></td>
<td>
<img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[0]%>.gif"
align="top" />
@@ -436,7 +437,6 @@
<% } %>
-
</table>
</div>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
