Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv12947/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
Tag: b1_5
subscribe.jsp
Log Message:
CMSC-1349 Newsletter: improve the subscribe portlet
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-1349
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.15.2.2
retrieving revision 1.15.2.3
diff -u -b -r1.15.2.2 -r1.15.2.3
--- subscribe.jsp 26 Mar 2009 16:37:34 -0000 1.15.2.2
+++ subscribe.jsp 27 Mar 2009 09:07:43 -0000 1.15.2.3
@@ -2,45 +2,25 @@
%><%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
-<c:set var="contextPath">
- <%=request.getContextPath()%>/editors/newsletter/Subscribe.do
-</c:set>
-<script language="javascript">
- function modifyStatus(newsletterId, box) {
- new Ajax.Request("${contextPath}",
- {
- method: 'get',
- parameters: {newsletterId: newsletterId,select: box.checked ,action:
'modifyStatus'}
- }
- );
- }
-</script>
-
<div class="content">
-
<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
-
<h3><fmt:message key="subscription.subscribe.title"/></h3>
-
<c:choose>
<c:when test="${fn:length(subscriptionList) > 0}">
-
<table>
<tr>
<td><fmt:message key="subscription.view.list.activated"/></td>
<td><fmt:message key="subscription.view.list.title"/></td>
</tr>
-
<c:forEach items="${subscriptionList}" var="subscription">
<tr>
<td>
<c:set var="newsletterId"
value="${subscription.newsletter.id}"/>
<c:set var="status" value="${subscription.status}"/>
<input type="checkbox"
- value="${subscription.id}"
+ value="${newsletterId}"
name="subscriptions"
id="subscription-${subscription.id}"
- onclick="modifyStatus('${newsletterId}',this)"
${status ne 'INACTIVE' ? 'checked="checked"' : ''}
/>
</td>
@@ -52,7 +32,6 @@
</table>
<p>
- <input type="hidden" name="action" id="action"/>
<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
<fmt:message key="subscription.subscribe.save"/>
</a>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
