Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory
james.mmbase.org:/tmp/cvs-serv24461/cmsc/contentrepository/src/webapp/editors/recyclebin
Modified Files:
Tag: v1_3
index.jsp restore.jsp
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- index.jsp 21 May 2007 18:06:15 -0000 1.7
+++ index.jsp 3 Mar 2008 10:37:30 -0000 1.7.2.1
@@ -19,10 +19,19 @@
</div>
<div class="editor">
- <div class="body"
- <mm:cloud jspvar="cloud" rank="administrator" method='http'>
+ <mm:cloud jspvar="cloud" rank="basic user" method='http'>
+
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field name="number" jspvar="trashNumber" vartype="Integer">
+
+ <cmsc:rights nodeNumber="<%=trashNumber.intValue()%>"
var="rolename"/>
+ <c:choose>
+ <c:when test="${rolename eq 'webmaster'}">
+
<mm:import id="parentchannel"
jspvar="parentchannel"><%= RepositoryUtil.ALIAS_TRASH %></mm:import>
<mm:import jspvar="returnurl"
id="returnurl">/editors/recyclebin/index.jsp</mm:import>
+
+ <div class="body">
<p>
<fmt:message key="recyclebin.channel" />
</p>
@@ -36,7 +45,10 @@
</form>
<div style="clear:both; height:10px;"></div>
</div>
- <div class="ruler_green"><div><fmt:message
key="recyclebin.content" /></div></div>
+
+ <div class="ruler_green">
+ <div><fmt:message key="recyclebin.content" /></div>
+ </div>
<div class="body">
<mm:node number="$parentchannel">
@@ -45,7 +57,7 @@
<c:set
var="listSize"><mm:size/></c:set>
<c:set var="resultsPerPage"
value="50"/>
- <c:set var="offset"
value="${param.offset}"/>
+ <c:set var="offset" value="${not empty
param.offset ? param.offset : '0'}"/>
<mm:listnodes jspvar="node"
max="${resultsPerPage}" offset="${offset*resultsPerPage}">
<mm:first>
@@ -53,20 +65,19 @@
<table>
<thead>
<tr>
- <th>
- </th>
- <th><fmt:message
key="locate.typecolumn" /></th>
+ <th style="width: 56px;"></th>
+ <th style="width:
68px;"><fmt:message key="locate.typecolumn" /></th>
<th><fmt:message
key="locate.titlecolumn" /></th>
- <th><fmt:message
key="locate.authorcolumn" /></th>
- <th><fmt:message
key="locate.lastmodifiedcolumn" /></th>
- <th><fmt:message
key="locate.numbercolumn" /></th>
+ <th style="width:
50px;"><fmt:message key="locate.authorcolumn" /></th>
+ <th style="width:
120px;"><fmt:message key="locate.lastmodifiedcolumn" /></th>
+ <th style="width:
60px;"><fmt:message key="locate.numbercolumn" /></th>
</tr>
</thead>
<tbody class="hover">
</mm:first>
<tr <mm:even
inverse="true">class="swap"</mm:even>>
- <td nowrap width="80">
+ <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: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>
<% if
(RepositoryUtil.hasDeletionChannels(node)) { %>
@@ -77,9 +88,9 @@
<mm:nodeinfo type="guitype"/>
</td>
<td><mm:field name="title"/></td>
- <td width="50"><mm:field
name="lastmodifier" /></td>
- <td width="120"
nowrap><mm:field name="lastmodifieddate"><cmsc:dateformat displaytime="true"
/></mm:field></td>
- <td width="60"><mm:field
name="number"/></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>
@@ -91,9 +102,21 @@
</mm:relatednodescontainer>
</mm:node>
- </mm:cloud>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div class="body">
+ <fmt:message key="recyclebin.no.access" />
</div>
+
+ </c:otherwise>
+ </c:choose>
+
+ </mm:field>
+ </mm:node>
+
+ </mm:cloud>
<div class="side_block_end"></div>
</div>
Index: restore.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- restore.jsp 21 May 2007 18:06:15 -0000 1.3
+++ restore.jsp 3 Mar 2008 10:37:30 -0000 1.3.2.1
@@ -1,5 +1,6 @@
<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
<[EMAIL PROTECTED] file="globals.jsp" %>
+<[EMAIL PROTECTED] import="com.finalist.cmsc.repository.*" %>
<mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
@@ -7,12 +8,6 @@
<body>
<mm:cloud jspvar="cloud" rank="basic user" method='http'>
-<mm:import externid="content" vartype="Node"/>
-<mm:import externid="contentchannels" vartype="List"/>
-
-<mm:node referid="content">
- <mm:import id="contentnumber"><mm:field name="number"/></mm:import>
-</mm:node>
<div class="tabs">
<div class="tab_active">
@@ -27,6 +22,20 @@
<div class="editor">
<div class="body">
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field name="number" jspvar="trashNumber" vartype="Integer">
+
+ <cmsc:rights nodeNumber="<%=trashNumber.intValue()%>"
var="rolename"/>
+ <c:choose>
+ <c:when test="${rolename eq 'webmaster'}">
+
+ <mm:import externid="content" vartype="Node"/>
+ <mm:import externid="contentchannels" vartype="List"/>
+
+ <mm:node referid="content">
+ <mm:import id="contentnumber"><mm:field
name="number"/></mm:import>
+ </mm:node>
+
<p><fmt:message key="recyclebin.restore.selectchannel"
/></p>
<ul>
<mm:list referid="contentchannels">
@@ -50,6 +59,15 @@
</li>
</ul>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="recyclebin.no.access" />
+ </c:otherwise>
+ </c:choose>
+
+ </mm:field>
+ </mm:node>
+
</div>
<div class="side_block_end"></div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
