Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory 
james.mmbase.org:/tmp/cvs-serv23447/src/webapp/editors/newsletter/module

Modified Files:
        report_newsletter_overview_list.jsp report_overview.jsp 
        report_publication_search.jsp report_publication_statistic.jsp 
        report_publication_subscribers.jsp 
        report_publication_terms.jsp report_subscriber_list.jsp 
        report_subscriber_subscriptions.jsp 
Added Files:
        report_publication_edit.jsp report_term_list.jsp 
Removed Files:
        report_publication_overview.jsp 
Log Message:
cmsc-979,990 newsletter mangement (block by cmsc-217)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module


report_publication_edit.jsp is new



report_term_list.jsp is new



Index: report_newsletter_overview_list.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_newsletter_overview_list.jsp 8 Jul 2008 17:15:18 -0000       1.2
+++ report_newsletter_overview_list.jsp 24 Jul 2008 09:04:16 -0000      1.3
@@ -1,6 +1,5 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
 <form method="post" name="operationform" action="SubscriptionManagement.do">
    <input type="hidden" name="action" id="action"/>
    <input type="hidden" name="type" id="action" value="newsletter"/>
@@ -17,8 +16,8 @@
                   <tr <mm:even inverse="true">class="swap"</mm:even>>
                      <td>
                         <input type="checkbox" name="ids" 
value="${result.id}"/>
-                        <a 
href="NewsletterEdit.do?number=${result.id}&amp;forward=manage"><img 
src="../gfx/icons/edit_defaults.png" align="top"/></a>
-                        <a 
href="NewsletterDelete.do?number=${result.id}&amp;remove='true'&amp;forward='manage'"><img
 src="../gfx/icons/delete.png" align="top" alt=""/></a>
+                        <a 
href="NewsletterEdit.do?number=${result.id}&amp;forward=manage"><img 
src="../gfx/icons/edit_defaults.png" align="top" title="<fmt:message 
key='site.newsletter.edit'/>"/></a>
+                        <a 
href="NewsletterDelete.do?number=${result.id}&amp;remove='true'&amp;forward='manage'"><img
 src="../gfx/icons/delete.png" align="top" title="<fmt:message 
key='site.newsletter.remove'/>"/></a>
                      </td>
                      <td>
                         <a 
href="NewsletterPublicationManagement.do?newsletterId=${result.id}">


Index: report_overview.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_overview.jsp 8 Jul 2008 17:15:18 -0000       1.8
+++ report_overview.jsp 24 Jul 2008 09:04:16 -0000      1.9
@@ -83,7 +83,7 @@
 <div class="editor">
    <div class="body"> 
       <table>
-         <tr><td><fmt:message key="index.link.manageterm"/></td></tr>
+         <tr><td><a href="module/newslettertermlist.jsp"><fmt:message 
key="index.link.manageterm"/></a></td></tr>
          <tr><td><a 
href="SubscriptionImportExportAction.do?action=export"><fmt:message 
key="index.link.exportall"/></a></td></tr>
          <tr><td><a 
href="SubscriptionManagement.do?action=showImportPage"><fmt:message 
key="index.link.import"/></a></td></tr>
          <tr><td><a href="ShowNewsletters.do?action=show"><fmt:message 
key="index.link.newsletterstatistic"/></a></td></tr>


Index: report_publication_search.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_search.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- report_publication_search.jsp       7 Jul 2008 04:03:43 -0000       1.1
+++ report_publication_search.jsp       24 Jul 2008 09:04:16 -0000      1.2
@@ -1,5 +1,6 @@
-<input type="hidden" name="method" value="searchPublication"/>
 <input type="hidden" name="newsletterId" value="${requestScope.newsletterId}"/>
+<input type="hidden" name="order" value="${requestScope.order}"/>
+<input type="hidden" name="direction" value="${requestScope.direction}"/>
 <input type="hidden" name="offset" value="0"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
    <tr>


