[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree PageTreeItemRenderer.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree
In directory 
james.mmbase.org:/tmp/cvs-serv29408/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree

Modified Files:
        PageTreeItemRenderer.java 
Log Message:
CMSC-560 - Moved the delete button under the cut/copy/paste options.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree
See also: http://www.mmbase.org/jira/browse/CMSC-560


Index: PageTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/tree/PageTreeItemRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PageTreeItemRenderer.java   24 Dec 2007 15:26:16 -0000      1.7
+++ PageTreeItemRenderer.java   5 May 2008 13:26:18 -0000       1.8
@@ -40,11 +40,6 @@
 
           renderer.addParentOptions(element, id);
           
-          if (SecurityUtil.isWebmaster(role)
-                || (model.getChildCount(parentNode) == 0 && 
!Publish.isPublished(parentNode))) {
-             element.addOption(renderer.createTreeOption("delete.png", 
"site.page.remove", "PageDelete.do?number=" + id));
-          }
-
           if (NavigationUtil.getChildCount(parentNode) >= 2) {
              element.addOption(renderer.createTreeOption("reorder.png", 
"site.page.reorder", "reorder.jsp?parent=" + id));
           }
@@ -55,6 +50,11 @@
              element.addOption(renderer.createTreeOption("paste.png", 
"site.page.paste", "javascript:paste('" + id + "');"));
           }
 
+          if (SecurityUtil.isWebmaster(role)
+                || (model.getChildCount(parentNode) == 0 && 
!Publish.isPublished(parentNode))) {
+             element.addOption(renderer.createTreeOption("delete.png", 
"site.page.remove", "PageDelete.do?number=" + id));
+          }
+          
           if (SecurityUtil.isWebmaster(role) && 
ModuleUtil.checkFeature(FEATURE_WORKFLOW)) {
              element.addOption(renderer.createTreeOption("publish.png", 
"site.page.publish",
                    "../workflow/publish.jsp?number=" + id));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs