Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv1363/webapp/editors/recyclebin
Modified Files:
index.jsp recyclebin.js
Log Message:
CMSC-1088 Restore/Delete the Assets from trash
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-1088
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- index.jsp 26 Sep 2008 06:58:32 -0000 1.14
+++ index.jsp 13 Nov 2008 04:24:08 -0000 1.15
@@ -57,8 +57,8 @@
<div class="body">
<mm:node number="$parentchannel">
- <mm:relatednodescontainer
path="contentrel,contentelement" searchdirs="destination"
element="contentelement">
- <mm:sortorder field="contentelement.${sortBy}"
direction="${direction}" />
+ <mm:relatednodescontainer
path="creationrel,assetelement" searchdirs="source" element="assetelement">
+
<c:set var="listSize"><mm:size/></c:set>
<c:set var="resultsPerPage" value="50"/>
@@ -83,17 +83,82 @@
<tr <mm:even
inverse="true">class="swap"</mm:even>>
<td nowrap>
- <a href="javascript:info('<mm:field
name="number" />')"><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: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}');"><img src="../gfx/icons/restore.png"
width="16" height="16" alt="<fmt:message key="recyclebin.restore" />"
title="<fmt:message key="recyclebin.restore" />"/></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><mm:field name="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>
+ <td>
+ <mm:field name="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">
+
+
+ <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>
+
+ <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>
+ <mm:field name="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>
Index: recyclebin.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/recyclebin.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- recyclebin.js 23 Apr 2007 12:52:43 -0000 1.5
+++ recyclebin.js 13 Nov 2008 04:24:08 -0000 1.6
@@ -1,20 +1,34 @@
- function restore(objectnumber, offset, url) {
+ function restore(objectnumber, offset, type, url) {
+ if(type=="Attachment"||type=="Image"||type=="Url"){
+ url = "RestoreAssetAction.do";
+ }
+ else{
url = "RestoreAction.do";
+ }
url += "?objectnumber=" + objectnumber;
url += "&returnurl=" + escape(document.location);
url += "&offset=" + offset;
-
document.location.href = url;
}
- function info(objectNumber) {
- var url = "../repository/showitem.jsp";
+ function info(objectNumber, type) {
+ var url;
+ if(type=="Attachment"||type=="Image"||type=="Url"){
+ url = '../resources/';
+ url += type.toLowerCase();
+ url += 'info.jsp?objectnumber=';
+ url += objectNumber;
+ openPopupWindow('imageinfo', '900', '500', url);
+ }
+ else{
+ url = "../repository/showitem.jsp";
url += "?objectnumber=" + objectNumber;
var options = 'width=500,height=500,scrollbars=yes,resizable=yes'
var w = window.open(url, 'viewItem', options);
w.focus();
}
+ }
function permanentDelete(objectnumber, message, offset) {
if (confirm(message)) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