Index: report_publication_statistic.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_statistic.jsp    7 Jul 2008 06:56:07 -0000       1.2
+++ report_publication_statistic.jsp    24 Jul 2008 09:04:16 -0000      1.3
@@ -1,14 +1,16 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-
-<cmscedit:head title="reactions.title">
-</cmscedit:head>
-<script src="../repository/search.js" type="text/javascript"></script>
-<div class="tabs">
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<mm:content type="text/html" encoding="UTF-8" expires="0">
+<html:html>
+   <cmscedit:head title="index.title">
+      <script src="../repository/search.js" type="text/javascript"></script>
+   </cmscedit:head>
+   <body>
+   <div class="tabs">
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&searchForwardType=edit">
+               <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.edit"/>
             </a>
          </div>
@@ -35,62 +37,87 @@
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&method=termList">
+               <a 
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.terms"/>
             </a>
          </div>
       </div>
    </div>
-</div>
+   </div>
 
-<div class="editor">
+   <div class="editor">
    <br/>
    <div style="padding-left:10px;">
-   <html:html>
-      <html:form 
action="editors/newsletter/NewsletterPublicationManagement.do">
-         <input type="hidden" name="searchForwardType" value="edit"/>
+         <html:form 
action="editors/newsletter/NewsletterPublicationStatisticSearch.do">
+            <input type="hidden" name="method" 
value="searchPublicationStatistic"/>
          <[EMAIL PROTECTED] file="report_publication_search.jsp"%>
       </html:form>
-      </html:html>
    </div>
-</div>
+   </div>
 
-<div class="editor">
+   <div class="editor">
    <div class="ruler_green"><div>&nbsp;<fmt:message 
key="newsletter.publication.result"/>&nbsp;</div></div>
    <div class="body">
       <mm:import externid="results" jspvar="nodeList" vartype="List" />
-      <mm:import externid="resultCount" jspvar="resultCount" 
vartype="Integer">5</mm:import>
+         <mm:import externid="resultCount" jspvar="resultCount" 
vartype="Integer"/>
       <mm:import externid="offset" jspvar="offset" vartype="Integer"/>
       <c:if test="${resultCount > 0}">
          <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
          <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <thead>
                <th width="5%">&nbsp;</th>
-               <th width="15%"><fmt:message 
key="newsletter.publication.result.publication"/></th>
-               <th width="15%"><fmt:message 
key="newsletter.publication.result.sentat"/></th>
-               <th width="15%"><fmt:message 
key="newsletter.publication.result.subscriptions"/></th>
-               <th width="15%"><fmt:message 
key="newsletter.publication.result.sentsuccess"/></th>
-               <th width="35%"><fmt:message 
key="newsletter.publication.result.bounced"/></th>
+                  <th width="15%">
+                     <a href="javascript:orderBy('title');" >
+                        <fmt:message 
key="newsletter.publication.result.publication"/>
+                     </a>
+                  </th>
+                  <th width="15%">
+                     <a href="javascript:orderBy('publishdate');" >
+                     <fmt:message key="newsletter.publication.result.sentat"/>
+                     </a>
+                  </th>
+                  <th width="15%">
+                     <a href="javascript:orderBy('subscriptions');" >
+                        <fmt:message 
key="newsletter.publication.result.subscriptions"/>
+                     </a>
+                  </th>
+                  <th width="15%">
+                     <fmt:message 
key="newsletter.publication.result.sentsuccess"/>
+                  </th>
+                  <th width="35%">
+                     <a href="javascript:orderBy('bounced');" >
+                        <fmt:message 
key="newsletter.publication.result.bounced"/>
+                     </a>
+                  </th>
             </thead>
             <c:forEach items="${results}" var="result">
                <tr>
                   <td width="5%">
-                     <a href="#"><img src="<cmsc:staticurl 
page='/editors/gfx/icons/delete.png'/>" width="16" height="16"></a>
+                        <a 
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics">
+                           <img src="<cmsc:staticurl 
page='/editors/gfx/icons/delete.png'/>" width="16" height="16" 
title="<fmt:message key='site.newsletterpublication.remove'/>"/>
+                        </a>
                   </td>
