Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
In directory
james.mmbase.org:/tmp/cvs-serv12617/src/webapp/mmbase/edit/wizard/jsp
Modified Files:
calendar.jsp
Log Message:
CMSC-1180 Newsletter: change newsletter schedule mechanism
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
See also: http://www.mmbase.org/jira/browse/CMSC-1180
Index: calendar.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp/calendar.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- calendar.jsp 8 Jul 2008 14:41:47 -0000 1.5
+++ calendar.jsp 15 Dec 2008 05:08:38 -0000 1.6
@@ -1,20 +1,18 @@
-<%...@page language="java" contentType="text/html;charset=UTF-8"%>
-<%...@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="cmsc-calendar" scope="request" />
+<%...@page language="java" contentType="text/html;charset=UTF-8"
+%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm"
+%><%...@taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"
+%><%...@taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<fmt:setBundle basename="cmsc-calendar" scope="request"/>
<mm:content type="text/html" encoding="UTF-8" expires="0">
-<!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="calendar.head.title">
-
-
+<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
+<head>
+<title><fmt:message key="calendar.head.title"/></title>
<link href="../../../../editors/editwizards_new/style/layout/wizard.css"
type="text/css" rel="stylesheet">
<link href="../../../../editors/editwizards_new/style/color/wizard.css"
type="text/css" rel="stylesheet">
<link href="../../../../editors/editwizards_new/style/extra/wizard.css"
type="text/css" rel="stylesheet">
-<link href="../style/layout/searchlist.css" type="text/css" rel="stylesheet">
<link href="../../../../editors/editwizards_new/style/color/searchlist.css"
type="text/css" rel="stylesheet">
<link href="../../../../editors/editwizards_new/style/extra/searchlist.css"
type="text/css" rel="stylesheet">
-
<style xml:space="preserve" type="text/css">
input.calendar {
width: 22px;
@@ -27,16 +25,17 @@
border:0px;
}
</style>
-
<script src="../../../../js/prototype.js" type="text/javascript"></script>
<c:url var="actionUrl" value="/editors/newsletter/Schedule.do"/>
<c:set var="type" value="${param.type}"/>
-
<script type="text/javascript">
var type =1;
var newsletterId = "";
type = '${type}';
-
+ if(type=='0') {
+ alert('<fmt:message key="calendar.options.select"/>') ;
+ window.close();
+ }
var gotoString = '<fmt:message key="calendar.goto"/>';
var todayString = '<fmt:message key="calendar.today"/>';
var weekString = '<fmt:message key="calendar.week.short"/>';
@@ -118,8 +117,7 @@
var interval = document.getElementById("interval");
var strategy = document.getElementsByName("strategy");
for(var i = 0 ; i < strategy.length;i++) {
- if(strategy[i].checked) {
- if(strategy[i].value == '2') {
+ if(strategy[i].checked && strategy[i].value == '2') {
if(!checkNumber(interval.value)) {
alert('<fmt:message
key="calendar.validator.interval"/>');
interval.focus();
@@ -128,7 +126,6 @@
}
}
}
- }
if(type == '3'){
var interval = document.getElementById("interval");
if(!checkNumber(interval.value)) {
@@ -142,8 +139,7 @@
var interval = document.getElementById("day");
var strategy = document.getElementsByName("strategy");
for(var i = 0 ; i < strategy.length;i++) {
- if(strategy[i].checked) {
- if(strategy[i].value == '0') {
+ if(strategy[i].checked && strategy[i].value == '0') {
if(!checkNumber(interval.value)) {
alert('<fmt:message
key="calendar.validator.interval"/>');
interval.focus();
@@ -152,7 +148,6 @@
}
}
}
- }
sendRequest();
}
//send request
@@ -443,6 +438,7 @@
parameters:'scheduleid='+number
}
);
+ alert('<fmt:message key="calendar.version.delete"/>')
createSchedules();
}
@@ -466,31 +462,19 @@
}
</script>
<script src="../javascript/datepicker-new.js" type="text/javascript"></script>
-</cmscedit:head>
+</head>
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
-
<body onload=" initPopCalendar();initDatetime();initPage()">
-
<div id="stepsbar">
-
<div class="tabs">
-
<div class="tab_active" id="addDiv">
-
<div class="body">
-
<a href="javascript:showTab(this,'add');" class="valid">
-
<fmt:message key="calendar.tab.add"/>
-
</a>
</div></div>
-
<div class="tab" id="listDiv"><div class="body"><a
href="javascript:showTab(this,'list');" class="valid"><fmt:message
key="calendar.tab.list"/></a></div></div></div></div>
-
-
<input type="hidden" value="" name="newsletterid" id="newsletterid"/>
-
<form method="post" name="form1" action="">
<div class="editor" style="height:260px">
<p></p>
@@ -502,8 +486,8 @@
<tr class="fieldcanvas"><td class="fieldprompt"><span class="valid"
><fmt:message key="calendar.startdate"/></span> </td><td ><input type="text"
name="date" id="date" size="12" maxlength="12" class="date"/> <input
type="image" class="calendar" src="../media/datepicker/calendar.gif" border="0"
onClick="popUpCalendar(this, 'dd-mm-yyyy', -105 , -30 ,this.form,
'date',event);return false;"/></td></tr>
<tr class="fieldcanvas"><td class="fieldprompt">
<span class="valid" ><fmt:message key="calendar.starttime"/></span>
</td><td> <select id="hour" name="hour"></select>:<select id="minute"
name="minute"></select></td></tr>
- <tr > <td colspan="2"> <table width="100%"><tr class="fieldcanvas"><td
width="40%" ><a href="#" onclick="createCalendar('1')"/><span class="valid"
> <fmt:message key="calendar.ok"/></span></a></td> <td><a href="#"
onclick="javascript:window.close()"/><span class="valid" > <fmt:message
key="calendar.cancel"/></span> </a><td></tr>
- </td></tr></table>
+ </table>
+ <table width="50%"><tr class="fieldcanvas"><td width="40%" ><a
href="#" onclick="createCalendar('1')"/><span class="valid" > <fmt:message
key="calendar.ok"/></span></a></td> <td><a href="#"
onclick="javascript:window.close()"/><span class="valid" > <fmt:message
key="calendar.cancel"/></span> </a></td></tr></table>
</c:when>
<c:when test="${type == '2'}">
<tr class="fieldcanvas">
@@ -519,8 +503,8 @@
<input type="radio" name="strategy" checked id ="strategy" value="0"
class="calendar"/><span class="valid" ><fmt:message
key="calendar.daily"/></span><br>
<input type="radio" name="strategy" id ="strategy" value="1"
class="calendar"/><span class="valid" ><fmt:message
key="calendar.approach.weekday"/></span><br>
<input type="radio" name="strategy" id ="strategy" value="2"
class="calendar"/><span class="valid" ><fmt:message
key="calendar.approach.interval.pre"/></span><input type="text" size="4"
name="interval" id="interval" value="1" class="calendar"/><span class="valid"
> <fmt:message key="calendar.approach.interval.day"/></span></td>
- </tr>
- <tr class="fieldcanvas"><td><a href="#"
onclick="createCalendar('2')"/><span class="valid" ><fmt:message
key="calendar.ok"/></span></a></td><td> <a href="#"
onclick="javascript:window.close()"/><span class="valid" ><fmt:message
key="calendar.cancel"/></span></a></td></tr>
+ </tr> </table>
+ <table width="50%"><tr class="fieldcanvas"><td width="40%" ><a
href="#" onclick="createCalendar('2')"/><span class="valid" ><fmt:message
key="calendar.ok"/></span></a></td><td> <a href="#"
onclick="javascript:window.close()"/><span class="valid" ><fmt:message
key="calendar.cancel"/></span></a></td></tr></table>
</c:when>
<c:when test="${type == '3'}">
<tr class="fieldcanvas"><td class="fieldprompt">
@@ -530,29 +514,30 @@
<span class="valid" ><fmt:message
key="calendar.approach.interval.pre"/></span><input class="calendar"
type="text" name="interval" size="2" id="interval" value="1"/><span
class="valid" > <fmt:message key="calendar.approach.interval.week"/>
</span></td></tr>
<tr class="fieldcanvas"><td class="fieldprompt"> <span class="valid"
><fmt:message key="calendar.week"/></span></td><td>
<table><tr class="fieldcanvas"><td >
- <input type="checkbox" name="weeks" id="weeks" value="1" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.monday"/></span>
+ <input type="checkbox" name="weeks" id="weeks" value="7" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.sunday"/> </span>
</td><td >
+ <input type="checkbox" name="weeks" id="weeks" value="1" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.monday"/></span>
+ </td><td>
<input type="checkbox" name="weeks" id="weeks" value="2" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.tuesday"/> </span>
- </td><td c>
- <input type="checkbox" name="weeks" id="weeks" value="3" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.wednesday"/></span>
</td></tr><tr class="fieldcanvas"><td >
+ <input type="checkbox" name="weeks" id="weeks" value="3" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.wednesday"/></span>
+ </td><td >
<input type="checkbox" name="weeks" id="weeks" value="4" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.thursday"/></span>
</td><td >
<input type="checkbox" name="weeks" id="weeks" value="5" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.friday"/></span>
- </td><td >
- <input type="checkbox" name="weeks" id="weeks" value="6" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.saturday"/></span>
</td></tr><tr class="fieldcanvas"><td colspan="3" >
- <input type="checkbox" name="weeks" id="weeks" value="7" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.sunday"/> </span>
+ <input type="checkbox" name="weeks" id="weeks" value="6" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.week.saturday"/></span>
+
</td></tr></table>
- </td></tr>
- <tr><td><a href="#" onclick="createCalendar('3')"/><span
class="valid" ><fmt:message key="calendar.ok"/></span></a>
- </td><td> <a href="#" onclick="javascript:window.close()"/><span
class="valid" ><fmt:message key="calendar.cancel"/></span></a> </td></tr>
+ </td></tr></table>
+ <table width="50%" ><tr class="fieldcanvas"><td width="40%" ><a
href="#" onclick="createCalendar('3')"/><span class="valid" ><fmt:message
key="calendar.ok"/></span></a>
+ </td><td> <a href="#" onclick="javascript:window.close()"/><span
class="valid" ><fmt:message key="calendar.cancel"/></span></a></td></tr></table>
</c:when>
<c:otherwise>
<tr class="fieldcanvas"><td class="fieldprompt">
<span class="valid" ><fmt:message
key="calendar.starttime"/></span></td><td> <select id="hour"
name="hour"></select>:<select id="minute" name="minute"></select></td></tr>
<tr class="fieldcanvas"><td class="fieldprompt"></td><td>
- <input type="radio" checked name="strategy" id="strategy" value="0"
class="calendar"/> <span class="valid" ><fmt:message
key="calendar.approach.interval.day"/></span> <input size="2" value="1"
type="text" name="day" id="day" class="calendar"></td></tr>
+ <input type="radio" checked name="strategy" id="strategy" value="0"
class="calendar"/> <span class="valid" ><fmt:message
key="calendar.dayofmonth"/></span> <input size="2" value="1" type="text"
name="day" id="day" class="calendar"></td></tr>
<tr><td></td><td>
<input type="radio" name="strategy" id="strategy" value="1"
class="calendar"/>
<select name="whichweek" id="whichweek">
@@ -599,21 +584,21 @@
</td><td>
<input type="checkbox" name="month" id="month" value="b" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.december"/></span></td></tr>
</table>
- </td><tr><td>
+ </td></tr>
+ </table>
+ <table width="50%" ><tr class="fieldcanvas"><td width="40%" >
<a href="#" onclick="createCalendar('4')"/><span class="valid"
><fmt:message key="calendar.ok"/></span></a>
- </td><td> <a href="#" onclick="javascript:window.close()"/><span
class="valid" ><fmt:message key="calendar.cancel"/></span></a></tr>
+ </td><td> <a href="#" onclick="javascript:window.close()"/><span
class="valid" ><fmt:message key="calendar.cancel"/></span></a>
+ </td></tr></table>
</c:otherwise>
</c:choose>
-</table>
-</div>
</div>
+</div>
<div id="scheduleList">
-
</div>
</form>
-
</body>
</mm:cloud>
-</html:html>
+</html>
</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
