Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv32479/src/webapp/editors/newsletter
Modified Files:
showNewsletters.jsp
Log Message:
CMSC-1135(Add the function of inputing date by hand.)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1135
Index: showNewsletters.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/showNewsletters.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- showNewsletters.jsp 5 Nov 2008 06:34:21 -0000 1.19
+++ showNewsletters.jsp 6 Nov 2008 08:47:55 -0000 1.20
@@ -43,8 +43,45 @@
endDate[0].value = "";
}
function submits(){
+ var startDate = document.getElementsByName("startDate");
+ var endDate = document.getElementsByName("endDate");
+ if(startDate[0].value!=''&&!strDateTime(startDate[0].value)) {
+ alert("<fmt:message key='newsletterlog.datefrom.advice'/>");
+ return;
+ }if(endDate[0].value!='' && !strDateTime(endDate[0].value)) {
+ alert("<fmt:message key='newsletterlog.dateto.advice'/>");
+ return;
+ }
document.forms[0].submit();
}
+ function strDateTime(str){
+ var reg = /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/;
+ var r = str.match(reg);
+ if(r==null)return false;
+
+ var datenum = parseInt(r[4],10);
+ if(datenum>=1 && datenum<=9){
+ datenum = '0'+datenum;
+ }
+ var monthnum = parseInt(r[3],10);
+ if(monthnum >=1 && monthnum<=9){
+ monthnum = '0' +monthnum;
+ }
+ str = r[1]+r[2]+monthnum+r[2]+datenum;
+
+ var d= new Date(r[1], r[3]-1,r[4]);
+
+ var dateRel = parseInt(d.getDate(),10);
+ if(dateRel >=1 && dateRel <=9){
+ dateRel = '0'+dateRel;
+ }
+ var monthRel = parseInt(d.getMonth()+1,10);
+ if(monthRel >=1 && monthRel <=9){
+ monthRel = '0' +monthRel;
+ }
+ var newStr =d.getFullYear()+r[2]+monthRel+r[2]+dateRel;
+ return newStr==str;
+ }
</script>
</head>
<body>
@@ -71,18 +108,18 @@
<tbody>
<tr>
<td style="width:13%"> <fmt:message
key="newsletterlog.newsletter" /> </td>
- <td style="width:20%">
+ <td style="width:25%">
<html:select property="newsletters"
styleId="newsletters" style="width:150px">
<html:optionsCollection name="newsletters"
label="title" value="id" />
</html:select>
</td>
<td style="width:10%"> </td>
- <td style="width:57%"> </td>
+ <td style="width:52%"> </td>
</tr>
<tr>
<td> <fmt:message key="newsletterlog.from" /> </td>
<td nowrap>
- <html:text property="startDate" styleId="f_date_b"
readonly="true" style="width:150px" />
+ <html:text property="startDate" styleId="f_date_b"
style="width:150px" />
<img src="<cmsc:staticurl
page='/editors/editwizards_new/media/datepicker/calendar.gif'/>"
id="f_trigger_b" class="img">
</input>
@@ -97,7 +134,7 @@
</td>
<td> <fmt:message key="newsletterlog.to" /> </td>
<td nowrap>
- <html:text property="endDate" styleId="f_date_be"
readonly="true" style="width:150px" />
+ <html:text property="endDate" styleId="f_date_be"
style="width:150px" />
<img src="<cmsc:staticurl
page='/editors/editwizards_new/media/datepicker/calendar.gif'/>"
id="f_trigger_be" class="img">
</input>
@@ -141,8 +178,13 @@
</c:choose>
<td colspan="2"> </td>
</tr>
+
+ </tbody>
+ </table>
+ </html:form>
+ <table>
<tr>
- <td> </td>
+ <td style="width:13%"> </td>
<td>
<input type="submit" onclick="javascript:submits()"
value="<fmt:message key="newsletterlog.submit" />"
/>
@@ -151,9 +193,7 @@
</td>
<td colspan="2"> </td>
</tr>
- </tbody>
</table>
- </html:form>
</div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
