Author: channa Date: Wed Jul 9 05:27:38 2008 New Revision: 19034 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19034
Log: Displaying formal name and mashup name linked in all activity logs. Removed bracketed user name from activity and search pages. MASHUP-910. Modified: trunk/mashup/java/modules/www/activity.jsp trunk/mashup/java/modules/www/search.jsp Modified: trunk/mashup/java/modules/www/activity.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/activity.jsp?rev=19034&r1=19033&r2=19034&view=diff ============================================================================== --- trunk/mashup/java/modules/www/activity.jsp (original) +++ trunk/mashup/java/modules/www/activity.jsp Wed Jul 9 05:27:38 2008 @@ -70,27 +70,21 @@ <% } %> </td> <td class="right" valign="top" colspan="3"> - <% if (user == null || user.equals("")) { %> <% if (result.getAuthor().equals(RegistryUtils.getCurrentUser(userRegistry))) { %> <a href="user.jsp?name=<%=result.getAuthor()%>">You</a> <% } else { %> <a href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils .getFullName(request, result.getAuthor())%> - </a> (<%=result.getAuthor()%>) - <% } %> - <% } else { %> - <%=result.getAuthor()%> + </a> <% } %> <%= action %> - <% if (mashupPath == null || mashupPath.equals("")) { - if (action.equals("commented")) { %>on<% } + <% if (action.equals("commented")) { %>on<% } if (action.equals("deleted")) { %> <%=result.getName()%> <% } else { %> <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=result.getName()%> </a> <% } - } if (action.equals("rated")) { %> <%=result.getContentString() %> stars <% } else if (action.equals("tagged")) { %> Modified: trunk/mashup/java/modules/www/search.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/search.jsp?rev=19034&r1=19033&r2=19034&view=diff ============================================================================== --- trunk/mashup/java/modules/www/search.jsp (original) +++ trunk/mashup/java/modules/www/search.jsp Wed Jul 9 05:27:38 2008 @@ -330,7 +330,6 @@ entryTitle = "Activity on " + mashupAuthor + "'s " + result.getName() + " service"; entryDescription = RegistryUtils.getFullName(request, result.getAuthor()) + - " (" + result.getAuthor() + ") " + action + (action.equals("commented") ? " on " : " ") + mashupAuthor + "'s <strong>" + result.getName() + "</strong> service"; @@ -347,7 +346,7 @@ mashupAuthor + "'s " + serviceName + " service."; entryDescription = result.getContentString(); } else { - entryTitle = result.getName() + " by " + RegistryUtils.getFullName(request, result.getAuthor()) + " (" + result.getAuthor() + ")"; + entryTitle = result.getName() + " by " + RegistryUtils.getFullName(request, result.getAuthor()); entryDescription = result.getDescription(); } URL mashupLink = new URL(request.getScheme(), @@ -986,7 +985,7 @@ <a href="user.jsp?name=<%=result.getAuthor()%>">You</a> <% } else { %> <a href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils - .getFullName(request, result.getAuthor())%></a> (<%=result.getAuthor()%>) + .getFullName(request, result.getAuthor())%></a> <% } %> <%= action %> <% if (action.equals("commented")) { %>on<% } %> @@ -1023,7 +1022,7 @@ <td nowrap> <a class="updatableName" href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils.getFullName(request, - result.getAuthor())%></a> (<%=result.getAuthor()%>) + result.getAuthor())%></a> </td> <td nowrap> <a href="mashup.jsp?author=<%=result.getAuthor()%>&mashup=<%=result.getName()%>"><%=mashupName%></a> @@ -1042,7 +1041,7 @@ <td nowrap> <a class="updatableName" href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils.getFullName(request, - result.getAuthor())%></a> (<%=result.getAuthor()%>) + result.getAuthor())%></a> </td> <td class="desc"> <div id="<%=result.getAuthor() + "_" + result.getName()%>"> _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
