Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv19500/src/webapp/editors/newsletter
Modified Files:
showNewsletters.jsp
Log Message:
CMSC-990 modify the list messages jsp.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-990
Index: showNewsletters.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/showNewsletters.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- showNewsletters.jsp 4 Jun 2008 06:13:49 -0000 1.10
+++ showNewsletters.jsp 27 Jul 2008 07:54:10 -0000 1.11
@@ -1,14 +1,20 @@
-<%@ page language="java" pageEncoding="utf-8"%>
-
-<[EMAIL PROTECTED] import="org.apache.struts.Globals"%>
-<[EMAIL PROTECTED] file="globals.jsp"%>
-
-<[EMAIL PROTECTED] uri="http://jakarta.apache.org/struts/tags-html";
prefix="html"%>
-<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
-<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
-<[EMAIL PROTECTED] uri="http://jsptags.com/tags/navigation/pager"; prefix="pg"%>
-
-<fmt:setBundle basename="newsletter" scope="request" />
+<%@ page language="java" pageEncoding="utf-8"
+%>
+<[EMAIL PROTECTED] import="org.apache.struts.Globals"
+%>
+<[EMAIL PROTECTED] file="globals.jsp"
+%>
+<[EMAIL PROTECTED] uri="http://jakarta.apache.org/struts/tags-html";
prefix="html"
+%>
+<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/core"; prefix="c"
+%>
+<[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"
+%>
+<[EMAIL PROTECTED] uri="http://jsptags.com/tags/navigation/pager"; prefix="pg"
+%>
+<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit"
+%>
+<fmt:setBundle basename="newsletter" scope="request"/>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
@@ -166,8 +172,7 @@
<fmt:message key="newsletterlog.showMessages" />
</div>
</div>
-
- <c:if test="${empty requestScope.records}">
+ <c:if test="${empty requestScope.records && not empty
requestScope.result}">
<div class="body">
<table>
<thead>
@@ -209,65 +214,33 @@
</div>
</c:if>
- <c:if test="${!empty requestScope.records}">
+ <c:if test="${not empty requestScope.records}">
<div class="body">
- <pg:pager maxPageItems="${pagesize}"
url="NewsletterStatistic.do">
- <pg:param name="action" value="search" />
- <table>
- <thead>
- <tr> </tr>
- <tr>
- <th> </th>
- <th> <fmt:message
key="newsletterlog.detail.newsletter" /> </th>
- <th> <fmt:message key="newsletterlog.detail.logdate"
/> </th>
- <th> <fmt:message key="newsletterlog.detail.removed"
/> </th>
- <th> <fmt:message key="newsletterlog.detail.subscribe"
/> </th>
- <th> <fmt:message
key="newsletterlog.detail.unsubcribe" /> </th>
- <th> <fmt:message key="newsletterlog.detail.bounces"
/> </th>
- <th> </th>
- </tr>
- </thead>
- <tbody class="hover">
- <c:set var="num" scope="page" value="0" />
- <c:forEach var="newsletterlog"
items="${requestScope.records}">
- <c:if test="${num%pagesize%2==0}">
- <pg:item>
- <tr class="swap">
- <td> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.name}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.showingdate}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.removed}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.subscribe}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.unsubscribe}" /> </td>
- <td onMouseDown="objClick(this);"
style="white-space: nowrap;">
- <c:out value="${newsletterlog.bounches}" />
- </td>
- <td> </td>
- </tr>
- </pg:item>
- </c:if>
- <c:if test="${num%pagesize%2==1}">
- <pg:item>
- <tr>
- <td> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.name}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.showingdate}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.removed}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.subscribe}" /> </td>
- <td onMouseDown="objClick(this);"> <c:out
value="${newsletterlog.unsubscribe}" /> </td>
- <td onMouseDown="objClick(this);"
style="white-space: nowrap;">
- <c:out value="${newsletterlog.bounches}" />
- </td>
- <td> </td>
- </tr>
- </pg:item>
+ <edit:ui-table items="${requestScope.records}"
var="newsletterlog" size="${totalCount}"
requestURI="/editors/newsletter/NewsletterStatistic.do">
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.newsletter">
+ ${newsletterlog.name}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.logdate">
+ ${newsletterlog.showingdate}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.removed">
+ ${newsletterlog.removed}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.subscribe">
+ ${newsletterlog.subscribe}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.unsubcribe">
+ ${newsletterlog.unsubscribe}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletterlog.detail.bounces">
+ ${newsletterlog.bounches}
+ </edit:ui-tcolumn>
+ </edit:ui-table>
+ </div>
</c:if>
- <c:set var="num" scope="page" value="${num+1}" />
- </c:forEach>
- </tbody>
- </table>
- <%@ include file="module/pager_index.jsp"%>
- </pg:pager>
+ <c:if test="${empty requestScope.records && empty
requestScope.result}">
+ <div class="body">
+ <fmt:message key="newsletterlog.noResults" />
</div>
</c:if>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
