Author: kevinshen
Date: 2009-05-12 10:44:22 +0200 (Tue, 12 May 2009)
New Revision: 35073
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/webapp/editors/newsletter/sendresults.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/testinputform.jsp
Log:
CMSC-1396 Newsletter - improve send testmail function
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2009-05-12 08:44:06 UTC (rev 35072)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties
2009-05-12 08:44:22 UTC (rev 35073)
@@ -293,4 +293,5 @@
newsletter.edition.confirmation.defrost = defrost
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!
\ No newline at end of file
+newsletter.edition.fail = freeze failed, please check the edition in work-flow!
+newsletter.confirm_send.ok=OK
\ 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
2009-05-12 08:44:06 UTC (rev 35072)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2009-05-12 08:44:22 UTC (rev 35073)
@@ -293,4 +293,5 @@
newsletter.edition.confirmation.defrost = Ontdooien
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!
\ No newline at end of file
+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
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2009-05-12 08:44:06 UTC (rev 35072)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties
2009-05-12 08:44:22 UTC (rev 35073)
@@ -295,4 +295,5 @@
newsletter.edition.confirmation.defrost = 解冻
newsletter.edition.errors ={0} 还没有发布，请在冻结它之前发布它 !
newsletter.edition.auto = 系统已经为你发布，稍后会为您自动冻结！
-newsletter.edition.fail = 冻结失败，请检查工作流！
\ No newline at end of file
+newsletter.edition.fail = 冻结失败，请检查工作流！
+newsletter.confirm_send.ok=确定
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/sendresults.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/sendresults.jsp
2009-05-12 08:44:06 UTC (rev 35072)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/sendresults.jsp
2009-05-12 08:44:22 UTC (rev 35073)
@@ -2,8 +2,9 @@
<%...@include file="../globals.jsp" %>
<fmt:setBundle basename="newsletter" scope="request" />
-
<mm:content type="text/html" encoding="UTF-8" expires="0">
+<mm:import externid="number" required="true" from="parameters"/>
+<c:url var="actionUrl"
value="/editors/site/refreshpagesandshow.jsp?showpage=${number}"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
<cmscedit:head title="sendsuccess.title">
@@ -11,7 +12,7 @@
input { width: 100px;}
</style>
</cmscedit:head>
-<mm:import externid="number" required="true" from="parameters"/>
+
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<body>
<cmscedit:sideblock title="sendsuccess.title" titleClass="side_block_green">
@@ -36,6 +37,7 @@
<c:otherwise>
<p> <fmt:message key="sendsuccess.test.subtitle" />
</p>
+ <p><input type="button"
onclick="document.location='${actionUrl}'" value='<fmt:message
key="newsletter.confirm_send.ok"/>'/></p>
</c:otherwise>
</c:choose>
</c:if>
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/testinputform.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/testinputform.jsp
2009-05-12 08:44:06 UTC (rev 35072)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/testinputform.jsp
2009-05-12 08:44:22 UTC (rev 35073)
@@ -51,21 +51,23 @@
<mm:import externid="newsletterId"/>
<input type="hidden" name="forward" value="${forward}"/>
<input type="hidden" name="newsletterId" value="${newsletterId}"/>
+ <input type="hidden" id="mimetype" name="mimetype" value="text/html"/>
<table>
<tr>
<td><fmt:message key="testinput.email"/></td>
<td><input type="text" name="email" id="email"
style="width:170px"/></td>
</tr>
+ <!--
<tr>
<td><fmt:message key="testinput.mimetype"/></td>
-
<td>
<select name="mimetype" id="mimetype">
<option value="text/html">text/html</option>
<option value="text/plain">text/plain</option>
- </select>
+ </select>
</td>
</tr>
+ -->
</table>
<br/>
<input type="button" onclick="sendEmail()" value='<fmt:message
key="testinput.send"/>'/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
