Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv27347/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
introduction.jsp
Log Message:
CMSC-703 change tag to term
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
See also: http://www.mmbase.org/jira/browse/CMSC-703
Index: introduction.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/introduction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- introduction.jsp 4 Dec 2007 22:13:23 -0000 1.1
+++ introduction.jsp 3 May 2008 15:08:45 -0000 1.2
@@ -1,13 +1,30 @@
-<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:renderURL><cmsc:param name="action"
value="subscribe"/></cmsc:renderURL>" target="_self">
-<input type="hidden" name="template"
value="newsletter/subscription/subscribe.jsp">
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<div class="heading">
- <h3><fmt:message key="subscription.introduction.title" /></h3>
-</div>
-<div class="content">
- <p><fmt:message key="subscription.introduction.info" />
-</div>
-<br>
-<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button"><img src="<cmsc:staticurl
page='/editors/gfx/icons/edit.png'/>" alt=""/> <fmt:message
key="subscription.introduction.buttontext" /></a>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
+
+<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:renderURL/>" target="_self">
+ <input name="action" value="subscribe"/>
+
+ <div class="heading">
+ <h3><fmt:message key="subscription.introduction.title"/></h3>
+ </div>
+ <div class="content">
+ <p><fmt:message key="subscription.introduction.info"/>
+ </div>
+ <br>
+ <c:choose>
+ <c:when test="${isUserLogin}">
+ <a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
+ <img src="<cmsc:staticurl page='/editors/gfx/icons/edit.png'/>"
alt=""/>
+ <fmt:message key="subscription.introduction.buttontext"/>
+ </a>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="subscription.introduction.pleaselogin"/>
+ </c:otherwise>
+ </c:choose>
</form>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
