Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv9500/webapp/editors/newsletter
Modified Files:
Tag: b1_5
edition_confirm.jsp edition_results.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
See also: http://www.mmbase.org/jira/browse/CMSC-1146
Index: edition_confirm.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/edition_confirm.jsp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- edition_confirm.jsp 14 Nov 2008 06:59:39 -0000 1.1.2.3
+++ edition_confirm.jsp 14 Nov 2008 07:09:21 -0000 1.1.2.4
@@ -20,19 +20,21 @@
<p>
<fmt:message key="confirm_send.subtitle" /> <mm:node
referid="number"><b><mm:field name="title"/></b></mm:node>
</p>
- <p>
- <c:if test="${action =='approve'}">
+ <p style="margin-left:10px">
+ <c:choose>
+ <c:when test="${action =='approve'}">
<c:set var="action"><fmt:message
key="newsletter.edition.confirmation.approve" /></c:set>
- </c:if>
- <c:if test="${action =='revoke approving'}">
+ </c:when>
+ <c:when test="${action =='revoke approving'}">
<c:set var="action"><fmt:message
key="newsletter.edition.confirmation.revoke" /></c:set>
- </c:if>
- <c:if test="${action =='freeze'}">
+ </c:when>
+ <c:when test="${action =='freeze'}">
<c:set var="action"><fmt:message
key="newsletter.edition.confirmation.freeze" /></c:set>
- </c:if>
- <c:if test="${action =='defrost'}">
+ </c:when>
+ <c:when test="${action =='defrost'}">
<c:set var="action"><fmt:message
key="newsletter.edition.confirmation.defrost" /></c:set>
- </c:if>
+ </c:when>
+ </c:choose>
<fmt:message key="newsletter.edition.confirmation" >
<fmt:param value="${action}"/>
</fmt:message>
Index: edition_results.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/edition_results.jsp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- edition_results.jsp 14 Nov 2008 01:45:06 -0000 1.1.2.3
+++ edition_results.jsp 14 Nov 2008 07:09:21 -0000 1.1.2.4
@@ -18,6 +18,20 @@
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<body>
<cmscedit:sideblock title="selector.newsletterpublications"
titleClass="side_block_green">
+ <c:choose>
+ <c:when test="${action =='approve'}">
+ <c:set var="action"><fmt:message
key="site.newsletteredition.approve" /></c:set>
+ </c:when>
+ <c:when test="${action =='revoke approving'}">
+ <c:set var="action"><fmt:message
key="site.newsletteredition.revokeapproval" /></c:set>
+ </c:when>
+ <c:when test="${action =='freeze'}">
+ <c:set var="action"><fmt:message
key="site.newsletteredition.freeze" /></c:set>
+ </c:when>
+ <c:when test="${action =='defrost'}">
+ <c:set var="action"><fmt:message
key="site.newsletteredition.defrost" /></c:set>
+ </c:when>
+ </c:choose>
<p style="margin-left:10px">
<fmt:message key="newsletter.edition.success" >
<fmt:param value="${action}"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
