Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv19533/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
confirmTerminate.jsp overview.jsp subscribe.jsp
introduction.jsp
Log Message:
CMSC-725 fix a bug.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: confirmTerminate.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/confirmTerminate.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- confirmTerminate.jsp 3 May 2008 14:38:57 -0000 1.1
+++ confirmTerminate.jsp 15 May 2008 06:33:48 -0000 1.2
@@ -21,7 +21,7 @@
<input type="hidden" name="confirm_unsubscribe"
value="confirm_unsubscribe"/>
<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
- <fmt:message key="subscription.subscribe.operation.pause"/>
+ <fmt:message key="subscription.subscribe.operation.terminate"/>
</a>
</div>
</c:when>
Index: overview.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/overview.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- overview.jsp 20 Jan 2008 22:48:35 -0000 1.5
+++ overview.jsp 15 May 2008 06:33:48 -0000 1.6
@@ -9,7 +9,7 @@
<h3><fmt:message key="subscription.overview.title" /></h3>
</div>
<div class="content">
- <p><fmt:message key="subscription.overview.info" />
+ <p><fmt:message key="subscription.subscribe.info" />
</div>
<br>
<a href="javascript:document.forms['<portlet:namespace
/>form_change'].submit()" class="button"><img src="<cmsc:staticurl
page='/editors/gfx/icons/edit.png'/>" alt=""/> <fmt:message
key="subscription.overview.buttontext" /></a>
Index: subscribe.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/subscribe.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- subscribe.jsp 3 May 2008 14:40:59 -0000 1.11
+++ subscribe.jsp 15 May 2008 06:33:48 -0000 1.12
@@ -51,14 +51,14 @@
<h3><fmt:message key="subscription.subscribe.title"/></h3>
</div>
<div class="content">
-<p><fmt:message key="subscription.subscribe.info"/></p><br>
<table border="1" width="600px">
<tr>
- <td><fmt:message key="subscription.view.list.title"/></td>
<td> </td>
- <td><fmt:message key="subscription.view.list.tag"/></td>
- <td><fmt:message key="subscription.view.list.status"/></td>
+ <td><fmt:message key="subscription.view.list.title"/></td>
+ <td><fmt:message key="subscription.view.list.term"/></td>
<td><fmt:message key="subscription.view.list.format"/></td>
+ <td><fmt:message key="subscription.view.list.status"/></td>
+ <td width="100px"> </td>
</tr>
<c:forEach items="${subscriptionList}" var="subscription">
<tr>
@@ -97,6 +97,9 @@
</select>
</td>
<td>
+ ${subscription.status}
+ </td>
+ <td>
<c:if test="${subscription.status ne 'INACTIVE'}">
<c:set var="terminateURL">
<cmsc:renderURL>
Index: introduction.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/introduction.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- introduction.jsp 3 May 2008 15:08:45 -0000 1.2
+++ introduction.jsp 15 May 2008 06:33:48 -0000 1.3
@@ -15,16 +15,16 @@
<div class="content">
<p><fmt:message key="subscription.introduction.info"/>
</div>
- <br>
<c:choose>
<c:when test="${isUserLogin}">
+ <p><fmt:message key="subscription.subscribe.info"/></p>
<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
<img src="<cmsc:staticurl page='/editors/gfx/icons/edit.png'/>"
alt=""/>
<fmt:message key="subscription.introduction.buttontext"/>
</a>
</c:when>
<c:otherwise>
- <fmt:message key="subscription.introduction.pleaselogin"/>
+ <fmt:message key="subscription.login.info"/>
</c:otherwise>
</c:choose>
</form>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
