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

[kevinshen]

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

Modified Files:
      Tag: b1_5
        NewsletterPublicationTreeItemRenderer.java 
        NewsletterTreeItemRenderer.java 
Log Message:
CMSC-1156   Newsletter: remove the WAP version in the Newsletter


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-1156


Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -b -r1.16.2.4 -r1.16.2.5
--- NewsletterPublicationTreeItemRenderer.java  14 Nov 2008 06:59:39 -0000      
1.16.2.4
+++ NewsletterPublicationTreeItemRenderer.java  14 Nov 2008 07:30:10 -0000      
1.16.2.5
@@ -78,15 +78,23 @@
          if (SecurityUtil.isWebmaster(role)) {
             String status = 
NewsletterPublicationUtil.getEditionStatus(Integer.valueOf(id));
             if(EditionStatus.INITIAL.value().equals(status)) {
-               element.addOption(renderer.createTreeOption("arrow_right.png", 
"site.newsletteredition.freeze", "newsletter",
+               
element.addOption(renderer.createTreeOption("status_finished.png", 
"site.newsletteredition.freeze", "newsletter",
                      "../newsletter/NewsletterEditionFreeze.do?number=" + id));
             }
             if(EditionStatus.FROZEN.value().equals(status)) {
-               element.addOption(renderer.createTreeOption("arrow_undo.png", 
"site.newsletteredition.defrost", "newsletter",
+               
element.addOption(renderer.createTreeOption("status_approved.png", 
"site.newsletteredition.defrost", "newsletter",
                   "../newsletter/NewsletterEditionDefrost.do?number=" + id));
             }
          }
       }
+      if(SecurityUtil.isWebmaster(role)){
+         String status = 
NewsletterPublicationUtil.getEditionStatus(Integer.parseInt(id));
+         if("approved".equalsIgnoreCase(status)){
+            element.addOption(renderer.createTreeOption("status_onlive.png", 
"site.newsletteredition.revokeapproval", 
"newsletter","../newsletter/NewsletterEditionRevoke.do?number=" + id));
+         }else if("frozen".equalsIgnoreCase(status)){
+            
element.addOption(renderer.createTreeOption("status_published.png", 
"site.newsletteredition.approve", 
"newsletter","../newsletter/NewsletterEditionApprove.do?number=" + id));
+         }
+      }
       element.addOption(renderer.createTreeOption("rights.png", 
"site.page.rights", "../usermanagement/pagerights.jsp?number=" + id));
 
       return element;


Index: NewsletterTreeItemRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -b -r1.19.2.3 -r1.19.2.4
--- NewsletterTreeItemRenderer.java     12 Nov 2008 13:56:18 -0000      1.19.2.3
+++ NewsletterTreeItemRenderer.java     14 Nov 2008 07:30:10 -0000      1.19.2.4
@@ -71,11 +71,11 @@
                   
String.format("../newsletter/SwitchMIMEAction.do?target=%s&number=%s", 
"text/html", id)
             )
       );
-      element.addOption(
+/*      element.addOption(
             renderer.createTreeOption("switch.png", 
"site.newsletter.switchtowap", "newsletter",
                   
String.format("../newsletter/SwitchMIMEAction.do?target=%s&number=%s", 
"application/vnd.wap.xhtml+xml", id)
             )
-      );
+      );*/
       if (ModuleUtil.checkFeature(FEATURE_WORKFLOW)) {
          element.addOption(
                renderer.createTreeOption("publish.png", 
"site.newsletter.publish", "newsletter",
@@ -127,6 +127,7 @@
                   "../newsletter/NewsletterPublicationCreate.do?parent=" + id 
+ "&copycontent=true"
             )
       );
+      
    }
 
    public boolean showChildren(Node parentNode) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs