Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment
In directory
james.mmbase.org:/tmp/cvs-serv26484/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment
Modified Files:
welcome.jsp
Log Message:
CMSC-818 improve code,implement pause all.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment
See also: http://www.mmbase.org/jira/browse/CMSC-818
Index: welcome.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/view/fragment/welcome.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- welcome.jsp 29 Apr 2008 01:37:05 -0000 1.4
+++ welcome.jsp 3 May 2008 14:40:59 -0000 1.5
@@ -1,16 +1,20 @@
<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp" %>
-<%@ page import="java.util.*"%>
-<%@ page import="com.finalist.newsletter.domain.Newsletter"%>
-<%@ page import="com.finalist.newsletter.domain.Term"%>
-<%@ page import="com.finalist.newsletter.domain.Subscription"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setBundle basename="portlets-newslettersubscription" scope="request" />
+<%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+
+<%@ page import="java.util.*" %>
+<%@ page import="com.finalist.newsletter.domain.Newsletter" %>
+<%@ page import="com.finalist.newsletter.domain.Term" %>
+<%@ page import="com.finalist.newsletter.domain.Subscription" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="portlets-newslettersubscription" scope="request"/>
<html>
<SCRIPT LANGUAGE="JavaScript">
- function addOrRemoveTag(newsletterId,tagId,box,contextPath){
+ function addOrRemoveTag(newsletterId, tagId, box, contextPath) {
alert(contextPath);
new Ajax.Request
-
(contextPath+'/editors/newsletter/services.jsp',
+ (contextPath + '/editors/newsletter/services.jsp',
{
method: 'get',
parameters: {newsletterId:
newsletterId, tagId:tagId, select: box.checked , action: 'modifyTag'}
@@ -18,10 +22,10 @@
);
}
- function modifyFormat(newsletterId,format,contextPath){
+ function modifyFormat(newsletterId, format, contextPath) {
alert(contextPath);
new Ajax.Request
-
(contextPath+'/editors/newsletter/services.jsp',
+ (contextPath + '/editors/newsletter/services.jsp',
{
method: 'get',
parameters: {newsletterId:
newsletterId, format:format, action: 'modifyFormat'}
@@ -29,24 +33,25 @@
);
}
- function modifyStatus(newsletterId,status,box,contextPath){
+ function modifyStatus(newsletterId, status, box, contextPath) {
alert(contextPath);
- if("ACTIVE"==status)
+ if ("ACTIVE" == status)
{
- if(box.checked){
- ableCheckBox('pause-'+newsletterId);
- ableCheckBox('format-'+newsletterId);
- ableCheckBox('tag-'+newsletterId);
- }else {
- disableCheckBox('pause-'+newsletterId);
- disableCheckBox('format-'+newsletterId);
- disableChecked('pause-'+newsletterId);
- disableChecked('tag-'+newsletterId);
- disableCheckBox('tag-'+newsletterId);
+ if (box.checked) {
+ ableCheckBox('pause-' + newsletterId);
+ ableCheckBox('format-' + newsletterId);
+ ableCheckBox('tag-' + newsletterId);
+ }
+ else {
+ disableCheckBox('pause-' + newsletterId);
+ disableCheckBox('format-' + newsletterId);
+ disableChecked('pause-' + newsletterId);
+ disableChecked('tag-' + newsletterId);
+ disableCheckBox('tag-' + newsletterId);
}
}
new Ajax.Request
-
(contextPath+'/editors/newsletter/services.jsp',
+ (contextPath + '/editors/newsletter/services.jsp',
{
method: 'get',
parameters: {newsletterId:
newsletterId, status:status, select: box.checked ,action: 'modifyStatus'}
@@ -55,21 +60,21 @@
}
function disableCheckBox(elementName) {
- var obj=document.getElementsByName(elementName)
- for(var i=0;i<obj.length;i++)
+ var obj = document.getElementsByName(elementName)
+ for (var i = 0; i < obj.length; i++)
{
obj[i].disabled = true;
}
}
function ableCheckBox(elementName) {
- var obj=document.getElementsByName(elementName)
- for(var i=0;i<obj.length;i++)
+ var obj = document.getElementsByName(elementName)
+ for (var i = 0; i < obj.length; i++)
obj[i].disabled = false;
}
function disableChecked(elementName) {
- var obj=document.getElementsByName(elementName)
- for(var i=0;i<obj.length;i++)
+ var obj = document.getElementsByName(elementName)
+ for (var i = 0; i < obj.length; i++)
obj[i].checked = false;
}
@@ -78,15 +83,14 @@
<table border="1">
<form action="" name="subscription">
<tr>
-<td><fmt:message key="subscription.view.list.title" /></td>
-<td><fmt:message key="subscription.view.list.tag" /></td>
-<td><fmt:message key="subscription.view.list.status" /></td>
-<td><fmt:message key="subscription.view.list.format" /></td>
+ <td><fmt:message key="subscription.view.list.title"/></td>
+ <td><fmt:message key="subscription.view.list.tag"/></td>
+ <td><fmt:message key="subscription.view.list.status"/></td>
+ <td><fmt:message key="subscription.view.list.format"/></td>
</tr>
-<% List<Subscription> list =
(List<Subscription>)request.getAttribute("subscriptionList");
+<% List<Subscription> list = (List<Subscription>)
request.getAttribute("subscriptionList");
Iterator it = list.iterator();
- for(int i=0;i<list.size();i++)
- {
+ for (int i = 0; i < list.size(); i++) {
Subscription subscription = (Subscription) it.next();
Newsletter newsletter = subscription.getNewsletter();
String title = newsletter.getTitle();
@@ -97,39 +101,41 @@
boolean isText = false;
boolean isSubscription = false;
boolean isPause = false;
- boolean disabledFormat =true;
- boolean disabledPause =true;
- boolean disabledTag =true;
+ boolean disabledFormat = true;
+ boolean disabledPause = true;
+ boolean disabledTag = true;
- if(format!=null){
- if("text".equals(format)){
+ if (format != null) {
+ if ("text".equals(format)) {
isText = true;
- }else{
+ }
+ else {
isText = false;
}
}
- if(status!=null)
- {
- if("ACTIVE".equals(status)){
+ if (status != null) {
+ if ("ACTIVE".equals(status)) {
isSubscription = true;
disabledFormat = false;
disabledPause = false;
disabledTag = false;
- }else{
+ }
+ else {
isSubscription = false;
}
- if("PAUSED".equals(status)){
+ if ("PAUSED".equals(status)) {
isSubscription = true;
isPause = true;
disabledFormat = false;
disabledPause = false;
disabledTag = false;
- }else{
+ }
+ else {
isPause = false;
}
}
- %>
- <tr>
+%>
+<tr>
<c:set var="contextPath">
<%=request.getContextPath()%><fmt:message
key="subscription.view.services.path"/>
</c:set>
@@ -159,9 +165,8 @@
</td>
<td>
<% Iterator tagit = tags.iterator();
- for(int j=0;j<tags.size();j++)
- {
- Term term = (Term)tagit.next();
+ for (int j = 0; j < tags.size(); j++) {
+ Term term = (Term) tagit.next();
String name = tag.getName();
int tagId = tag.getId();
boolean select = tag.isSubscription();
@@ -176,29 +181,37 @@
<%=select%>
</c:set>
${name}
- <input class="checkbox" type="checkbox"
value='${tagId}' name="tag-${newsletterId}" style="width: 15px;"
id="tag-${newsletterId}"
onclick="addOrRemoveTag(${newsletterId},${tagId},this,'${contextPath}')"
selected="${selected}" <c:if test="${disabledTag}">disabled</c:if>
+ <input class="checkbox" type="checkbox" value='${tagId}'
name="tag-${newsletterId}" style="width: 15px;"
+ id="tag-${newsletterId}"
onclick="addOrRemoveTag(${newsletterId},${tagId},this,'${contextPath}')"
+ selected="${selected}"
+ <c:if test="${disabledTag}">disabled</c:if>
<c:if test="${selected}">checked</c:if> />
<%}%>
</td>
<td>
- <fmt:message
key="subscription.view.list.status.subscription" />
- <input class="checkbox" type="checkbox"
value="${newsletterId}" name="subscription-${newsletterId}" style="width:
15px;" id="subscription-${newsletterId}"
onclick="modifyStatus(${newsletterId},'ACTIVE',this,'${contextPath}')"
+ <fmt:message key="subscription.view.list.status.subscription"/>
+ <input class="checkbox" type="checkbox" value="${newsletterId}"
name="subscription-${newsletterId}"
+ style="width: 15px;" id="subscription-${newsletterId}"
+
onclick="modifyStatus(${newsletterId},'ACTIVE',this,'${contextPath}')"
<c:if test="${isSubscription}">checked</c:if>/>
- <fmt:message key="subscription.view.list.status.pause"
/>
- <input class="checkbox" type="checkbox"
value="${newsletterId}" name="pause-${newsletterId}" style="width: 15px;"
id="pause-${newsletterId}"
onclick="modifyStatus(${newsletterId},'PAUSED',this,'${contextPath}')" <c:if
test="${isPause}">checked</c:if>
+ <fmt:message key="subscription.view.list.status.pause"/>
+ <input class="checkbox" type="checkbox" value="${newsletterId}"
name="pause-${newsletterId}" style="width: 15px;"
+ id="pause-${newsletterId}"
onclick="modifyStatus(${newsletterId},'PAUSED',this,'${contextPath}')"
+ <c:if test="${isPause}">checked</c:if>
<c:if test="${disabledPause}">disabled</c:if>/>
</td>
<td>
- <select name="format-${newsletterId}"
onchange="modifyFormat(${newsletterId},this.value,'${contextPath}')" <c:if
test="${disabledFormat}">disabled</c:if>>
+ <select name="format-${newsletterId}"
onchange="modifyFormat(${newsletterId},this.value,'${contextPath}')"
+ <c:if test="${disabledFormat}">disabled</c:if>>
<option name="html" value="html" <c:if
test="${!isText}">selected</c:if>>
- <fmt:message key="subscription.view.list.status.html"
/>
+ <fmt:message key="subscription.view.list.status.html"/>
</option>
<option name="text" value="text" <c:if
test="${isText}">selected</c:if>>
- <fmt:message key="subscription.view.list.status.text"
/>
+ <fmt:message key="subscription.view.list.status.text"/>
</option>
</select>
</td>
- </tr>
+</tr>
<%}%>
</form>
</table>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