-                  <td width="15%" >${result.title}</td>
-                  <td width="15%" >${result.sentTime}</td>
-                  <td width="15%" >${result.subscriptionCount}</td>
-                  <td width="15%" >${result.sendsuccessCount}</td>
+                     <td width="15%" >
+                        <a 
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics"
 title="<fmt:message key='site.newsletterpublication.edit'/>">
+                           ${result.title}
+                        </a>
+                     </td>
+                     <td width="15%" >${result.sendtime}</td>
+                     <td width="15%" >${result.subscriptions}</td>
+                     <td width="15%" >${result.sendsuccessful}</td>
                   <td width="35%">${result.bounced}</td>
                </tr>
             </c:forEach>
          </table>
       </c:if>
-      <c:if test="${resultCount == 0 && param.title != null}">
+         <c:if test="${resultCount == 0}">
          <fmt:message key="newsletter.publication.noresult"/>
       </c:if>
       <c:if test="${resultCount > 0}">
          <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
       </c:if>
    </div>
-</div>
\ No newline at end of file
+   </div>
+   </body>
+</html:html>
+</mm:content>


Index: report_publication_subscribers.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_subscribers.jsp  7 Jul 2008 06:56:07 -0000       1.2
+++ report_publication_subscribers.jsp  24 Jul 2008 09:04:16 -0000      1.3
@@ -1,14 +1,16 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-
-<cmscedit:head title="reactions.title">
-</cmscedit:head>
-<script src="../repository/search.js" type="text/javascript"></script>
-<div class="tabs">
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<mm:content type="text/html" encoding="UTF-8" expires="0">
+<html>
+   <cmscedit:head title="index.title">
+      <script src="../repository/search.js" type="text/javascript"></script>
+   </cmscedit:head>
+   <body>
+   <div class="tabs">
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&searchForwardType=edit">
+               <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.edit"/>
             </a>
          </div>
@@ -17,7 +19,7 @@
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&searchForwardType=statistics">
+               <a 
href="NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.statistics"/>
             </a>
          </div>
@@ -35,23 +37,23 @@
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&method=termList">
+               <a 
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.terms"/>
             </a>
          </div>
       </div>
    </div>
-</div>
+   </div>
 
-<div class="editor">
+   <div class="editor">
    <div style="padding-left:10px;">
    <p>
-      <a href="#" style=" padding-left:20px; background: url(<cmsc:staticurl 
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat">
+         <a href="#" style=" padding-left:20px; background: 
url(<cmsc:staticurl page='/editors/gfx/icons/type/email_add.png'/>) left center 
no-repeat" title="<fmt:message 
key='newsletter.publication.link.newsubscriber'/>">
          <fmt:message key="newsletter.publication.link.newsubscriber"/>
       </a>
    </p>
    <p>
