Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv16354/src/webapp/editors/newsletter/module
Modified Files:
import.jsp report_newsletter_subscriptions.jsp
report_overview.jsp
Added Files:
report_newsletter_overview_list.jsp
report_publication_overview.jsp report_publication_search.jsp
report_publication_statistic.jsp
report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
cmsc-956 finish, change dashboard of newsleter management
cmsc-979 not finish yet. finish page design, edit part. logic of statistics
need more discuss
cmsc-990 not finish yet. finish page design. logic of subscriber need more
discuss.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
report_newsletter_overview_list.jsp is new
report_publication_overview.jsp is new
report_publication_search.jsp is new
report_publication_statistic.jsp is new
report_publication_subscribers.jsp is new
report_publication_terms.jsp is new
Index: import.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/import.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- import.jsp 10 Jun 2008 09:45:23 -0000 1.4
+++ import.jsp 7 Jul 2008 04:03:43 -0000 1.5
@@ -37,7 +37,7 @@
<input type="button" value="Import" onclick="formSubmit()"/>
</html:form>
<div style="margin:4px;color:red;">
- <html:messages id="file" message="false">
+ <html:messages id="file" message="true" bundle="newsletter">
<bean:write name="file"/><br>
</html:messages>
</div>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- report_newsletter_subscriptions.jsp 10 Jun 2008 03:46:40 -0000 1.7
+++ report_newsletter_subscriptions.jsp 7 Jul 2008 04:03:43 -0000 1.8
@@ -71,9 +71,7 @@
<pg:item>
<tr>
<td><input type="checkbox" name="ids"
value="${result.id}"/></td>
- <td>
- ${result.username}
- </td>
+ <td>${result.username}</td>
<td>${result.fullname}</td>
<td>${result.email}</td>
</tr>
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_overview.jsp 13 May 2008 07:01:28 -0000 1.5
+++ report_overview.jsp 7 Jul 2008 04:03:43 -0000 1.6
@@ -7,60 +7,79 @@
<div class="tab_active">
<div class="body">
<div>
- <a href="#"><fmt:message key="globalstats.title"/></a>
+ <a href="#"><fmt:message key="index.title"/></a>
</div>
</div>
</div>
</div>
<div class="editor">
+ <div class="ruler_green"><div> <fmt:message
key="newsletteroverview.newsletter"/> </div></div>
<div class="body">
- <table width="50%">
- <tr>
- <td><fmt:message key="globalstats.total.newsletters"/></td>
- <td>${requestScope.newslettercount}</td>
- </tr>
- <tr>
- <td><fmt:message key="globalstats.total.terms"/></td>
- <td>${requestScope.termcount}</td>
- </tr>
+ <c:choose>
+ <c:when test="${fn:length(results) gt 0}">
+ <%@ include file="report_newsletter_overview_list.jsp" %>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="error.no_items"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+</div>
+
+<div class="editor">
+ <div class="ruler_green"><div> <fmt:message
key="index.title.overview"/> </div></div>
+</div>
+<div class="editor dashboard">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0"
style="padding-left:10px; font-size:12px;">
<tr>
- <td><fmt:message key="globalstats.total.publications"/></td>
- <td>${requestScope.publicationcount}</td>
+ <td width="33%">
+ <h1 style="font-size:14px; font-weight:normal;
text-transform:uppercase; letter-spacing:2px; color:#418001;">
+ <fmt:message key="index.link.title.subscriptionstats"/>
+ </h1>
+ </td>
+ <td width="33%">
+ <h1 style="font-size:14px; font-weight:normal;
text-transform:uppercase; letter-spacing:2px; color:#418001;">
+ <fmt:message key="index.link.title.publicationstats"/>
+ </h1>
+ </td>
+ <td width="33%">
+ <h1 style="font-size:14px; font-weight:normal;
text-transform:uppercase; letter-spacing:2px; color:#418001;">
+ <fmt:message key="index.link.title.publicationstats"/>
+ </h1>
+ </td>
</tr>
<tr>
- <td><fmt:message key="globalstats.total.subscriptions"/></td>
- <td>${requestScope.subscriptioncount}</td>
- </tr>
- </table>
- <div>
+ <td>
<p>
<a href="SubscriptionManagement.do?action=newsletterOverview">
<fmt:message key="index.link.newsletteroverview"/>
</a>
</p>
-
+ </td>
+ <td>
<p>
<a href="SubscriptionManagement.do?action=listSubscribers">
- <fmt:message key="index.link.subscriptionoverview"/>
+ <fmt:message key="index.link.allsubscriber"/>
</a>
- </p>
+ </td>
+ <td>
+ <p><a href="NewletterPublicationInitAction.do"><fmt:message
key="index.link.allpublication"/></a></p>
+ <p><a href="#"><fmt:message key="index.link.bouncedemail"/></a></p>
+ </td>
+ </tr>
+</table>
- <p>
- <a href="SubscriptionImportExportAction.do?action=export">
- <fmt:message key="index.link.exportall"/>
- </a>
- </p>
+</div>
- <p>
- <a href="SubscriptionManagement.do?action=showImportPage">
- <fmt:message key="index.link.import"/>
- </a>
- </p>
- <p>
- <a href="ShowNewsletters.do?action=show">
- <fmt:message key="index.link.newsletterstatistic"/>
- </a>
- </p>
- </div>
+<div class="editor">
+ <div class="ruler_green"><div> <fmt:message
key="index.title.task"/> </div></div>
+</div>
+<div class="editor">
+ <div class="body">
+ <table>
+ <tr><td><fmt:message key="index.link.manageterm"/></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>
</div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
