Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv22814/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
Tag: b1_5
pauseform.jsp subscribe.jsp change.jsp confirmResume.jsp
overview.jsp confirmTerminate.jsp introduction.jsp
Log Message:
CMSC-1376 - Newsletter portlet and the Login portlet does not use good HTML
standards
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-1376
Index: pauseform.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/pauseform.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- pauseform.jsp 15 Dec 2008 11:16:39 -0000 1.1.2.1
+++ pauseform.jsp 8 Apr 2009 15:08:51 -0000 1.1.2.2
@@ -1,7 +1,7 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
-<form method="POST" name="<portlet:namespace />form_subscribe"
+<form method="post" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL><cmsc:param name="action"
value="pause"/></cmsc:actionURL>"
>
<div class="content">
@@ -44,6 +44,3 @@
</a>
</div>
</form>
-
-
-
Index: subscribe.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/subscribe.jsp,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -b -r1.15.2.4 -r1.15.2.5
--- subscribe.jsp 27 Mar 2009 11:56:38 -0000 1.15.2.4
+++ subscribe.jsp 8 Apr 2009 15:08:51 -0000 1.15.2.5
@@ -1,11 +1,11 @@
<%@ page import="com.finalist.newsletter.domain.Subscription"
%><%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-<div class="content">
-<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
-<h3><fmt:message key="subscription.subscribe.title"/></h3>
-<c:choose>
-<c:when test="${fn:length(subscriptionList) > 0}">
+<div class="newsletter_subscription">
+<form method="post" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
+ <h3><fmt:message key="subscription.subscribe.title"/></h3>
+ <c:choose>
+ <c:when test="${fn:length(subscriptionList) > 0}">
<table>
<tr>
<td><fmt:message key="subscription.view.list.activated"/></td>
@@ -30,16 +30,12 @@
</c:forEach>
</table>
- <p>
- <a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
- <fmt:message key="subscription.subscribe.save"/>
- </a>
- </p>
+ <input type="submit" value="<fmt:message
key="subscription.subscribe.save"/>">
-</c:when>
-<c:otherwise>
+ </c:when>
+ <c:otherwise>
<p><fmt:message key="subscription.nonewsletter"/></p>
-</c:otherwise>
-</c:choose>
-</form>
+ </c:otherwise>
+ </c:choose>
+ </form>
</div>
\ No newline at end of file
Index: change.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/change.jsp,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -b -r1.7.4.1 -r1.7.4.2
--- change.jsp 15 Dec 2008 11:16:40 -0000 1.7.4.1
+++ change.jsp 8 Apr 2009 15:08:51 -0000 1.7.4.2
@@ -3,7 +3,7 @@
<cmsc:portlet-preferences />
<mm:cloud>
- <form method="POST" name="<portlet:namespace />form_change"
action="<cmsc:actionURL><cmsc:param name="action"
value="change"/></cmsc:actionURL>" target="_parent">
+ <form method="post" name="<portlet:namespace />form_change"
action="<cmsc:actionURL><cmsc:param name="action"
value="change"/></cmsc:actionURL>" target="_parent">
<input type="hidden" name="template"
value="newsletter/change/overview.jsp">
<div class="heading">
<h3><fmt:message key="subscription.change.title" /></h3>
@@ -79,7 +79,7 @@
</div>
</form>
<br>
- <form method="POST" name="<portlet:namespace />form_terminate"
action="<cmsc:actionURL><cmsc:param name="action"
value="terminate"/></cmsc:actionURL>" target="_parent">
+ <form method="post" name="<portlet:namespace />form_terminate"
action="<cmsc:actionURL><cmsc:param name="action"
value="terminate"/></cmsc:actionURL>" target="_parent">
<input type="hidden" name="template"
value="newsletter/change/overview.jsp">
<div>
<b><fmt:message key="subscription.terminate.title"
/></b>
Index: confirmResume.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/confirmResume.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- confirmResume.jsp 15 Dec 2008 11:16:40 -0000 1.1.2.1
+++ confirmResume.jsp 8 Apr 2009 15:08:51 -0000 1.1.2.2
@@ -1,7 +1,7 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
-<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
+<form method="post" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
<div class="content">
<c:choose>
<c:when test="${fn:length(subscriptionsToBeResume) gt 0}">
Index: overview.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/overview.jsp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- overview.jsp 15 May 2008 06:33:48 -0000 1.6
+++ overview.jsp 8 Apr 2009 15:08:51 -0000 1.6.2.1
@@ -2,17 +2,18 @@
<cmsc:portlet-preferences />
-<form method="POST" name="<portlet:namespace />form_change"
action="<cmsc:renderURL><cmsc:param name="action"
value="change"/></cmsc:renderURL>" target="_self">
-<input type="hidden" name="template"
value="newsletter/subscription/change.jsp">
-
-<div class="heading">
+<div class="newsletter_subscription">
+ <form method="post" name="<portlet:namespace />form_change"
action="<cmsc:renderURL><cmsc:param name="action"
value="change"/></cmsc:renderURL>" target="_self">
+ <fieldset>
+ <input type="hidden" name="template"
value="newsletter/subscription/change.jsp">
<h3><fmt:message key="subscription.overview.title" /></h3>
+
+ <p><fmt:message key="subscription.subscribe.info" /></p>
+
+ <input type="submit" value="<fmt:message
key="subscription.overview.buttontext" />" >
+
+ </fieldset>
+ </form>
</div>
-<div class="content">
- <p><fmt:message key="subscription.subscribe.info" />
-</div>
-<br>
-<a href="javascript:document.forms['<portlet:namespace
/>form_change'].submit()" class="button"><img src="<cmsc:staticurl
page='/editors/gfx/icons/edit.png'/>" alt=""/> <fmt:message
key="subscription.overview.buttontext" /></a>
-</form>
</mm:cloud>
\ No newline at end of file
Index: confirmTerminate.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription/confirmTerminate.jsp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- confirmTerminate.jsp 15 Dec 2008 11:16:40 -0000 1.2.2.1
+++ confirmTerminate.jsp 8 Apr 2009 15:08:51 -0000 1.2.2.2
@@ -1,7 +1,7 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
-<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
+<form method="post" name="<portlet:namespace />form_subscribe"
action="<cmsc:actionURL/>">
<div class="content">
<c:choose>
<c:when test="${fn:length(subscriptionsToBeTerminate) gt 0}">
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.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- introduction.jsp 27 Mar 2009 11:56:38 -0000 1.4.2.2
+++ introduction.jsp 8 Apr 2009 15:08:51 -0000 1.4.2.3
@@ -1,24 +1,21 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-<form method="POST" name="<portlet:namespace />form_subscribe"
action="<cmsc:renderURL/>" target="_self">
- <input name="action" type="hidden" value="subscribe"/>
-
- <div class="heading">
+<div class="newsletter_introduction">
<h3><fmt:message key="subscription.introduction.title"/></h3>
- </div>
- <div class="content">
- <p><fmt:message key="subscription.introduction.info"/>
- </div>
+
+ <p><fmt:message key="subscription.introduction.info"/></p>
+
<c:choose>
<c:when test="${isUserLogin}">
+ <form method="post" name="<portlet:namespace />form_subscribe"
action="<cmsc:renderURL/>">
+ <input name="action" type="hidden" value="subscribe"/>
<p><fmt:message key="subscription.subscribe.info"/></p>
- <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>
+ <input type="submit" value="<fmt:message
key="subscription.introduction.buttontext" />" >
+ </form>
</c:when>
<c:otherwise>
- <fmt:message key="subscription.login.info"/>
+ <p><fmt:message key="subscription.login.info"/></p>
</c:otherwise>
</c:choose>
-</form>
\ No newline at end of file
+
+</div>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
