Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin In directory james.mmbase.org:/tmp/cvs-serv23712/cmsc/contentrepository/src/webapp/editors/recyclebin
Modified Files: Tag: b1_4 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.10 retrieving revision 1.10.2.1 diff -u -b -r1.10 -r1.10.2.1 --- index.jsp 30 Jan 2008 15:33:16 -0000 1.10 +++ index.jsp 3 Mar 2008 10:22:17 -0000 1.10.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"> @@ -90,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.4.1 diff -u -b -r1.3 -r1.3.4.1 --- restore.jsp 21 May 2007 18:06:15 -0000 1.3 +++ restore.jsp 3 Mar 2008 10:22:17 -0000 1.3.4.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 Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs