Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin In directory james.mmbase.org:/tmp/cvs-serv27508/contentrepository/src/webapp/editors/recyclebin
Modified Files: index.jsp recyclebin.js Added Files: assettrash.jsp Log Message: CMSC-681 Asset Maintenance upload zip file and trash listing See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin See also: http://www.mmbase.org/jira/browse/CMSC-681 assettrash.jsp is new Index: index.jsp =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- index.jsp 2 Dec 2008 02:40:21 -0000 1.16 +++ index.jsp 11 Dec 2008 09:19:55 -0000 1.17 @@ -13,15 +13,23 @@ <c:out value="${direction =='up'?'down':'up' }"/> </c:set> <body onload="refreshChannels();"> - <div class="tabs"> +<div class="tabs"> + <!-- active TAB --> <div class="tab_active"> <div class="body"> <div> - <a href="#"><fmt:message key="recyclebin.title" /></a> + <a href="index.jsp"><fmt:message key="recyclebin.content.title" /></a> </div> </div> </div> + <div class="tab"> + <div class="body"> + <div> + <a href="assettrash.jsp"><fmt:message key="recyclebin.asset.title"/></a> + </div> + </div> </div> +</div> <div class="editor"> <mm:cloud jspvar="cloud" rank="basic user" method='http'> @@ -57,71 +65,6 @@ <div class="body"> <mm:node number="$parentchannel"> - <mm:relatednodescontainer path="creationrel,assetelement" searchdirs="source" element="assetelement"> - - - <c:set var="listSize"><mm:size/></c:set> - <c:set var="resultsPerPage" value="50"/> - <c:set var="offset" value="${not empty param.offset ? param.offset : '0'}"/> - - <mm:listnodes jspvar="node" max="${resultsPerPage}" offset="${offset*resultsPerPage}"> - <mm:first> - <[EMAIL PROTECTED] file="../pages.jsp" %> - <table> - <thead> - <tr> - <th style="width: 56px;"></th> - <th style="width: 68px;"><a href="?sortBy=otype&direction=${direction}" class="headerlink"><fmt:message key="locate.typecolumn" /></a></th> - <th><a href="?sortBy=title&direction=${direction}" class="headerlink"><fmt:message key="locate.titlecolumn" /></a></th> - <th style="width: 50px;"><a href="?sortBy=creator&direction=${direction}" class="headerlink"><fmt:message key="locate.authorcolumn" /></a></th> - <th style="width: 120px;"><a href="?sortBy=lastmodifieddate&direction=${direction}" class="headerlink"><fmt:message key="locate.lastmodifiedcolumn" /></a></th> - <th style="width: 60px;"><a href="?sortBy=number&direction=${direction}" class="headerlink"><fmt:message key="locate.numbercolumn" /></a></th> - </tr> - </thead> - <tbody class="hover"> - </mm:first> - - <tr <mm:even inverse="true">class="swap"</mm:even>> - <td nowrap> - <a href="javascript:info('<mm:field name="number" />', '<mm:nodeinfo type="guitype"/>')"><img src="../gfx/icons/info.png" width="16" height="16" alt="<fmt:message key="recyclebin.info" />" title="<fmt:message key="recyclebin.info" />"/></a> - <a href="javascript:permanentDelete('<mm:field name="number" />', '<fmt:message key="recyclebin.removeconfirm" />', '${offset}');"><img src="../gfx/icons/delete.png" width="16" height="16" alt="<fmt:message key="recyclebin.remove" />" title="<fmt:message key="recyclebin.remove" />"/></a> - <a href="javascript:restore('<mm:field name="number" />', '${offset}','<mm:nodeinfo type="guitype"/>');"><img src="../gfx/icons/restore.png" width="16" height="16" alt="<fmt:message key="recyclebin.restore" />" title="<fmt:message key="recyclebin.restore" />"/></a> - </td> - <td> - <mm:nodeinfo type="guitype"/> - </td> - <td style="white-space: nowrap;" onMouseDown="objClick(this);"> - <c:set var="assettype" ><mm:nodeinfo type="guitype"/></c:set> - <mm:field id="title" write="false" name="title"/> - <c:if test="${assettype == 'URL'}"> - <c:set var="title" ><mm:field name="name"/></c:set> - </c:if> - <c:if test="${fn:length(title) > 50}"> - <c:set var="title">${fn:substring(title,0,49)}...</c:set> - </c:if> - ${title} - </td> - <td> - <mm:field name="lastmodifier" /> - </td> - <td nowrap> - <mm:field name="lastmodifieddate"><cmsc:dateformat displaytime="true" /></mm:field> - </td> - <td> - <mm:field name="number"/> - </td> - </tr> - - <mm:last> - </tbody> - </table> - - </mm:last> - </mm:listnodes> - </mm:relatednodescontainer> - </mm:node> - - <mm:node number="$parentchannel"> <mm:relatednodescontainer path="contentrel,contentelement" searchdirs="destination" element="contentelement"> @@ -132,6 +75,7 @@ <mm:listnodes jspvar="node" max="${resultsPerPage}" offset="${offset*resultsPerPage}"> <mm:first> + <[EMAIL PROTECTED] file="../pages.jsp" %> <table> <thead> <tr> @@ -149,7 +93,7 @@ <tr <mm:even inverse="true">class="swap"</mm:even>> <td nowrap> <a href="javascript:info('<mm:field name="number" />', '<mm:nodeinfo type="guitype"/>')"><img src="../gfx/icons/info.png" width="16" height="16" alt="<fmt:message key="recyclebin.info" />" title="<fmt:message key="recyclebin.info" />"/></a> - <a href="javascript:permanentDelete('<mm:field name="number" />', '<fmt:message key="recyclebin.removeconfirm" />', '${offset}');"><img src="../gfx/icons/delete.png" width="16" height="16" alt="<fmt:message key="recyclebin.remove" />" title="<fmt:message key="recyclebin.remove" />"/></a> + <a href="javascript:permanentDelete('<mm:field name="number" />', '<fmt:message key="recyclebin.removeconfirm" />', '${offset}', 'content');"><img src="../gfx/icons/delete.png" width="16" height="16" alt="<fmt:message key="recyclebin.remove" />" title="<fmt:message key="recyclebin.remove" />"/></a> <a href="javascript:restore('<mm:field name="number" />', '${offset}', '<mm:nodeinfo type="guitype"/>');"><img src="../gfx/icons/restore.png" width="16" height="16" alt="<fmt:message key="recyclebin.restore" />" title="<fmt:message key="recyclebin.restore" />"/></a> </td> <td> Index: recyclebin.js =================================================================== RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/recyclebin.js,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- recyclebin.js 13 Nov 2008 04:24:08 -0000 1.6 +++ recyclebin.js 11 Dec 2008 09:19:55 -0000 1.7 @@ -30,12 +30,13 @@ } } - function permanentDelete(objectnumber, message, offset) { + function permanentDelete(objectnumber, message, offset, type) { if (confirm(message)) { var url = "DeleteAction.do"; url += "?objectnumber=" + objectnumber; url += "&returnurl=" + escape(document.location); url += "&offset=" + offset; + url += "&type=" + type; document.location.href = url; } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs