Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv19533/portlets-newsletter/src/webapp/editors/newsletter/module
Modified Files:
report_newsletter_subscriptions.jsp
report_subscriber_subscriptions.jsp report_newsletter_list.jsp
Added Files:
confirm_unsubscribe.jsp
Log Message:
CMSC-725 fix a bug.
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-725
confirm_unsubscribe.jsp is new
Index: report_newsletter_subscriptions.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_subscriptions.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_newsletter_subscriptions.jsp 7 May 2008 02:54:39 -0000 1.4
+++ report_newsletter_subscriptions.jsp 15 May 2008 06:33:48 -0000 1.5
@@ -108,7 +108,7 @@
document.forms['operationform'].submit();
}
else {
- alert("You have to select at least one item");
+ alert(<fmt:message key="confirm_noselect"/>);
}
return false;
Index: report_subscriber_subscriptions.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_subscriber_subscriptions.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_subscriber_subscriptions.jsp 7 May 2008 02:54:39 -0000 1.4
+++ report_subscriber_subscriptions.jsp 15 May 2008 06:33:48 -0000 1.5
@@ -50,16 +50,14 @@
<pg:param name="query_parameter_title"
value="${param.query_parameter_title}"/>
<table>
<thead>
- <th></th>
<th><fmt:message
key="newsletteroverview.newsletter"/></th>
- <th><fmt:message
key="globalstats.total.publications"/></th>
+ <th><fmt:message
key="subscriptionoverview.status"/></th>
</thead>
<tbody>
<[EMAIL PROTECTED] id="results"
type="java.util.List"--%>
<c:forEach items="${results}" var="result">
<pg:item>
<tr>
- <td><input type="checkbox"
name="newsletterIds" value="${result.id}"/></td>
<td>
${result.newsletter}
</td>
Index: report_newsletter_list.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_newsletter_list.jsp 7 May 2008 02:54:39 -0000 1.3
+++ report_newsletter_list.jsp 15 May 2008 06:33:48 -0000 1.4
@@ -45,6 +45,7 @@
<c:when test="${fn:length(results) gt 0}">
<form method="POST" name="operationform"
action="SubscriptionManagement.do">
<input type="hidden" name="action" id="action"/>
+ <input type="hidden" name="type" id="action"
value="newsletter"/>
<pg:pager maxPageItems="${pagesize}"
url="SubscriptionManagement.do">
<pg:param name="action" value="newsletterOverview"/>
<pg:param name="query_parameter_title"
value="${param.query_parameter_title}"/>
@@ -78,11 +79,11 @@
<%@ include file="pager_index.jsp" %>
<br>
</pg:pager>
- <input type="submit" name="submitButton"
-
onclick="document.getElementById('action').value='exportSusbscriptions';document.forms['operationform'].submit()"
+ <input type="button" name="submitButton" class="submit"
+ onclick="exportsubscription()"
value="<fmt:message
key="subscriptiondetail.link.exportselect"/>"/>
- <input type="submit" name="submitButton"
-
onclick="document.getElementById('action').value='exportSusbscriptions';document.forms['operationform'].submit()"
+ <input type="button" name="submitButton"
+ onclick="unsubscribeAll()"
value="<fmt:message
key="globalstats.total.unsubscribeselect"/>"/>
</form>
</c:when>
@@ -94,5 +95,54 @@
</div>
</div>
+<script>
+ function exportsubscription() {
+ var subscriptions = document.getElementsByName('newsletterIds');
+ var hasSelection = false;
+ for (var i = 0; i < subscriptions.length; i ++) {
+ if (subscriptions[i].checked) {
+ hasSelection = true;
+ break;
+ }
+ }
+
+ if (hasSelection) {
+ document.forms['operationform'].action =
'SubscriptionImportExportAction.do';
+ document.getElementById('action').value = 'export';
+ document.forms['operationform'].submit();
+ }
+ else {
+ alert('<fmt:message key="confirm_noselect"/>');
+ }
+
+ return false;
+ }
+
+ function unsubscribeAll() {
+
+ var subscriptions = document.getElementsByName('newsletterIds');
+ var hasSelection = false;
+ for (var i = 0; i < subscriptions.length; i ++) {
+ if (subscriptions[i].checked) {
+ hasSelection = true;
+ break;
+ }
+ }
+
+ if (hasSelection) {
+ var confirm = window.confirm('<fmt:message
key="confirm.unsubscribe.newsletter"/>')
+ if (!confirm) {
+ return false;
+ }
+ document.getElementById('action').value = 'unsubscribe';
+ document.forms['operationform'].submit();
+ }
+ else {
+ alert('<fmt:message key="confirm_noselect"/>');
+ }
+
+ return false;
+ }
+</script>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
