Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv3537/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Modified Files:
report_overview.jsp report_publication_statistic.jsp
report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
change newsletter publication could search, sort defaultly, CMSC-979 change
staticSearch with more columns. remove the unuse function
NewletterPublication,make the addUser turn to correct pages
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-979
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- report_overview.jsp 8 Sep 2008 07:46:48 -0000 1.14
+++ report_overview.jsp 19 Sep 2008 10:32:02 -0000 1.15
@@ -64,7 +64,7 @@
<p> </p>
</td>
<td>
- <p><a href="NewletterPublicationInitAction.do"><fmt:message
key="index.link.allpublication"/></a></p>
+ <p><a href="NewsletterPublicationAction.do"><fmt:message
key="index.link.allpublication"/></a></p>
<p><a
href="module/NewsletterBounceAction.do?method=list"><fmt:message
key="index.link.bouncedemail"/></a></p>
</td>
</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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_publication_statistic.jsp 8 Sep 2008 07:46:48 -0000 1.8
+++ report_publication_statistic.jsp 19 Sep 2008 10:32:02 -0000 1.9
@@ -39,11 +39,14 @@
<edit:ui-tcolumn title="" width="5%">
<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>
</edit:ui-tcolumn>
- <edit:ui-tcolumn
titlekey="newsletter.publication.result.publication" sort="title" width="15%">
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.title"
sort="title" 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>
</edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.subject"
sort="subject" width="15%">
+ ${result.subject}
+ </edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="newsletter.publication.result.sentat"
sort="publishdate" width="15%">
${result.sendtime}
</edit:ui-tcolumn>
@@ -53,7 +56,7 @@
<edit:ui-tcolumn
titlekey="newsletter.publication.result.sentsuccess" width="15%">
${result.sendsuccessful}
</edit:ui-tcolumn>
- <edit:ui-tcolumn titlekey="newsletter.publication.result.bounced"
sort="bounced" width="35%">
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.bounced"
sort="bounced" width="20%">
${result.bounced}
</edit:ui-tcolumn>
</edit:ui-table>
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- report_publication_subscribers.jsp 8 Sep 2008 07:46:48 -0000 1.9
+++ report_publication_subscribers.jsp 19 Sep 2008 10:32:02 -0000 1.10
@@ -27,21 +27,23 @@
<div class="editor">
<div class="body">
<div style="padding-left:10px">
- <c:url var="newsubscriberlink"
value="/editors/community/SearchConditionalUser.do">
- <c:param name="newsletterId"
value="${requestScope.newsletterId}"/>
+ <c:url var="addSuscriberUrl"
value="/editors/community/SearchConditionalUser.do">
<c:param name="method" value="searchCandidateSubscriber"/>
+ <c:param name="newsletterId"
value="${requestScope.newsletterId}"/>
+ <c:param name="path" value="${forwardPath}"/>
</c:url>
- <c:url var="newuserlink"
value="/editors/community/userAddInitAction.do">
+ <c:url var="addUserUrl"
value="/editors/community/userAddInitAction.do">
+ <c:param name="forward" value="newslettersubscribers"/>
<c:param name="newsletterId"
value="${requestScope.newsletterId}"/>
- <c:param name="forward" value="newslettersubscription"/>
+ <c:param name="path" value="${forwardPath}"/>
</c:url>
<p>
- <a class="addemail" href="${newsubscriberlink}"
title="<fmt:message key='newsletter.publication.link.newsubscriber'/>">
+ <a class="addemail" href="${addSuscriberUrl}"
title="<fmt:message key='newsletter.publication.link.newsubscriber'/>">
<fmt:message
key="newsletter.publication.link.newsubscriber"/>
</a>
</p>
<p>
- <a class="addemail" href="${newuserlink}"
title="<fmt:message key='newsletter.publication.link.newuser'/>">
+ <a class="addemail" href="${addUserUrl}" title="<fmt:message
key='newsletter.publication.link.newuser'/>">
<fmt:message key="newsletter.publication.link.newuser"/>
</a>
</p>
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_publication_terms.jsp 8 Sep 2008 07:46:48 -0000 1.8
+++ report_publication_terms.jsp 19 Sep 2008 10:32:02 -0000 1.9
@@ -26,10 +26,6 @@
</edit:ui-tabs>
<div class="editor">
- <div style="padding-left:10px;">
-
- </div>
-
<div class="body">
<div style="padding-left:10px">
<a class="addemail"
href="module/NewsletterTermAction.do?method=list&newsletterId=${requestScope.newsletterId}"
title="<fmt:message key='newsletter.publication.search.linkterm'/>">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
