Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory 
james.mmbase.org:/tmp/cvs-serv11460/src/webapp/editors/newsletter/module

Modified Files:
      Tag: b1_5
        report_publication_edit.jsp 
Log Message:
CMSC-1146 Newsletter: add functionality to freeze and defrost a newsletter 
edition


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-1146


Index: report_publication_edit.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -b -r1.7.2.3 -r1.7.2.4
--- report_publication_edit.jsp 11 Nov 2008 09:26:46 -0000      1.7.2.3
+++ report_publication_edit.jsp 13 Nov 2008 09:37:11 -0000      1.7.2.4
@@ -55,6 +55,12 @@
                <a 
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16" 
height="16" title="<fmt:message key='site.newsletteredition.edit'/>"></a>
                <a 
href="../newsletter/NewsletterPublicationTest.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/type/email_go.png'/>" width="16" 
height="16" title="<fmt:message key='newsletter.icons.title.sendemail'/>"></a>
                <a 
href="../newsletter/NewsletterPublicationPublish.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/type/email_error.png'/>" 
width="16" height="16" title="<fmt:message 
key='newsletter.icons.title.sendedition'/>"></a>
+               <c:if test="${result.process_status == 'concept edition'}">
+                  <a   
href="../newsletter/NewsletterEditionFreeze.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/arrow_right.png'/>" width="16" 
height="16" title="<fmt:message key='newsletter.icons.title.sendedition'/>"></a>
+               </c:if>
+               <c:if test="${result.process_status == 'Frozen'}">
+                  <a 
href="../newsletter/NewsletterEditionDefrost.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/arrow_undo.png'/>" width="16" 
height="16" title="<fmt:message key='newsletter.icons.title.sendedition'/>"></a>
+               </c:if>
                <a 
href="../usermanagement/pagerights.jsp?number=${result.id}"><img 
src="<cmsc:staticurl page='/editors/gfx/icons/rights.png'/>" width="16" 
height="16" title="<fmt:message key='newsletter.icons.title.userright'/>"></a>
             </edit:ui-tcolumn>
             <edit:ui-tcolumn titlekey="newsletter.publication.result.title" 
sort="title" width="25%">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to