Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
In directory
james.mmbase.org:/tmp/cvs-serv24231/portlets-newsletter/src/webapp/WEB-INF/templates/view/newsletter/subscription
Modified Files:
Tag: b1_5
subscribe.jsp pauseform.jsp change.jsp confirmResume.jsp
confirmTerminate.jsp introduction.jsp
Removed Files:
Tag: b1_5
info.jsp
Log Message:
CMSC-1153 - Newsletter: Cleanup unneeded code and replaced it by good imports.
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-1153
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
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- subscribe.jsp 15 May 2008 09:15:45 -0000 1.15
+++ subscribe.jsp 15 Dec 2008 11:16:39 -0000 1.15.2.1
@@ -1,11 +1,5 @@
-<%@ page import="com.finalist.newsletter.domain.Subscription" %>
-<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-
-<%@ 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://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
-<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
-<%...@elvariable id="subscriptionList" type="java.util.List"--%>
+<%@ page import="com.finalist.newsletter.domain.Subscription"
+%><%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
<c:set var="contextPath">
@@ -171,6 +165,3 @@
</c:choose>
</div>
</form>
-
-
-
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
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- pauseform.jsp 3 May 2008 14:38:57 -0000 1.1
+++ pauseform.jsp 15 Dec 2008 11:16:39 -0000 1.1.2.1
@@ -1,9 +1,5 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-<%@ 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:actionURL><cmsc:param name="action"
value="pause"/></cmsc:actionURL>"
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
retrieving revision 1.7.4.1
diff -u -b -r1.7 -r1.7.4.1
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
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- confirmResume.jsp 3 May 2008 14:38:57 -0000 1.1
+++ confirmResume.jsp 15 Dec 2008 11:16:40 -0000 1.1.2.1
@@ -1,9 +1,5 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-<%@ 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:actionURL/>">
<div class="content">
@@ -23,13 +19,10 @@
<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
<fmt:message key="subscription.subscribe.operation.resume"/>
</a>
- </div>
</c:when>
<c:otherwise>
<fmt:message key="subscription.subscribe.status.nopausedsubscription"/>
</c:otherwise>
</c:choose>
+ </div>
</form>
-
-
-
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
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- confirmTerminate.jsp 15 May 2008 06:33:48 -0000 1.2
+++ confirmTerminate.jsp 15 Dec 2008 11:16:40 -0000 1.2.2.1
@@ -1,9 +1,5 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
-<%@ 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:actionURL/>">
<div class="content">
@@ -23,13 +19,10 @@
<a href="javascript:document.forms['<portlet:namespace
/>form_subscribe'].submit()" class="button">
<fmt:message key="subscription.subscribe.operation.terminate"/>
</a>
- </div>
</c:when>
<c:otherwise>
<fmt:message key="subscription.subscribe.status.nosubscription"/>
</c:otherwise>
</c:choose>
+ </div>
</form>
-
-
-
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
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- introduction.jsp 1 Aug 2008 07:21:42 -0000 1.4
+++ introduction.jsp 15 Dec 2008 11:16:40 -0000 1.4.2.1
@@ -1,8 +1,4 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<%@ 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" %>
+<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
