Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv5457
Modified Files:
Tag: b1_6
asset.jsp content.js content.jsp
Log Message:
CMSC-1373 Confirmation should be asked while removing multiple elements from
channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1373
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -b -r1.30.2.1 -r1.30.2.2
--- asset.jsp 5 Mar 2009 07:53:08 -0000 1.30.2.1
+++ asset.jsp 8 Apr 2009 03:55:07 -0000 1.30.2.2
@@ -123,7 +123,8 @@
<input type="hidden" name="channelnumber" value="<mm:write
referid="parentchannel" />"/>
<% 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>
Index: content.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- content.js 27 Oct 2008 05:42:18 -0000 1.14
+++ content.js 8 Apr 2009 03:55:07 -0000 1.14.2.1
@@ -145,3 +145,9 @@
moveParentChannel = parentChannel;
openPopupWindow('selectchannel', 340, 400,url);
}
+
+function massDelete(confirmmessage, formname) {
+ if(confirm(confirmmessage)){
+ document.forms[formname].submit();
+ }
+}
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -b -r1.45.2.1 -r1.45.2.2
--- content.jsp 5 Mar 2009 07:53:08 -0000 1.45.2.1
+++ content.jsp 8 Apr 2009 03:55:07 -0000 1.45.2.2
@@ -100,7 +100,7 @@
<input type="hidden" name="channelnumber" value="<mm:write
referid="parentchannel" />"/>
<% 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="button" 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>
<% } %>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
