Author: raintang
Date: 2009-09-18 11:19:37 +0200 (Fri, 18 Sep 2009)
New Revision: 38686
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1373 Confirmation should be asked while removing multiple elements from
channel
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-09-18 09:19:07 UTC (rev 38685)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-09-18 09:19:37 UTC (rev 38686)
@@ -206,7 +206,8 @@
</table>
<% 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="asset.delete.massdelete" />"
+ onclick="massDelete('<fmt:message
key="asset.delete.massdeleteconfirm" />', 'assetForm')"/>
<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>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-09-18 09:19:07 UTC (rev 38685)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-09-18 09:19:37 UTC (rev 38686)
@@ -357,7 +357,7 @@
<c:if test="${fn:length(results) >1}">
<div align="left">
<input type="submit" class="button" name="massdelete"
-
onclick="javascript:deleteAsset('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')"
+
onclick="javascript:deleteAsset('massdelete','<fmt:message
key="asset.delete.massdeleteconfirm"/>')"
value="<fmt:message key="asset.delete.massdelete" />"/>
</div>
</c:if>
@@ -461,7 +461,7 @@
<c:if test="${fn:length(results) >1}">
<div align="left">
<input type="submit" class="button" name="massdelete"
- onclick="javascript:deleteAsset('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')"
+ onclick="javascript:deleteAsset('massdelete','<fmt:message
key="asset.delete.massdeleteconfirm"/>')"
value="<fmt:message key="asset.delete.massdelete" />"/>
</div>
</c:if>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-09-18 09:19:07 UTC (rev 38685)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-09-18 09:19:37 UTC (rev 38686)
@@ -271,7 +271,7 @@
</table>
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<c:if test="${fn:length(elements) >1}">
-<input type="submit" class="button" value="<fmt:message
key="content.delete.massdelete" />"/>
+<input type="submit" class="button" value="<fmt:message
key="content.delete.massdelete" />" onclick="massDelete('<fmt:message
key="content.delete.massdeleteconfirm" />', 'contentForm')"/>
<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>
<% } %>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-09-18 09:19:07 UTC (rev 38685)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-09-18 09:19:37 UTC (rev 38686)
@@ -368,7 +368,7 @@
<mm:compare referid="action" value="link" inverse="true">
<mm:hasrank minvalue="siteadmin">
<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="content.delete.massdeleteconfirm"/>')" value="<fmt:message
key="content.delete.massdelete" />"/></div>
</c:if>
</mm:hasrank>
</mm:compare>
@@ -546,10 +546,12 @@
<mm:last>
</tbody>
</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" />"/>
- </c:if>
+ <mm:compare referid="action" value="link" inverse="true">
+ <mm:hasrank minvalue="siteadmin">
+ <c:if test="${fn:length(results) >1}">
+ <div align="left"> <input type="button" class="button"
name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message
key="content.delete.massdeleteconfirm"/>')" value="<fmt:message
key="content.delete.massdelete" />"/></div>
+ </c:if>
+ </mm:hasrank>
</mm:compare>
<mm:compare referid="linktochannel" value="" inverse="true">
<input type="submit" class="button" value="<fmt:message
key="searchform.link.submit" />"/>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
