Author: raintang Date: 2009-09-18 11:19:07 +0200 (Fri, 18 Sep 2009) New Revision: 38685
Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp Log: CMSC-1373 Confirmation should be asked while removing multiple elements from channel Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp 2009-09-18 09:14:59 UTC (rev 38684) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp 2009-09-18 09:19:07 UTC (rev 38685) @@ -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/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2009-09-18 09:14:59 UTC (rev 38684) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2009-09-18 09:19:07 UTC (rev 38685) @@ -388,8 +388,8 @@ <mm:hasrank minvalue="siteadmin"> <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"/>')" + <input type="submit" class="button" name="massdelete" + onclick="javascript:deleteAsset('massdelete','<fmt:message key="asset.delete.massdeleteconfirm"/>')" value="<fmt:message key="asset.delete.massdelete" />"/> <input type="button" class="button" value="<fmt:message key="content.delete.massmove" />" onclick="massMoveFromSearch('<c:url value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/> </div> @@ -493,9 +493,9 @@ <mm:hasrank minvalue="siteadmin"> <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"/>')" - value="<fmt:message key="asset.delete.massdelete" />"/> + <input type="submit" class="button" name="massdelete" + onclick="javascript:deleteAsset('massdelete','<fmt:message key="asset.delete.massdeleteconfirm"/>')" + value="<fmt:message key="asset.delete.massdelete" />"/> <input type="button" class="button" value="<fmt:message key="content.delete.massmove" />" onclick="massMoveFromSearch('<c:url value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/> </div> </c:if> Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp 2009-09-18 09:14:59 UTC (rev 38684) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp 2009-09-18 09:19:07 UTC (rev 38685) @@ -272,7 +272,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="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> <% } %> Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp 2009-09-18 09:14:59 UTC (rev 38684) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp 2009-09-18 09:19:07 UTC (rev 38685) @@ -404,7 +404,7 @@ <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" />"/> + <input type="button" class="button" name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message key="content.delete.massdeleteconfirm"/>')" value="<fmt:message key="content.delete.massdelete" />"/> <input type="button" class="button" value="<fmt:message key="content.delete.massmove" />" onclick="massMoveFromSearch('<c:url value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/> </div> </c:if> @@ -587,11 +587,15 @@ <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" />"/> - <input type="button" class="button" value="<fmt:message key="content.delete.massmove" />" onclick="massMoveFromSearch('<c:url value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/> - </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" />"/> + <input type="button" class="button" value="<fmt:message key="content.delete.massmove" />" onclick="massMoveFromSearch('<c:url value='/editors/repository/select/SelectorChannel.do?role=writer' />')"/> + </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