Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv11374/portlets-newsletter/src/webapp/editors/newsletter/module
Modified Files:
Tag: b1_5
report_publication_statistic.jsp report_publication_edit.jsp
report_overview.jsp
Log Message:
CMSC-1100 - Rename a newsletter publication to newsletter edition - also made
resource bundles more similar.
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-1100
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.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- report_publication_statistic.jsp 19 Sep 2008 10:32:02 -0000 1.9
+++ report_publication_statistic.jsp 24 Oct 2008 13:53:54 -0000 1.9.2.1
@@ -40,7 +40,7 @@
<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.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'/>">
+ <a
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics"
title="<fmt:message key='site.newsletteredition.edit'/>">
${result.title}
</a>
</edit:ui-tcolumn>
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
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- report_publication_edit.jsp 8 Sep 2008 07:46:48 -0000 1.7
+++ report_publication_edit.jsp 24 Oct 2008 13:53:54 -0000 1.7.2.1
@@ -28,13 +28,13 @@
<div class="editor">
<div class="body">
<p>
- <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 class="addemail"
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=false&forward=newslettermanage"
title="<fmt:message key='site.newsletteredition.new.blank'/>">
+ <fmt:message key="site.newsletteredition.new.blank"/>
</a>
</p>
<p>
- <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 class="addemail"
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=true&forward=newslettermanage"
title="<fmt:message key='site.newsletteredition.new.withcontent'/>">
+ <fmt:message key="site.newsletteredition.new.withcontent"/>
</a>
</p>
@@ -54,7 +54,7 @@
<a
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletterpublication.remove'/>"></a>
<a
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletterpublication.edit'/>"></a>
<a
href="../newsletter/NewsletterPublicationTest.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_go.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.sendemail'/>"></a>
- <a
href="../newsletter/NewsletterPublicationPublish.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_error.png'/>"
width="16" height="16" title="<fmt:message
key='newsletter.icons.title.sendpublication'/>"></a>
+ <a
href="../newsletter/NewsletterPublicationPublish.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_error.png'/>"
width="16" height="16" title="<fmt:message
key='newsletter.icons.title.sendedition'/>"></a>
<a
href="../usermanagement/pagerights.jsp?number=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/rights.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.userright'/>"></a>
</edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="newsletter.publication.result.title"
sort="title" width="25%">
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.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- report_overview.jsp 19 Sep 2008 10:32:02 -0000 1.15
+++ report_overview.jsp 24 Oct 2008 13:53:54 -0000 1.15.2.1
@@ -42,7 +42,7 @@
</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"/>
+ <fmt:message key="index.link.title.editionstats"/>
</h1>
</td>
</tr>
@@ -64,7 +64,7 @@
<p> </p>
</td>
<td>
- <p><a href="NewsletterPublicationAction.do"><fmt:message
key="index.link.allpublication"/></a></p>
+ <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>
</td>
</tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs