[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree NewsletterTreeItemRenderer.java NewsletterPublicationTreeItemRenderer.java

[jstroomer]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory 
james.mmbase.org:/tmp/cvs-serv4460/portlets-newsletter/src/java/com/finalist/newsletter/tree

Modified Files:
        NewsletterTreeItemRenderer.java 
        NewsletterPublicationTreeItemRenderer.java 
Log Message:
CMSC-632 Fixes to a lot of things


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-632


Index: NewsletterTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterTreeItemRenderer.java     16 Jan 2008 20:00:40 -0000      1.11
+++ NewsletterTreeItemRenderer.java     20 Jan 2008 22:48:35 -0000      1.12
@@ -19,7 +19,7 @@
    protected static final String FEATURE_WORKFLOW = "workflowitem";
 
    public void addParentOption(NavigationRenderer renderer, TreeElement 
element, String parentId) {
-      element.addOption(renderer.createTreeOption("new.png", 
"site.newsletter.new", "newsletter",
+      element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletter.new", "newsletter",
             "../newsletter/NewsletterCreate.do?parentnewsletter=" + parentId));
    }
 
@@ -36,9 +36,9 @@
       if (SecurityUtil.isEditor(role)) {
          element.addOption(renderer.createTreeOption("edit_defaults.png", 
"site.newsletter.edit", "newsletter",
                "../newsletter/NewsletterEdit.do?number=" + id));
-         element.addOption(renderer.createTreeOption("new.png", 
"site.newsletterpublication.new.blank", "newsletter",
+         element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.new.blank", "newsletter",
                "../newsletter/NewsletterPublicationCreate.do?parent=" + id + 
"&copycontent=false"));
-         element.addOption(renderer.createTreeOption("new.png", 
"site.newsletterpublication.new.withcontent", "newsletter",
+         element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.new.withcontent", "newsletter",
                "../newsletter/NewsletterPublicationCreate.do?parent=" + id + 
"&copycontent=true"));
 
          if (SecurityUtil.isWebmaster(role) || 
(model.getChildCount(parentNode) == 0 && !Publish.isPublished(parentNode))) {


Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterPublicationTreeItemRenderer.java  17 Jan 2008 21:47:15 -0000      
1.8
+++ NewsletterPublicationTreeItemRenderer.java  20 Jan 2008 22:48:35 -0000      
1.9
@@ -41,8 +41,10 @@
                   "../newsletter/NewsletterPublicationDelete.do?number=" + 
id));
             element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.publish", "newsletter",
                   "../newsletter/NewsletterPublicationPublish.do?number=" + 
id));
+            /*
             element.addOption(renderer.createTreeOption("mail.png", 
"site.newsletterpublication.test", "newsletter",
                   "../newsletter/NewsletterPublicationTest.do?number=" + id));
+            */
          }
 
          if (NavigationUtil.getChildCount(parentNode) >= 2) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs