Author: jonathan
Date: Thu Jan 24 12:40:19 2008
New Revision: 12848
Log:
MASHUP-572: disabled links to deleted mashups in the activity search
Added new and improved activity icons.
Added:
trunk/mashup/java/modules/www/images/activity-comment.gif (contents, props
changed)
trunk/mashup/java/modules/www/images/activity-delete.gif (contents, props
changed)
trunk/mashup/java/modules/www/images/activity-edit.gif (contents, props
changed)
trunk/mashup/java/modules/www/images/activity-rate.gif (contents, props
changed)
Modified:
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/search.jsp
Added: trunk/mashup/java/modules/www/images/activity-comment.gif
==============================================================================
Binary file. No diff available.
Added: trunk/mashup/java/modules/www/images/activity-delete.gif
==============================================================================
Binary file. No diff available.
Added: trunk/mashup/java/modules/www/images/activity-edit.gif
==============================================================================
Binary file. No diff available.
Added: trunk/mashup/java/modules/www/images/activity-rate.gif
==============================================================================
Binary file. No diff available.
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Thu Jan 24 12:40:19 2008
@@ -299,7 +299,17 @@
<nobr><%=QueryParamUtils.friendlyDate(result.getDate())%>
</nobr>
</td>
- <td width="1" valign="top"><img src="images/ra.gif"/></td>
+ <td width="1" valign="top">
+ <% if (action.equals("deleted")) { %>
+ <img src="images/activity-delete.gif"/>
+ <% } else if (action.equals("rated")) { %>
+ <img src="images/activity-rate.gif"/>
+ <% } else if (action.equals("commented") || action.equals("tagged")) {
%>
+ <img src="images/activity-comment.gif"/>
+ <% } else { %>
+ <img src="images/activity-edit.gif"/>
+ <% } %>
+ </td>
<td valign="top" colspan="3">
<% if
(result.getAuthor().equals(RegistryUtils.getCurrentUser(registry))) { %>
<a href="user.jsp?name=<%=result.getAuthor()%>">You</a>
@@ -308,10 +318,14 @@
.getFullName(request, result.getAuthor())%></a>
(<%=result.getAuthor()%>)
<% } %>
<%= action %>
- <% if (action.equals("commented")) { %>on<% } %>
- <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%></a>
- <% if (action.equals("rated")) { %>
- <%=result.getContentString() %> stars
+ <% if (action.equals("commented")) { %>on<% }
+ if (action.equals("deleted")) { %>
+ <%=result.getName()%>
+ <% } else { %>
+ <a href="mashup.jsp?path=<%=path%>"><%=result.getName()%></a>
+ <% }
+ if (action.equals("rated")) { %>
+ <%=result.getContentString() %> stars
<% } else if (action.equals("commented")) { %>
<span class="inline-comment">"<%=result.getContentString() %>"</span>
<% } %>
Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp (original)
+++ trunk/mashup/java/modules/www/search.jsp Thu Jan 24 12:40:19 2008
@@ -789,11 +789,13 @@
</td>
<td valign="top">
<% if (action.equals("deleted")) { %>
- <img src="images/delete.gif"/>
- <% } else if (action.equals("commented")) { %>
- <img src="images/write.gif"/>
+ <img src="images/activity-delete.gif"/>
+ <% } else if (action.equals("rated")) { %>
+ <img src="images/activity-rate.gif"/>
+ <% } else if (action.equals("commented") || action.equals("tagged")) {
%>
+ <img src="images/activity-comment.gif"/>
<% } else { %>
- <img src="images/edit.gif"/>
+ <img src="images/activity-edit.gif"/>
<% } %>
</td>
<td valign="top" width="100%" colspan="2">
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
