Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv8064
Modified Files:
content.jsp search.jsp
Log Message:
CMSC-899,Check and improve all lists according to guideline
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- content.jsp 8 Sep 2008 03:42:28 -0000 1.35
+++ content.jsp 8 Sep 2008 10:54:25 -0000 1.36
@@ -170,26 +170,16 @@
<input type="checkbox" name="chk_<mm:field name="number" />"
value="<mm:field name="number" />"
onClick="document.forms['contentForm'].elements.selectall.checked=false;"/>
</c:if>
<% } %>
- <a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
-
title="<fmt:message key="content.info" />"
-
alt="<fmt:message key="content.info" />"/></a>
- <a href="<cmsc:contenturl number="${number}"/>" target="_blank"><img
src="../gfx/icons/preview.png"
-
alt="<fmt:message key="content.preview.title" />"
-
title="<fmt:message key="content.preview.title" />"/></a>
<a href="javascript:callEditWizard('<mm:field name="number" />');"
title="<fmt:message key="content.edit" />"><img
src="../gfx/icons/edit.png" width="16" height="16"
title="<fmt:message
key="content.edit" />"
alt="<fmt:message
key="content.edit" />"/></a>
- <% if (role != null && SecurityUtil.isWriter(role)) { %>
- <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />"
- target="selectchannel" onclick="moveContent(<mm:field name="number" />,
${parentchannel} )">
- <img src="../gfx/icons/page_move.png" title="<fmt:message
key="searchform.icon.move.title" />"/></a>
-
- <a href="javascript:unpublish('<mm:write referid="parentchannel"
/>','<mm:field name="number" />');"
- title="<fmt:message key="content.unlink" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
- title="<fmt:message
key="content.unlink" />"
- alt="<fmt:message
key="content.unlink" />"/></a>
- <% } %>
+ <a href="<cmsc:contenturl number="${number}"/>" target="_blank"><img
src="../gfx/icons/preview.png"
+
alt="<fmt:message key="content.preview.title" />"
+
title="<fmt:message key="content.preview.title" />"/></a>
+ <a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
+
title="<fmt:message key="content.info" />"
+
alt="<fmt:message key="content.info" />"/></a>
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do" var="showVersions">
<c:param name="nodenumber"><mm:field name="number"/></c:param>
@@ -198,19 +188,31 @@
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)) { %>
+ <a href="javascript:unpublish('<mm:write referid="parentchannel"
/>','<mm:field name="number" />');"
+ title="<fmt:message key="content.unlink" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
+ title="<fmt:message
key="content.unlink" />"
+ alt="<fmt:message
key="content.unlink" />"/></a>
+ <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />"
+ target="selectchannel" onclick="moveContent(<mm:field name="number" />,
${parentchannel} )">
+ <img src="../gfx/icons/page_move.png" title="<fmt:message
key="searchform.icon.move.title" />"/></a>
+ <% } %>
<% 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" />"
- alt="<fmt:message key="content.move.down" />"/></a>
- </mm:last>
<mm:first inverse="true">
- <mm:last><img src="../gfx/icons/spacer.png" width="16" height="16"
alt=""/></mm:last>
+
<a href="javascript:moveUp('<mm:field name="number" />','<mm:write
referid="parentchannel" />')"><img
src="../gfx/icons/up.png" width="16" height="16"
title="<fmt:message key="content.move.up" />"
alt="<fmt:message key="content.move.up" />"/></a>
</mm:first>
+ <mm:last inverse="true">
+ <mm:first><img src="../gfx/icons/spacer.png" width="16" height="16"
alt=""/></mm:first>
+ <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" />"
+ alt="<fmt:message key="content.move.down" />"/></a>
+ </mm:last>
+
<% } %>
+
<cmsc:hasfeature name="savedformmodule">
<c:set var="typeval">
<mm:nodeinfo type="type"/>
Index: search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/search.jsp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- search.jsp 8 Sep 2008 03:42:28 -0000 1.31
+++ search.jsp 8 Sep 2008 10:54:25 -0000 1.32
@@ -429,7 +429,10 @@
<a href="#"
onClick="top.opener.selectContent('<mm:field name="number" />', '', '');
top.close();">
<img src="../gfx/icons/link.png"
title="<fmt:message key="searchform.icon.select.title" />" /></a>
</mm:compare>
-
+ <mm:field name="number" write="false"
id="nodenumber">
+ <a href="<cmsc:contenturl
number="${nodenumber}"/>" target="_blank"><img src="../gfx/icons/preview.png"
alt="<fmt:message key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
+ </mm:field>
+ <a href="#" onclick="showItem(<mm:field name="number"/>);"><img
src="../gfx/icons/info.png" alt="<fmt:message key="searchform.icon.info.title"
/>" title="<fmt:message key="searchform.icon.info.title" />" /></a>
<c:if test="${creationRelNumber == trashnumber
&& rights == 'webmaster'}">
<a
href="javascript:deleteContent('<mm:field name='number'/>','<fmt:message
key="recyclebin.removeconfirm"/>')">
@@ -440,10 +443,7 @@
<a
href="javascript:deleteContent('<mm:field name='number'/>')"><img
src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.channel" />" alt="<fmt:message
key="searchform.icon.delete.channel" />"/></a>
</c:if>
- <a href="#" onclick="showItem(<mm:field name="number"/>);"><img
src="../gfx/icons/info.png" alt="<fmt:message key="searchform.icon.info.title"
/>" title="<fmt:message key="searchform.icon.info.title" />" /></a>
- <mm:field name="number" write="false"
id="nodenumber">
- <a href="<cmsc:contenturl
number="${nodenumber}"/>" target="_blank"><img src="../gfx/icons/preview.png"
alt="<fmt:message key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
- </mm:field>
+
<mm:compare referid="action" value="search">
<mm:haspage page="/editors/versioning">
<c:url
value="/editors/versioning/ShowVersions.do" var="showVersions">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
