Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
In directory
james.mmbase.org:/tmp/cvs-serv9290/CMSContainer/cmsc/edit-webapp/src/webapp/mmbase/edit/wizard/jsp
Modified Files:
Tag: b1_5
calendar.jsp
Log Message:
CMSC-1180(Modify the jsp's css , make the i18n go better.)
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.2.4
retrieving revision 1.5.2.5
diff -u -b -r1.5.2.4 -r1.5.2.5
--- calendar.jsp 15 Dec 2008 13:32:12 -0000 1.5.2.4
+++ calendar.jsp 9 Jan 2009 03:04:50 -0000 1.5.2.5
@@ -8,21 +8,13 @@
<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="../../../../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"/>
+<link href="${pageContext.request.contextPath }/editors/css/main.css"
type="text/css" rel="stylesheet"/>
<style xml:space="preserve" type="text/css">
input.calendar {
width: 22px;
height: 17px;
border:0px;
- }
- input.schedule {
- width: 18px;
- height: 17px;
- border:0px;
+ vertical-align:middle;
}
</style>
<script src="../../../../js/prototype.js" type="text/javascript"></script>
@@ -144,6 +136,7 @@
}
}
sendRequest();
+ return false;
}
//send request
function sendRequest() {
@@ -450,85 +443,132 @@
</script>
<script src="../javascript/datepicker-new.js" type="text/javascript"></script>
</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>
+ <div class="tabs">
+ <div class="tab_active" id="addDiv">
+ <div class="body">
+ <div>
+ <a href="javascript:showTab(this,'add');"><fmt:message
key="calendar.tab.add"/></a>
+ </div>
+ </div>
+ </div>
+ <div class="tab" id="listDiv">
+ <div class="body">
+ <div>
+ <a href="javascript:showTab(this,'list');"><fmt:message
key="calendar.tab.list"/></a>
+ </div>
+ </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>
-<div id="scheduleAdd">
-<div class="body">
-<table>
-<c:choose>
+<div class="editor">
+ <form method="post" name="form1" action="">
+ <p> </p>
+ <div id="scheduleAdd">
+ <div class="body">
+ <table>
+ <c:choose>
<c:when test="${type == '1'}">
- <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><fmt:message key="calendar.startdate"/></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>
+ <td ><fmt:message key="calendar.starttime"/></td>
+ <td> <select id="hour" name="hour"></select>:<select
id="minute" name="minute"></select></td>
+ </tr>
+ </table>
+ <table style="width:20%" >
+ <tr>
+ <td><input type="submit" value="<fmt:message
key="calendar.ok"/>" name="submitButton" onclick="return
createCalendar('1');"/></td>
+ <td><input type="submit" value="<fmt:message
key="calendar.cancel"/>" name="submitButton"
onclick="javascript:window.close()"/></td>
+ </tr>
</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">
- <td class="fieldprompt"><span class="valid" >
- <fmt:message key="calendar.startdate"/></span>
- </td>
+ <tr >
+ <td ><fmt:message key="calendar.startdate"/></td>
<td > <input type="text" name="date" id="date" size="12"
class="date"/><input type="image" class="calendar"
src="../media/datepicker/calendar.gif" border="0" onClick="popUpCalendar(this,
'dd-mm-yyyy', -105 , -30 , document.forms[0], 'date',event);return false;"/>
- </td></tr>
- <tr><td colspan="2"></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"></td></tr>
- <tr class="fieldcanvas"><td class="fieldprompt" >
- <span class="valid" ><fmt:message
key="calendar.approach"/></span></td><td>
-
- <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> </table>
+ </td>
+ </tr>
+ <tr><td colspan="2"/></tr>
+ <tr >
+ <td><fmt:message key="calendar.starttime"/></td>
+ <td ><select id="hour" name="hour"></select>:<select
id="minute" name="minute"></select></td>
+ </tr>
+ <tr><td colspan="2"/></tr>
+ <tr >
+ <td >
+ <span class="valid" ><fmt:message
key="calendar.approach"/>
+ </td>
+ <td>
+ <fmt:message
key="calendar.approach.interval.pre"/><input type="text" size="4"
name="interval" id="interval" value="1" class="calendar"/> <fmt:message
key="calendar.approach.interval.day"/>
+ </td>
+ </tr>
+ </table>
<br/>
- <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>
+ <table style="width:20%" >
+ <tr>
+ <td><input type="submit" value="<fmt:message
key="calendar.ok"/>" name="submitButton" onclick="return
createCalendar('2');"/></td>
+ <td><input type="submit" value="<fmt:message
key="calendar.cancel"/>" name="submitButton"
onclick="javascript:window.close()"/></td>
+ </tr>
+ </table>
</c:when>
<c:when test="${type == '3'}">
- <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 >
+ <td><fmt:message key="calendar.starttime"/></td>
+ <td><select id="hour" name="hour"></select>:<select
id="minute" name="minute"></select></td>
+ </tr>
+ <tr >
+ <td> </td>
+ <td ><fmt:message
key="calendar.approach.interval.pre"/><input class="calendar" type="text"
name="interval" size="2" id="interval" value="1"/><fmt:message
key="calendar.approach.interval.week"/></td>
</tr>
- <tr class="fieldcanvas"><td class="fieldprompt"></td> <td >
- <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="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></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></tr><tr class="fieldcanvas"><td colspan="3" >
- <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></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>
+ <tr >
+ <td><fmt:message key="calendar.week"/></td>
+ <td>
+ <table class="body">
+ <tr >
+ <td><input type="checkbox" name="weeks"
id="weeks" value="7" checked/><fmt:message key="calendar.week.sunday"/></td>
+ <td><input type="checkbox" name="weeks"
id="weeks" value="1" checked/><fmt:message key="calendar.week.monday"/></td>
+ <td><input type="checkbox" name="weeks"
id="weeks" value="2" checked /><fmt:message key="calendar.week.tuesday"/></td>
+ </tr>
+ <tr >
+ <td><input type="checkbox" name="weeks"
id="weeks" value="3" checked/><fmt:message key="calendar.week.wednesday"/></td>
+ <td><input type="checkbox" name="weeks"
id="weeks" value="4" checked /><fmt:message key="calendar.week.thursday"/></td>
+ <td><input type="checkbox" name="weeks"
id="weeks" value="5" checked /><fmt:message key="calendar.week.friday"/></td>
+ </tr>
+ <tr >
+ <td colspan="3" ><input type="checkbox"
name="weeks" id="weeks" value="6" checked /><fmt:message
key="calendar.week.saturday"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <table style="width:20%" >
+ <tr>
+ <td><input type="submit" value="<fmt:message
key="calendar.ok"/>" name="submitButton" onclick="return
createCalendar('3');"/></td>
+ <td><input type="submit" value="<fmt:message
key="calendar.cancel"/>" name="submitButton"
onclick="javascript:window.close()"/></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.dayofmonth"/></span> <input size="2" value="1" type="text"
name="day" id="day" class="calendar"></td></tr>
- <tr><td></td><td>
+ <tr >
+ <td><fmt:message key="calendar.starttime"/></td>
+ <td> <select id="hour" name="hour"></select>:<select
id="minute" name="minute"></select></td>
+ </tr>
+ <tr ><td> </td>
+ <td>
+ <input type="radio" checked name="strategy"
id="strategy" value="0" class="calendar"/><fmt:message
key="calendar.dayofmonth"/><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">
<option value="1"><fmt:message key="calendar.which.week.first"/>
</option>
@@ -546,48 +586,47 @@
<option value="6"> <fmt:message key="calendar.week.saturday"/>
</option>
<option value="7"> <fmt:message key="calendar.week.sunday"/></option>
</select>
- </td></tr>
- <tr class="fieldcanvas"><td class="fieldprompt">
- <span class="valid" ><fmt:message key="calendar.month"/></span></td><td>
- <table><tr class="fieldcanvas"><td>
- <input type="checkbox" name="month" id="month" value="0" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.january"/></span>
- </td><td class="fieldprompt">
- <input type="checkbox" name="month" id="month" value="1" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.february"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="2" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.march"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="3" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.april"/></span></td></tr>
- <tr class="fieldcanvas"><td>
- <input type="checkbox" name="month" id="month" value="4" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.may"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="5" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.june"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="6" checked
class="schedule"/><span class="valid" ><fmt:message key="calendar.month.july"/>
- </span></td><td>
- <input type="checkbox" name="month" id="month" value="7" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.august"/></span></td></tr>
- <tr class="fieldcanvas"><td>
- <input type="checkbox" name="month" id="month" value="8" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.september"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="9" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.october"/></span>
- </td><td>
- <input type="checkbox" name="month" id="month" value="a" checked
class="schedule"/><span class="valid" ><fmt:message
key="calendar.month.november"/></span>
- </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>
+ </td>
+ </tr>
+ <tr >
+ <td><fmt:message key="calendar.month"/></td>
+ <td>
+ <table>
+ <tr >
+ <td><input type="checkbox" name="month"
id="month" value="0" checked /><fmt:message key="calendar.month.january"/></td>
+ <td ><input type="checkbox" name="month"
id="month" value="1" checked /><fmt:message key="calendar.month.february"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="2" checked /><fmt:message key="calendar.month.march"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="3" checked/><fmt:message key="calendar.month.april"/></td>
+ </tr>
+ <tr >
+ <td><input type="checkbox" name="month"
id="month" value="4" checked /><fmt:message key="calendar.month.may"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="5" checked /><fmt:message key="calendar.month.june"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="6" checked /><fmt:message key="calendar.month.july"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="7" checked /><fmt:message key="calendar.month.august"/></td>
+ </tr>
+ <tr >
+ <td><input type="checkbox" name="month"
id="month" value="8" checked /><fmt:message
key="calendar.month.september"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="9" checked /><fmt:message key="calendar.month.october"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="a" checked /><fmt:message key="calendar.month.november"/></td>
+ <td><input type="checkbox" name="month"
id="month" value="b" checked /><fmt:message key="calendar.month.december"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
- </td></tr>
+ <table style="width:20%" >
+ <tr>
+ <td><input type="submit" value="<fmt:message
key="calendar.ok"/>" name="submitButton" onclick="return
createCalendar('4');"/></td>
+ <td><input type="submit" value="<fmt:message
key="calendar.cancel"/>" name="submitButton"
onclick="javascript:window.close()"/></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>
- </td></tr></table>
</c:otherwise>
-</c:choose>
-
-</div>
-</div>
-<div id="scheduleList">
+ </c:choose>
+ </div>
+ </div>
+ <div id="scheduleList"></div>
+ </form>
</div>
-</form>
</body>
</mm:cloud>
</html>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
