Author: kevinshen
Date: 2010-02-04 07:25:44 +0100 (Thu, 04 Feb 2010)
New Revision: 40854
Added:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1631 Newsletter: add 'newsletter details' link to newsletter context menu
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -294,4 +294,6 @@
newsletter.edition.errors = the {0} have not been published yet, if you want
to Freeze it, you should publish it first!
newsletter.edition.auto = the edition have been published by system, it will
be frozen later!
newsletter.edition.fail = freeze failed, please check the edition in work-flow!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -294,4 +294,6 @@
newsletter.edition.errors = de {0} zijn nog niet gepubliceerd. Als u ze wilt
bevriezen, moeten ze eerst gepubliceerd worden!
newsletter.edition.auto = de editie is gepubliceerd, straks wordt het bevroren!
newsletter.edition.fail = bevriezing is gemislukt, aub controleer of de editie
in de workflow staat!
-newsletter.confirm_send.ok=OK
\ No newline at end of file
+newsletter.confirm_send.ok=OK
+
+site.newsletter.detail = Newsletter details
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2010-02-04 06:25:44 UTC (rev 40854)
@@ -296,4 +296,6 @@
newsletter.edition.errors ={0} 还没有发布，请在冻结它之前发布它 !
newsletter.edition.auto = 系统已经为你发布，稍后会为您自动冻结！
newsletter.edition.fail = 冻结失败，请检查工作流！
-newsletter.confirm_send.ok=确定
\ No newline at end of file
+newsletter.confirm_send.ok=确定
+
+site.newsletter.detail = 详细信息
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java
2010-02-04 06:25:44 UTC (rev 40854)
@@ -36,7 +36,11 @@
if (SecurityUtil.isEditor(role)) {
addEditorOptions(renderer, id, element);
-
+ if (SecurityUtil.isWebmaster(role)) {
+ element.addOption(
+ renderer.createTreeOption("newsletter_detail.png",
"site.newsletter.detail","newsletter",
"../newsletter/NewsletterPublicationManagement.do?newsletterId=" + id)
+ );
+ }
if (SecurityUtil.isWebmaster(role) ||
(model.getChildCount(parentNode) == 0 && !Publish.isPublished(parentNode))) {
addWebmasterOptions(renderer, id, element);
}
Added:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
===================================================================
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/gfx/icons/newsletter_detail.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-04 06:19:52 UTC (rev 40853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2010-02-04 06:25:44 UTC (rev 40854)
@@ -26,30 +26,6 @@
<div class="editor">
<div class="body">
- <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}"/>
- <c:param name="path" value="${forwardPath}"/>
- </c:url>
- <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="path" value="${forwardPath}"/>
- </c:url>
-
- <a href="${addSuscriberUrl}" title="<fmt:message
key='newsletter.publication.link.newsubscriber'/>">
- <fmt:message
key="newsletter.publication.link.newsubscriber"/>
- </a>
- </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>
- </li>
- </ul>
-
<html:form
action="editors/newsletter/NewsletterPublicationSubscriberSearch.do">
<input type="hidden" name="method" value="subScriberSearch"/>
<input type="hidden" name="newsletterId"
value="${requestScope.newsletterId}"/>
@@ -84,10 +60,6 @@
<div class="ruler_green"><div> <fmt:message
key="newsletter.publication.result"/> </div></div>
<div class="body">
<edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationSubscriberSearch.do">
- <edit:ui-tcolumn title="" width="5%">
- <a
href="NewsletterSubscriberDelete.do?newsletterId=${requestScope.newsletterId}&authid=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.user.unsubscribe'/>"/></a>
- <a
href="../community/userAddInitAction.do?authid=${result.id}&newsletterId=${requestScope.newsletterId}&forward=newslettersubscribers&path=/editors/newsletter/NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.edituser'/>"/></a>
- </edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="newsletter.publication.result.fullname"
sort="fullname" width="20%">
${result.fullname}
</edit:ui-tcolumn>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
