Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv15731/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
Tag: b1_6
subscribe.jsp
Log Message:
CMSC-1349 - improve the subscribe portlet: remove unecessary functions and make
view better.
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.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- subscribe.jsp 15 Dec 2008 11:16:48 -0000 1.16
+++ subscribe.jsp 26 Mar 2009 16:37:40 -0000 1.16.2.1
@@ -5,57 +5,30 @@
<c:set var="contextPath">
<%=request.getContextPath()%>/editors/newsletter/Subscribe.do
</c:set>
-<SCRIPT LANGUAGE="JavaScript">
+<script language="javascript">
function modifyStatus(newsletterId, box) {
- new Ajax.Request(
- "${contextPath}",
+ new Ajax.Request("${contextPath}",
{
method: 'get',
parameters: {newsletterId: newsletterId,select: box.checked ,action:
'modifyStatus'}
}
);
}
+</script>
- function addOrRemoveTag(newsletterId, termId, box) {
- new Ajax.Request(
- "${contextPath}",
- {
- method: 'get',
- parameters: {newsletterId: newsletterId, termId:termId, select:
box.checked , action: 'modifyTag'}
- }
- );
- }
+<div class="content">
- function modifyFormat(newsletterId, format) {
- new Ajax.Request
- ("${contextPath}",
- {
- method: 'get',
- parameters: {newsletterId: newsletterId, format:format, action:
'modifyFormat'}
- }
- );
- }
-</SCRIPT>
-<form method="POST" name="<portlet:namespace />form_subscribe"
- action="<cmsc:actionURL/>"
- >
+<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
+
+<h3><fmt:message key="subscription.subscribe.title"/></h3>
-<div class="heading">
- <h3><fmt:message key="subscription.subscribe.title"/></h3>
-</div>
-<div class="content">
<c:choose>
<c:when test="${fn:length(subscriptionList) > 0}">
-
-<table border="1" width="600px">
+ <table>
<tr>
- <td> </td>
+ <td><fmt:message key="subscription.view.list.activated"/></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">
@@ -68,100 +41,27 @@
name="subscriptions"
id="subscription-${subscription.id}"
onclick="modifyStatus('${newsletterId}',this)"
- ${status ne 'INACTIVE' ? 'checked' : ''}
+ ${status ne 'INACTIVE' ? 'checked="checked"' : ''}
/>
</td>
<td>
${subscription.newsletter.title}
</td>
- <td>
- <%pageContext.setAttribute("terms", ((Subscription)
pageContext.findAttribute("subscription")).getTerms());%>
- <c:forEach items="${terms}" var="term">
- <label for="tag-${term.id}">${term.name}</label>
- <input type="checkbox"
- id="tag-${term.id}"
-
onclick="addOrRemoveTag('${newsletterId}','${term.id}',this)"
- ${true eq term.subscription ? 'checked' : ''}/>
+ </tr>
</c:forEach>
- </td>
- <td>
- <select onchange="modifyFormat('${newsletterId}',this.value)">
- <option name="html" value="text/html" ${subscription.mimeType
eq 'text/html' ? 'selected' : ''}>
- <fmt:message key="subscription.view.list.status.html"/>
- </option>
- <option name="text" value="text/plain" ${subscription.mimeType
eq 'text/plain' ? 'selected' : ''}>
- <fmt:message key="subscription.view.list.status.text"/>
- </option>
- </select>
- </td>
- <td>
- ${subscription.status}
- </td>
- <td>
- <c:if test="${subscription.status ne 'INACTIVE'}">
- <c:set var="terminateURL">
- <cmsc:renderURL>
- <cmsc:param name="action" value="terminate"/>
- <cmsc:param name="subscriptions"
value="${subscription.id}"/>
- </cmsc:renderURL>
- </c:set>
- <a href="${terminateURL}">
- <fmt:message
key="subscription.subscribe.operation.terminate"/>
- </a>
+ </table>
- <c:set var="pauseURL">
- <cmsc:renderURL>
- <cmsc:param name="action" value="pause"/>
- <cmsc:param name="subscriptions"
value="${subscription.id}"/>
- </cmsc:renderURL>
- </c:set>
- <c:if test="${subscription.status eq 'PAUSED'}">
- <c:set var="resumeURL">
- <cmsc:renderURL>
- <cmsc:param name="action" value="resume"/>
- <cmsc:param name="subscriptions"
value="${subscription.id}"/>
- </cmsc:renderURL>
- </c:set>
- <fmt:message key="subscription.subscribe.status.paused"/>
- <a href="${pauseURL}">
- <fmt:message
key="subscription.subscribe.status.paused.resumedate"/>:${subscription.resumeDate}
+ <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>
- <a href="${resumeURL}">
- <fmt:message
key="subscription.subscribe.operation.resume"/>
- </a>
- </c:if>
- <c:if test="${subscription.status eq 'ACTIVE'}">
- <a href="${pauseURL}">
- <fmt:message
key="subscription.subscribe.operation.pause"/>
- </a>
- </c:if>
- </c:if>
- </td>
- </tr>
- </c:forEach>
-</table>
-<br>
-<input type="hidden" name="action" id="action"/>
-<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
- <fmt:message key="subscription.subscribe.buttontext"/>
-</a>
-<a
href="javascript:document.getElementById('action').value='terminate';document.forms['<portlet:namespace
/>form_subscribe'].submit()"
- class="button">
- <fmt:message key="subscription.subscribe.operation.terminateall"/>
-</a>
-<a
href="javascript:document.getElementById('action').value='pause';document.forms['<portlet:namespace
/>form_subscribe'].submit()"
- class="button">
- <fmt:message key="subscription.subscribe.operation.pauseall"/>
-</a>
-<a
href="javascript:document.getElementById('action').value='resume';document.forms['<portlet:namespace
/>form_subscribe'].submit()"
- class="button">
- <fmt:message key="subscription.subscribe.operation.resumeall"/>
-</a>
-<br>
+ </p>
+
</c:when>
<c:otherwise>
- <fmt:message key="subscription.nonewsletter"/>
+ <p><fmt:message key="subscription.nonewsletter"/></p>
</c:otherwise>
</c:choose>
-</div>
</form>
\ No newline at end of file
+</div>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
