Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv10990
Modified Files:
report_publication_edit.jsp report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
CMSC-990 make code advanced, and link new subscriber to the user mange
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-990
Index: report_publication_edit.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_publication_edit.jsp 28 Jul 2008 14:46:13 -0000 1.3
+++ report_publication_edit.jsp 1 Aug 2008 11:07:56 -0000 1.4
@@ -5,6 +5,7 @@
<html:html>
<cmscedit:head title="index.title">
<script src="../repository/search.js" type="text/javascript"></script>
+ <link href="<c:url value="/editors/css/newsletter.css"/>"
rel="stylesheet" type="text/css">
</cmscedit:head>
<body>
@@ -26,12 +27,12 @@
<div class="editor">
<div style="padding-left:10px;">
<p>
- <a
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=false&forward=newslettermanage"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='site.newsletterpublication.new.blank'/>">
+ <a class="addemail"
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=false&forward=newslettermanage"
title="<fmt:message key='site.newsletterpublication.new.blank'/>">
<fmt:message key="site.newsletterpublication.new.blank"/>
</a>
</p>
<p>
- <a
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=true&forward=newslettermanage"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='site.newsletterpublication.new.withcontent'/>">
+ <a class="addemail"
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=true&forward=newslettermanage"
title="<fmt:message key='site.newsletterpublication.new.withcontent'/>">
<fmt:message key="site.newsletterpublication.new.withcontent"/>
</a>
</p>
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_publication_subscribers.jsp 28 Jul 2008 14:46:13 -0000 1.5
+++ report_publication_subscribers.jsp 1 Aug 2008 11:07:56 -0000 1.6
@@ -6,6 +6,7 @@
<html>
<cmscedit:head title="index.title">
<script src="../repository/search.js" type="text/javascript"></script>
+ <link href="<c:url value="/editors/css/newsletter.css"/>"
rel="stylesheet" type="text/css">
</cmscedit:head>
<body>
<edit:ui-tabs>
@@ -26,12 +27,20 @@
<div class="editor">
<div style="padding-left:10px;">
<p>
- <a
href="../community/SearchConditionalUser.do?newsletterId=${requestScope.newsletterId}&method=subscribeNewsletters"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='newsletter.publication.link.newsubscriber'/>">
+ <c:url var="newsubscriberlink"
value="/editors/community/SearchConditionalUser.do">
+ <c:param name="newsletterId" value="${requestScope.newsletterId}"/>
+ <c:param name="method" value="searchCandidateSubscriber"/>
+ </c:url>
+ <a class="addemail" href="${newsubscriberlink}" title="<fmt:message
key='newsletter.publication.link.newsubscriber'/>">
<fmt:message key="newsletter.publication.link.newsubscriber"/>
</a>
</p>
<p>
- <a
href="../community/userAddInitAction.do?newsletterId=${requestScope.newsletterId}&forward=newslettersubscription"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='newsletter.publication.link.newuser'/>">
+ <c:url var="newuserlink"
value="/editors/community/userAddInitAction.do">
+ <c:param name="newsletterId" value="${requestScope.newsletterId}"/>
+ <c:param name="forward" value="newslettersubscription"/>
+ </c:url>
+ <a class="addemail" href="${newuserlink}" 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_publication_terms.jsp 28 Jul 2008 14:46:13 -0000 1.5
+++ report_publication_terms.jsp 1 Aug 2008 11:07:56 -0000 1.6
@@ -5,6 +5,7 @@
<html>
<cmscedit:head title="index.title">
<script src="../repository/search.js" type="text/javascript"></script>
+ <link href="<c:url value="/editors/css/newsletter.css"/>"
rel="stylesheet" type="text/css">
</cmscedit:head>
<body>
@@ -26,7 +27,7 @@
<div class="editor">
<div style="padding-left:10px;">
<p>
- <a
href="module/NewsletterTermAction.do?method=list&newsletterId=${requestScope.newsletterId}"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='newsletter.publication.search.linkterm'/>">
+ <a class="addemail"
href="module/NewsletterTermAction.do?method=list&newsletterId=${requestScope.newsletterId}"
title="<fmt:message key='newsletter.publication.search.linkterm'/>">
<fmt:message key="newsletter.publication.search.linkterm"/>
</a>
</p>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