-      <a href="../../../community/userAddInitAction.do" style=" 
padding-left:20px; background: url(<cmsc:staticurl 
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat" 
target="_blank">
+         <a 
href="../community/userAddInitAction.do?newsletterId=${requestScope.newsletterId}&forward=newslettersubscription"
 style=" padding-left:20px; background: url(<cmsc:staticurl 
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat" 
title="<fmt:message key='newsletter.publication.link.newuser'/>">
          <fmt:message key="newsletter.publication.link.newuser"/>
       </a>
    </p>
@@ -59,7 +61,11 @@
 
    <div style="padding-left:10px;">
       <html:form 
action="editors/newsletter/NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}">
-         <input type="hidden" name="action" value="subScriberSearch"/>
+            <input type="hidden" name="method" value="subScriberSearch"/>
+            <input type="hidden" name="newsletterId" 
value="${requestScope.newsletterId}"/>
+            <input type="hidden" name="order" value="${requestScope.order}"/>
+            <input type="hidden" name="direction" 
value="${requestScope.direction}"/>
+            <input type="hidden" name="offset" value="0"/>
          <table width="50%" border="0" cellspacing="0" cellpadding="0">
             <tr>
                <td width="25%"><fmt:message 
key="newsletter.publication.result.fullname"/></td>
@@ -97,17 +103,17 @@
          <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <thead>
                   <th width="5%">&nbsp;</th>
-                  <th width="20%"><a href="#"><fmt:message 
key="newsletter.publication.result.fullname"/></a></th>
-                  <th width="20%"><a href="#"><fmt:message 
key="newsletter.publication.result.username"/></a></th>
-                  <th width="20%"><a href="#"><fmt:message 
key="newsletter.publication.result.email"/></a></th>
+                     <th width="20%"><a 
href="javascript:orderBy('fullname');"><fmt:message 
key="newsletter.publication.result.fullname"/></a></th>
+                     <th width="20%"><a 
href="javascript:orderBy('username');"><fmt:message 
key="newsletter.publication.result.username"/></a></th>
+                     <th width="20%"><a 
href="javascript:orderBy('email');"><fmt:message 
key="newsletter.publication.result.email"/></a></th>
                   <th width="20%"><fmt:message 
key="newsletter.publication.result.newsletter"/></th>
                   <th width="15%"><fmt:message 
key="newsletter.publication.result.terms"/></th>
             </thead>
             <c:forEach items="${results}" var="result">
             <tr>
                   <td>
-                  <a href="#"><img src="<cmsc:staticurl 
page='/editors/gfx/icons/edit_defaults.png'/>" width="16" height="16"></a>
-                  <a href="#"><img src="<cmsc:staticurl 
page='/editors/gfx/icons/delete.png'/>" width="16" height="16"></a>
+                     <a 
href="../community/userAddInitAction.do?authid=${result.id}&newsletterId=${requestScope.newsletterId}&forward=newslettersubscribers"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16" 
height="16"  title="<fmt:message key='newsletter.icons.title.edituser'/>"/></a>
+                     <a 
href="NewsletterNewsletterSubscriberDelete.do?newsletterId=${requestScope.newsletterId}&authid=${result.id}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16" 
height="16" title="<fmt:message 
key='newsletter.icons.title.user.unsubscribe'/>"/></a>
                   </td>
                   <td>${result.fullname}</td>
                   <td>${result.username}</td>
@@ -126,4 +132,7 @@
       </c:if>
       </div>
    </div>
-</div>
\ No newline at end of file
+   </div>
+   </body>
+</html>
+</mm:content>


Index: report_publication_terms.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_terms.jsp        7 Jul 2008 06:56:07 -0000       1.2
+++ report_publication_terms.jsp        24 Jul 2008 09:04:16 -0000      1.3
@@ -1,14 +1,17 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<mm:content type="text/html" encoding="UTF-8" expires="0">
+<html>
+   <cmscedit:head title="index.title">
+      <script src="../repository/search.js" type="text/javascript"></script>
+   </cmscedit:head>
 
-<cmscedit:head title="reactions.title">
-</cmscedit:head>
-
-<div class="tabs">
+   <body>
+   <div class="tabs">
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&searchForwardType=edit">
+               <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.edit"/>
             </a>
          </div>
@@ -17,7 +20,7 @@
    <div class="tab">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&searchForwardType=statistics">
+               <a 
href="NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.statistics"/>
             </a>
          </div>
@@ -35,18 +38,18 @@
    <div class="tab_active">
       <div class="body">
          <div>
-            <a 
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}&method=termList">
+               <a 
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
                <fmt:message key="newsletter.publication.tabs.terms"/>
             </a>
          </div>
       </div>
    </div>
-</div>
+   </div>
 
-<div class="editor">
+   <div class="editor">
    <div style="padding-left:10px;">
    <p>
-      <a href="#" style=" padding-left:20px; background: url(<cmsc:staticurl 
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat">
+         <a 
href="module/NewsletterTermAction.do?method=list&newsletterId=${requestScope.newsletterId}"
 style=" padding-left:20px; background: url(<cmsc:staticurl 
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat" 
title="<fmt:message key='newsletter.publication.search.linkterm'/>">
          <fmt:message key="newsletter.publication.search.linkterm"/>
       </a>
    </p>
