Author: kevinshen Date: 2010-03-16 04:11:32 +0100 (Tue, 16 Mar 2010) New Revision: 41388
Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp Log: CMSC-1639 Newsletter: add more features about bounce information Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java 2010-03-16 03:11:32 UTC (rev 41388) @@ -27,6 +27,10 @@ pageSize = Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page")); } + String from = request.getParameter("from"); + if(from != null) { + request.getSession().setAttribute("bounce_page_from",from); + } String[] check_items = request.getParameterValues("chk_items"); if(check_items != null && check_items.length > 0) { Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newsletterbouncelist.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -12,18 +12,27 @@ </cmscedit:head> <body> <mm:cloud jspvar="cloud" rank="basic user" loginpage="../../login.jsp"> - -<div class="tabs"> -<a href="#"> - <div class="tab_active"> - <div class="body"> - <div class="title"> - <fmt:message key="newsletter.bounce.title" /> - </div> - </div> - </div> - </a> -</div> + <edit:ui-tabs> + <c:if test="${not empty sessionScope.bounce_page_from && sessionScope.bounce_page_from != 'mainboard'}"> + <edit:ui-tab key="newsletter.publication.tabs.edit" > + ../NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId} + </edit:ui-tab> + <edit:ui-tab key="newsletter.publication.tabs.statistics" > + ../NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId} + </edit:ui-tab> + <edit:ui-tab key="newsletter.publication.tabs.subscribers"> + ../NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId} + </edit:ui-tab> + </c:if> + <edit:ui-tab key="newsletter.publication.tabs.bounces" active="true"> + # + </edit:ui-tab> + <c:if test="${not empty sessionScope.bounce_page_from && sessionScope.bounce_page_from != 'mainboard'}"> + <edit:ui-tab key="newsletter.publication.tabs.terms"> + ../NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId} + </edit:ui-tab> + </c:if> + </edit:ui-tabs> <div class="editor" style="height:500px"> @@ -42,7 +51,9 @@ <br/> <div style="margin-left:10px;margin-right:50px;font-size:12px;float:left"><fmt:message key="newsletter.bounce.newsletter.title"/></div> <cmsc:select var="newsletterId" default="${newsletterId}" onchange="document.forms[0].submit();"> + <c:if test="${not empty sessionScope.bounce_page_from && sessionScope.bounce_page_from == 'mainboard'}"> <option value="all"><fmt:message key="newsletter.bounce.newsletter.all"/></option> + </c:if> <mm:listnodes type="newsletter" orderby="subject"> <mm:field name="number" id="newsletternumber" write="false" vartype="String" /> <cmsc:option value="${newsletternumber}" name="${_node.title}" /> Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_overview.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -66,7 +66,7 @@ </td> <td> <p><a href="NewsletterPublicationAction.do"><fmt:message key="index.link.alleditions"/></a></p> - <p><a href="module/NewsletterBounceAction.do?method=list"><fmt:message key="index.link.bouncedemail"/></a></p> + <p><a href="module/NewsletterBounceAction.do?method=list&from=mainboard"><fmt:message key="index.link.bouncedemail"/></a></p> </td> </tr> </table> Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -21,7 +21,7 @@ NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId} </edit:ui-tab> <edit:ui-tab key="newsletter.publication.tabs.bounces"> - module/NewsletterBounceAction.do?method=list&newsletterId=${requestScope.newsletterId} + module/NewsletterBounceAction.do?method=list&newsletterId=${requestScope.newsletterId}&from=newsletter </edit:ui-tab> <edit:ui-tab key="newsletter.publication.tabs.terms"> NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId} Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -18,6 +18,9 @@ <edit:ui-tab key="newsletter.publication.tabs.subscribers"> NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId} </edit:ui-tab> + <edit:ui-tab key="newsletter.publication.tabs.bounces"> + module/NewsletterBounceAction.do?method=list&newsletterId=${requestScope.newsletterId}&from=newsletter + </edit:ui-tab> <edit:ui-tab key="newsletter.publication.tabs.terms"> NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId} </edit:ui-tab> Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -22,6 +22,9 @@ <edit:ui-tab key="newsletter.publication.tabs.subscribers" active="true"> # </edit:ui-tab> + <edit:ui-tab key="newsletter.publication.tabs.bounces"> + module/NewsletterBounceAction.do?method=list&newsletterId=${requestScope.newsletterId}&from=newsletter + </edit:ui-tab> <edit:ui-tab key="newsletter.publication.tabs.terms"> NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId} </edit:ui-tab> Modified: CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp =================================================================== --- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp 2010-03-15 22:56:45 UTC (rev 41387) +++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp 2010-03-16 03:11:32 UTC (rev 41388) @@ -20,6 +20,9 @@ <edit:ui-tab key="newsletter.publication.tabs.subscribers"> NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId} </edit:ui-tab> + <edit:ui-tab key="newsletter.publication.tabs.bounces"> + module/NewsletterBounceAction.do?method=list&newsletterId=${requestScope.newsletterId}&from=newsletter + </edit:ui-tab> <edit:ui-tab key="newsletter.publication.tabs.terms" active="true"> # </edit:ui-tab> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs