Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv8078
Modified Files:
asset.jsp assetupload.jsp contentsearch.jsp
Log Message:
CMSC-1197 Assets: add mass move option to asset channel view
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1197
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- asset.jsp 17 Dec 2008 03:48:54 -0000 1.19
+++ asset.jsp 19 Dec 2008 03:34:21 -0000 1.20
@@ -132,6 +132,8 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<c:if test="${fn:length(elements) >1}">
<input type="submit" class="button"
value="<fmt:message key="asset.delete.massdelete" />"/>
+ <input type="button" class="button"
value="<fmt:message key="content.delete.massmove" />"
+ onclick="massMove('${parentchannel}','<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/>
</c:if>
<% } %>
<table>
@@ -218,6 +220,8 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<c:if test="${fn:length(elements) >1}">
<input type="submit" class="button"
value="<fmt:message key="asset.delete.massdelete" />"/>
+ <input type="button" class="button"
value="<fmt:message key="content.delete.massmove" />"
+ onclick="massMove('${parentchannel}','<c:url
value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/>
</c:if>
<% } %>
</form>
Index: assetupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- assetupload.jsp 11 Dec 2008 09:19:55 -0000 1.6
+++ assetupload.jsp 19 Dec 2008 03:34:21 -0000 1.7
@@ -21,6 +21,11 @@
<td style="color:red;"><fmt:message key="asset.upload.existed"
/></td>
</tr>
</c:if>
+ <c:if test="${param.exceed == 'yes'}">
+ <tr>
+ <td style="color:red;"><fmt:message
key="asset.upload.size.exceed"/></td>
+ </tr>
+ </c:if>
<tr>
<td><html:file property="file" /></td>
</tr>
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- contentsearch.jsp 17 Dec 2008 03:48:54 -0000 1.4
+++ contentsearch.jsp 19 Dec 2008 03:34:21 -0000 1.5
@@ -426,17 +426,6 @@
<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"/>')">
- <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>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster')}">
- <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>
-
-
<mm:compare referid="action" value="search">
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do"
var="showVersions">
@@ -457,6 +446,15 @@
</c:if>
</cmsc:hasfeature>
</mm:compare>
+ <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster'}">
+ <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>
+ <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster')}">
+ <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>
+
</td>
<td style="white-space: nowrap;">
<mm:nodeinfo type="guitype"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