@@ -58,15 +61,21 @@
             <tr>
                <td><fmt:message 
key="newsletter.publication.search.link.name"/></td>
                <td><input type="text" name="name" size="30"/></td>
-               <td><input type="submit" value="Search"/></td>
+                  <td>
+                     <input type="submit" value="Search"/>
+                     <input type="hidden" name="newsletterId" 
value="${requestScope.newsletterId}"/>
+                     <input type="hidden" name="order" 
value="${requestScope.order}"/>
+                     <input type="hidden" name="direction" 
value="${requestScope.direction}"/>
+                     <input type="hidden" name="offset" value="0"/>
+                  </td>
             </tr>
          </table>
       </form>
       <br/>
    </div>
-</div>
+   </div>
 
-<div class="editor">
+   <div class="editor" style="height:455px">
    <div class="ruler_green"><div>&nbsp;<fmt:message 
key="newsletter.publication.result"/>&nbsp;</div></div>
    <div class="body">
       <mm:import externid="results" jspvar="nodeList" vartype="List" />
@@ -77,11 +86,11 @@
          <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <thead>
                <th width="5%">&nbsp;</th>
-               <th scope="95%"><fmt:message 
key="newsletter.publication.search.link.name"/></th>
+                  <th scope="95%"><a 
href="javascript:orderBy('name');"><fmt:message 
key="newsletter.publication.search.link.name"/></a></th>
             </thead>
             <c:forEach items="${results}" var="result">
             <tr>
-               <td><a href="#"><img src="<cmsc:staticurl 
page='/editors/gfx/icons/delete.png'/>" width="16" height="16"></a></td>
+                  <td><a 
href="../../editors/newsletter/NewsletterTermDelete.do?newsletterId=${requestScope.newsletterId}&termId=${result.id}"><img
 src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16" 
height="16" title="<fmt:message 
key='newsletter.icons.title.term.unlink'/>"></a></td>
                <td>${result.name}</td>
             </tr>
             </c:forEach>
@@ -94,4 +103,7 @@
          <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
       </c:if>
    </div>
-</div>
\ No newline at end of file
+   </div>
+   </body>
+</html>
+</mm:content>


Index: report_subscriber_list.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_subscriber_list.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_subscriber_list.jsp  20 May 2008 13:56:38 -0000      1.4
+++ report_subscriber_list.jsp  24 Jul 2008 09:04:16 -0000      1.5
@@ -1,10 +1,8 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-<%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" 
+%><%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" 
+%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
 <cmscedit:head title="reactions.title">
 </cmscedit:head>
 


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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_subscriber_subscriptions.jsp 15 May 2008 06:33:48 -0000      1.5
+++ report_subscriber_subscriptions.jsp 24 Jul 2008 09:04:16 -0000      1.6
@@ -1,10 +1,8 @@
-<[EMAIL PROTECTED] file="globals.jsp" %>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-<%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-
+<[EMAIL PROTECTED] file="globals.jsp" 
+%><%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" 
+%><%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" 
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" 
+%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
 <cmscedit:head title="ewsletter.subscription.manage.newsletteroverview">
 </cmscedit:head>
 
@@ -21,7 +19,7 @@
    <c:if test="${fn:length(results) gt pagesize || not empty param.title }">
    <div class="body">
       <form method="POST" name="form" action="SubscriptionManagement.do">
-         <input type="hidden" name="action" value="newsletterOverview"/>
+         <input type="hidden" name="method" value="newsletterOverview"/>
          <table border="0">
             <tr>
                <td style="width: 150px">Title</td>
@@ -46,7 +44,7 @@
                <form method="POST" name="operationform" 
action="SubscriptionManagement.do">
                   <input type="hidden" name="action" id="action"/>
                   <pg:pager maxPageItems="${pagesize}" 
url="SubscriptionManagement.do">
-                     <pg:param name="action" value="newsletterOverview"/>
+                     <pg:param name="method" value="newsletterOverview"/>
                      <pg:param name="query_parameter_title" 
value="${param.query_parameter_title}"/>
                      <table>
                         <thead>


_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to