Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv14713
Modified Files:
content.jsp search.jsp
Log Message:
CMSC-280, Contentchannel screen does not give as much sort options as in
searching in the library, add link by javasript on columns
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-280
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- content.jsp 28 Jun 2008 12:28:48 -0000 1.32
+++ content.jsp 11 Jul 2008 03:40:24 -0000 1.33
@@ -144,9 +144,12 @@
<fmt:message key="content.typecolumn"/></a></th>
<th><a href="javascript:sortBy('title','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.titlecolumn"/></a></th>
- <th><fmt:message key="content.authorcolumn"/></th>
- <th><fmt:message key="content.lastmodifiedcolumn"/></th>
- <th><fmt:message key="content.numbercolumn"/></th>
+ <th><a href="javascript:sortBy('creator','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <fmt:message key="content.authorcolumn"/></a></th>
+ <th><a href="javascript:sortBy('lastmodifieddate','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <fmt:message key="content.lastmodifiedcolumn"/></a></th>
+ <th><a href="javascript:sortBy('number','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <fmt:message key="content.numbercolumn"/></a></th>
<th><fmt:message key="content.creationchannelcolumn"/></th>
<th></th>
</tr>
@@ -195,7 +198,7 @@
src="../gfx/icons/versioning.png" title="<fmt:message
key="content.icon.versioning.title" />"
alt="<fmt:message key="content.icon.versioning.title" />"/></a>
</mm:haspage>
- <% if (role != null && SecurityUtil.isWriter(role)) { %>
+ <% if (role != null && SecurityUtil.isEditor(role)) { %>
<mm:last inverse="true">
<a href="javascript:moveDown('<mm:field name="number" />','<mm:write
referid="parentchannel" />')"><img
src="../gfx/icons/down.png" width="16" height="16"
title="<fmt:message key="content.move.down" />"
Index: search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- search.jsp 8 Jul 2008 14:41:47 -0000 1.27
+++ search.jsp 11 Jul 2008 03:40:24 -0000 1.28
@@ -203,12 +203,12 @@
</html:select>
</td>
<td>
- <mm:hasrank minvalue="siteadmin">
+ <mm:hasrank minvalue="administrator">
<fmt:message key="searchform.useraccount" />
</mm:hasrank>
</td>
<td>
- <mm:hasrank minvalue="siteadmin">
+ <mm:hasrank minvalue="administrator">
<html:select property="useraccount" size="1">
<html:option value=""> - </html:option>
<mm:listnodes type='user' orderby='username'>
@@ -324,9 +324,9 @@
<form action="LinkToChannelAction.do" name="linkForm">
<mm:compare referid="action" value="link" inverse="true">
- <mm:hasrank minvalue="siteadmin">
+ <mm:hasrank minvalue="administrator">
<c:if test="${fn:length(results) >1}">
- <div align="left"> <input type="button" class="button"
name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')" value="<fmt:message
key="content.delete.massdelete" />"/></div>
+ <div align="left"> <input type="button" class="button"
name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>' )" value="<fmt:message
key="content.delete.massdelete" />"/></div>
</c:if>
</mm:hasrank>
</mm:compare>
@@ -352,9 +352,9 @@
<th><a href="javascript:orderBy('otype')" class="headerlink"
><fmt:message key="locate.typecolumn" /></a></th>
<th><a href="javascript:orderBy('title')" class="headerlink"
><fmt:message key="locate.titlecolumn" /></a></th>
<th><fmt:message key="locate.creationchannelcolumn" /></th>
- <th><fmt:message key="locate.authorcolumn" /></th>
- <th><fmt:message key="locate.lastmodifiedcolumn" /></th>
- <th><fmt:message key="locate.numbercolumn" /></th>
+ <th><a href="javascript:orderBy('creator')"
class="headerlink" ><fmt:message key="locate.authorcolumn" /></th>
+ <th><a href="javascript:orderBy('lastmodifieddate')"
class="headerlink" ><fmt:message key="locate.lastmodifiedcolumn" /></th>
+ <th><a href="javascript:orderBy('number')"
class="headerlink" ><fmt:message key="locate.numbercolumn" /></th>
<th></th>
</tr>
</thead>
@@ -431,7 +431,7 @@
<c:if test="${creationRelNumber == trashnumber
&& rights == 'webmaster'}">
- <a
href="javascript:deleteContent('<mm:field name='number'/>','<fmt:message
key="recyclebin.removeconfirm"/>')">
+ <a
href="javascript:deleteContent('<mm:field name='number'/>','<fmt:message
key="recyclebin.removeconfirm"/>' )">
<img
src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.recyclebin" />" alt="<fmt:message
key="searchform.icon.delete.recyclebin" />"/>
</a>
</c:if>
@@ -517,7 +517,7 @@
</table>
<mm:compare referid="action" value="link" inverse="true">
<c:if test="${fn:length(results) >1}">
- <input type="submit" class="button" name="massdelete"
onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.removeconfirm"/>')" value="<fmt:message
key="content.delete.massdelete" />"/>
+ <input type="submit" class="button" name="massdelete"
onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.removeconfirm"/>' )" value="<fmt:message
key="content.delete.massdelete" />"/>
</c:if>
</mm:compare>
<mm:compare referid="linktochannel" value="" inverse="true">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
