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

Modified Files:
        report_newsletter_list.jsp report_subscriber_list.jsp 
Log Message:
CMSC-956 chang all subscriber to show correct data.


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-956


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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_newsletter_list.jsp  20 May 2008 13:56:38 -0000      1.5
+++ report_newsletter_list.jsp  5 Aug 2008 05:47:14 -0000       1.6
@@ -34,12 +34,11 @@
             </tr>
          </table>
       </form>
-
-      <div class="ruler_green">
-         <div><fmt:message key="newsletteroverview.title"/></div>
       </div>
       </c:if>
-
+</div>
+<div class="editor">
+   <div class="ruler_green"><div>&nbsp;<fmt:message 
key="newsletteroverview.title"/>&nbsp;</div></div>
       <div class="body">
          <c:choose>
             <c:when test="${fn:length(results) gt 0}">
@@ -92,7 +91,6 @@
             </c:otherwise>
          </c:choose>
       </div>
-
    </div>
 </div>
 <script>


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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_subscriber_list.jsp  24 Jul 2008 09:04:16 -0000      1.5
+++ report_subscriber_list.jsp  5 Aug 2008 05:47:14 -0000       1.6
@@ -16,7 +16,6 @@
    </div>
 </div>
 <div class="editor">
-   <c:if test="${fn:length(results) gt pagesize || not empty param.name || not 
empty param.email }">
    <div class="body">
       <form method="POST" name="form" action="SubscriptionManagement.do">
          <input type="hidden" name="action" value="listSubscribers"/>
@@ -35,17 +34,15 @@
             </tr>
             <tr>
                <td colspan="2">
-                  <input type="submit" name="submitButton"
-                         onclick="document.forms['form'].submit()" 
value="Search"/>
+                     <input type="submit" name="submitButton" 
onclick="document.forms['form'].submit()" value="<fmt:message 
key='newsletter.subscriber.search'/>"/>
                </td>
             </tr>
          </table>
       </form>
-
-      <div class="ruler_green">
-         <div>Reactions found</div>
       </div>
-      </c:if>
+      <div class="editor">
+         <div class="ruler_green"><div>&nbsp;<fmt:message 
key="newsletter.publication.result"/>&nbsp;</div></div>
+         <c:if test="${fn:length(results) gt 0}">
       <div class="body">
          <form method="POST" name="operationform" 
action="SubscriptionImportExportAction.do">
             <input type="hidden" name="action" value="export"/>
@@ -86,8 +83,11 @@
                    onclick="exportsubscription()"
                    value="<fmt:message 
key="subscriptiondetail.link.exportselect"/>"/>
          </form>
+            </c:if>
+            <c:if test="${fn:length(results) le 0}">
+               <fmt:message key="newsletter.subscriber.noresult" />
+            </c:if>
       </div>
-
    </div>
 </div>
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to