[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp report_publication_subscribers.jsp report_publication_terms.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv8268
Modified Files:
Tag: b1_5
report_publication_edit.jsp report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
CMSC-1157 Community icons are not properly working
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-1157
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.7.2.7
retrieving revision 1.7.2.8
diff -u -b -r1.7.2.7 -r1.7.2.8
--- report_publication_edit.jsp 14 Nov 2008 07:30:10 - 1.7.2.7
+++ report_publication_edit.jsp 19 Nov 2008 08:06:48 - 1.7.2.8
@@ -27,16 +27,18 @@
div class=editor
div class=body
- p
- a class=addemail
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=falseforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.blank'/
+ ul class=shortcuts
+ li class=new style=text-decoration: none;
+a
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=falseforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.blank'/
fmt:message key=site.newsletteredition.new.blank/
/a
- /p
- p
+ /li
+ li class=new style=text-decoration: none;
a class=addemail
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=trueforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.withcontent'/
fmt:message key=site.newsletteredition.new.withcontent/
/a
- /p
+ /li
+ /ul
html:form
action=editors/newsletter/NewsletterPublicationManagement.do
input type=hidden name=method value=searchPublication/
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.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- report_publication_subscribers.jsp 19 Sep 2008 10:32:02 - 1.10
+++ report_publication_subscribers.jsp 19 Nov 2008 08:06:48 - 1.10.2.1
@@ -26,7 +26,8 @@
div class=editor
div class=body
- div style=padding-left:10px
+ ul class=shortcuts
+ li class=new style=text-decoration: none;
c:url var=addSuscriberUrl
value=/editors/community/SearchConditionalUser.do
c:param name=method value=searchCandidateSubscriber/
c:param name=newsletterId
value=${requestScope.newsletterId}/
@@ -37,17 +38,17 @@
c:param name=newsletterId
value=${requestScope.newsletterId}/
c:param name=path value=${forwardPath}/
/c:url
-p
- a class=addemail href=${addSuscriberUrl}
title=fmt:message key='newsletter.publication.link.newsubscriber'/
+
+ a href=${addSuscriberUrl} title=fmt:message
key='newsletter.publication.link.newsubscriber'/
fmt:message
key=newsletter.publication.link.newsubscriber/
/a
-/p
-p
- a class=addemail href=${addUserUrl} title=fmt:message
key='newsletter.publication.link.newuser'/
+ /li
+ li class=new style=text-decoration: none;
+ a href=${addUserUrl} title=fmt:message
key='newsletter.publication.link.newuser'/
fmt:message key=newsletter.publication.link.newuser/
/a
-/p
- /div
+ /li
+ ul class=shortcuts
html:form
action=editors/newsletter/NewsletterPublicationSubscriberSearch.do
input type=hidden name=method value=subScriberSearch/
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.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- report_publication_terms.jsp19 Sep 2008 10:32:02 - 1.9
+++ report_publication_terms.jsp19 Nov 2008 08:06:48 - 1.9.2.1
@@ -27,11 +27,13 @@
div class=editor
div class=body
- div style=padding-left:10px
-a class=addemail
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp report_publication_subscribers.jsp report_publication_terms.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv8349/newsletter/module
Modified Files:
report_publication_edit.jsp report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
CMSC-1157 Community icons are not properly working
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-1157
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- report_publication_edit.jsp 14 Nov 2008 07:28:38 - 1.15
+++ report_publication_edit.jsp 19 Nov 2008 08:08:16 - 1.16
@@ -27,16 +27,18 @@
div class=editor
div class=body
- p
- a class=addemail
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=falseforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.blank'/
+ ul class=shortcuts
+ li class=new style=text-decoration: none;
+a
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=falseforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.blank'/
fmt:message key=site.newsletteredition.new.blank/
/a
- /p
- p
+ /li
+ li class=new style=text-decoration: none;
a class=addemail
href=../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}copycontent=trueforward=newslettermanage
title=fmt:message key='site.newsletteredition.new.withcontent'/
fmt:message key=site.newsletteredition.new.withcontent/
/a
- /p
+ /li
+ /ul
html:form
action=editors/newsletter/NewsletterPublicationManagement.do
input type=hidden name=method value=searchPublication/
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- report_publication_subscribers.jsp 19 Sep 2008 10:32:02 - 1.10
+++ report_publication_subscribers.jsp 19 Nov 2008 08:08:16 - 1.11
@@ -26,7 +26,8 @@
div class=editor
div class=body
- div style=padding-left:10px
+ ul class=shortcuts
+ li class=new style=text-decoration: none;
c:url var=addSuscriberUrl
value=/editors/community/SearchConditionalUser.do
c:param name=method value=searchCandidateSubscriber/
c:param name=newsletterId
value=${requestScope.newsletterId}/
@@ -37,17 +38,17 @@
c:param name=newsletterId
value=${requestScope.newsletterId}/
c:param name=path value=${forwardPath}/
/c:url
-p
- a class=addemail href=${addSuscriberUrl}
title=fmt:message key='newsletter.publication.link.newsubscriber'/
+
+ a href=${addSuscriberUrl} title=fmt:message
key='newsletter.publication.link.newsubscriber'/
fmt:message
key=newsletter.publication.link.newsubscriber/
/a
-/p
-p
- a class=addemail href=${addUserUrl} title=fmt:message
key='newsletter.publication.link.newuser'/
+ /li
+ li class=new style=text-decoration: none;
+ a href=${addUserUrl} title=fmt:message
key='newsletter.publication.link.newuser'/
fmt:message key=newsletter.publication.link.newuser/
/a
-/p
- /div
+ /li
+ ul class=shortcuts
html:form
action=editors/newsletter/NewsletterPublicationSubscriberSearch.do
input type=hidden name=method value=subScriberSearch/
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- report_publication_terms.jsp19 Sep 2008 10:32:02 - 1.9
+++ report_publication_terms.jsp19 Nov 2008 08:08:16 - 1.10
@@ -27,11 +27,13 @@
div class=editor
div class=body
- div style=padding-left:10px
-a class=addemail
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp report_publication_subscribers.jsp report_publication_terms.jsp
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 - 1.3
+++ report_publication_edit.jsp 1 Aug 2008 11:07:56 - 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}copycontent=falseforward=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}copycontent=falseforward=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}copycontent=trueforward=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}copycontent=trueforward=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 - 1.5
+++ report_publication_subscribers.jsp 1 Aug 2008 11:07:56 - 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
