[Bedework-commit] bedework r3156 -
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default
releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default
trunk/deployment/webadmin/webapp/resources/default/default
trunk/deployment/webadmin/webapp/resources/es_ES/default
svnadmin at bedework.org
svnadmin at bedework.org
Tue Feb 1 15:05:30 EST 2011
Author: johnsa
Date: 2011-02-01 15:05:27 -0500 (Tue, 01 Feb 2011)
New Revision: 3156
Modified:
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl
releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css
releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
trunk/deployment/webadmin/webapp/resources/default/default/default.css
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css
trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
Log:
admin client: deploy new bedework timepicker
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-01 20:05:27 UTC (rev 3156)
@@ -626,10 +626,16 @@
top: 160px;
margin: auto;
}
-#startTimeFields img,
-#endTimeFields img {
+#bedework #startTimeFields img,
+#bedework #endTimeFields img,
+#bedework #rdateTimeFields img{
vertical-align: middle;
}
+#bedework #calWidgetStartTimeHider,
+#bedework #calWidgetEndTimeHider,
+#bedework #rdateTimeFields {
+ width: 350px;
+}
#tztable {
margin-top: 1em;
}
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -248,8 +248,8 @@
</xsl:if>
<xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script>
- <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+ <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script>
+ <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/>
<xsl:choose>
<xsl:when test="$portalFriendly = 'true'">
<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
@@ -276,12 +276,38 @@
}).attr("readonly", "readonly");
$("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+ // starttime
+ $("#bwStartClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetStartTimeHider",
+ hourIds: ["eventStartDateHour","eventStartDateSchedHour"],
+ minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"],
+ ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// enddate
$("#bwEventWidgetEndDate").datepicker({
defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
}).attr("readonly", "readonly");
$("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>');
+ // endtime
+ $("#bwEndClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetEndTimeHider",
+ hourIds: ["eventEndDateHour"],
+ minuteIds: ["eventEndDateMinute"],
+ ampmIds: ["eventEndDateAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// recurrence until
$("#bwEventWidgetUntilDate").datepicker({
<xsl:choose>
@@ -303,6 +329,19 @@
dateFormat: "yymmdd"
}).attr("readonly", "readonly");
$("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+
+ // rdates and xdates times
+ $("#bwRecExcClock").bwTimePicker({
+ hour24: true,
+ withPadding: true,
+ attachToId: "rdateTimeFields",
+ hourIds: ["eventRdateHour"],
+ minuteIds: ["eventRdateMinute"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
}
</xsl:comment>
</script>
@@ -1493,19 +1532,19 @@
</div>
<div class="{$timeFieldsClass}" id="startTimeFields">
<span id="calWidgetStartTimeHider" class="show">
- <select name="eventStartDate.hour">
+ <select name="eventStartDate.hour" id="eventStartDateHour">
<xsl:copy-of select="form/start/hour/select/*"/>
</select>
- <select name="eventStartDate.minute">
+ <select name="eventStartDate.minute" id="eventStartDateMinute">
<xsl:copy-of select="form/start/minute/select/*"/>
</select>
<xsl:if test="form/start/ampm">
- <select name="eventStartDate.ampm">
+ <select name="eventStartDate.ampm" id="eventStartDateAmpm">
<xsl:copy-of select="form/start/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
<select name="eventStartDate.tzid" id="startTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -1583,19 +1622,19 @@
</div>
<div class="{$timeFieldsClass}" id="endTimeFields">
<span id="calWidgetEndTimeHider" class="show">
- <select name="eventEndDate.hour">
+ <select name="eventEndDate.hour" id="eventEndDateHour">
<xsl:copy-of select="form/end/dateTime/hour/select/*"/>
</select>
- <select name="eventEndDate.minute">
+ <select name="eventEndDate.minute" id="eventEndDateMinute">
<xsl:copy-of select="form/end/dateTime/minute/select/*"/>
</select>
- <xsl:if test="form/end/dateTime/ampm/select">
- <select name="eventEndDate.ampm">
+ <xsl:if test="form/start/ampm">
+ <select name="eventEndDate.ampm" id="eventEndDateAmpm">
<xsl:copy-of select="form/end/dateTime/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
<select name="eventEndDate.tzid" id="endTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -2239,7 +2278,7 @@
</script>
</div>
<div id="rdateTimeFields" class="timeFields">
- <select name="eventRdate.hour">
+ <select name="eventRdate.hour" id="eventRdateHour">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
@@ -2265,7 +2304,7 @@
<option value="22">22</option>
<option value="23">23</option>
</select>
- <select name="eventRdate.minute">
+ <select name="eventRdate.minute" id="eventRdateMinute">
<option value="00" selected="selected">00</option>
<option value="05">05</option>
<option value="10">10</option>
@@ -2280,6 +2319,7 @@
<option value="55">55</option>
</select>
<xsl:text> </xsl:text>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
<select name="tzid" id="rdateTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -310,6 +310,12 @@
<xsl:variable name="bwStr-Cloc-SelectTime">select time</xsl:variable>
<xsl:variable name="bwStr-Cloc-Switch">switch</xsl:variable>
<xsl:variable name="bwStr-Cloc-Close">close</xsl:variable>
+
+ <!-- xsl:template name="newclock" -->
+ <xsl:variable name="bwStr-Cloc-Hour">Hour</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-Minute">Minute</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable>
<!-- xsl:template match="event" mode="displayEvent" -->
<xsl:variable name="bwStr-DsEv-OkayToDelete">Ok to delete this event?</xsl:variable>
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css 2011-02-01 20:05:27 UTC (rev 3156)
@@ -626,10 +626,16 @@
top: 160px;
margin: auto;
}
-#startTimeFields img,
-#endTimeFields img {
+#bedework #startTimeFields img,
+#bedework #endTimeFields img,
+#bedework #rdateTimeFields img{
vertical-align: middle;
}
+#bedework #calWidgetStartTimeHider,
+#bedework #calWidgetEndTimeHider,
+#bedework #rdateTimeFields {
+ width: 350px;
+}
#tztable {
margin-top: 1em;
}
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -248,8 +248,8 @@
</xsl:if>
<xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script>
- <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+ <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script>
+ <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/>
<xsl:choose>
<xsl:when test="$portalFriendly = 'true'">
<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
@@ -276,12 +276,38 @@
}).attr("readonly", "readonly");
$("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+ // starttime
+ $("#bwStartClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetStartTimeHider",
+ hourIds: ["eventStartDateHour","eventStartDateSchedHour"],
+ minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"],
+ ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// enddate
$("#bwEventWidgetEndDate").datepicker({
defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
}).attr("readonly", "readonly");
$("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>');
+ // endtime
+ $("#bwEndClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetEndTimeHider",
+ hourIds: ["eventEndDateHour"],
+ minuteIds: ["eventEndDateMinute"],
+ ampmIds: ["eventEndDateAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// recurrence until
$("#bwEventWidgetUntilDate").datepicker({
<xsl:choose>
@@ -303,6 +329,19 @@
dateFormat: "yymmdd"
}).attr("readonly", "readonly");
$("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+
+ // rdates and xdates times
+ $("#bwRecExcClock").bwTimePicker({
+ hour24: true,
+ withPadding: true,
+ attachToId: "rdateTimeFields",
+ hourIds: ["eventRdateHour"],
+ minuteIds: ["eventRdateMinute"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
}
</xsl:comment>
</script>
@@ -1493,19 +1532,19 @@
</div>
<div class="{$timeFieldsClass}" id="startTimeFields">
<span id="calWidgetStartTimeHider" class="show">
- <select name="eventStartDate.hour">
+ <select name="eventStartDate.hour" id="eventStartDateHour">
<xsl:copy-of select="form/start/hour/select/*"/>
</select>
- <select name="eventStartDate.minute">
+ <select name="eventStartDate.minute" id="eventStartDateMinute">
<xsl:copy-of select="form/start/minute/select/*"/>
</select>
<xsl:if test="form/start/ampm">
- <select name="eventStartDate.ampm">
+ <select name="eventStartDate.ampm" id="eventStartDateAmpm">
<xsl:copy-of select="form/start/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
<select name="eventStartDate.tzid" id="startTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -1583,19 +1622,19 @@
</div>
<div class="{$timeFieldsClass}" id="endTimeFields">
<span id="calWidgetEndTimeHider" class="show">
- <select name="eventEndDate.hour">
+ <select name="eventEndDate.hour" id="eventEndDateHour">
<xsl:copy-of select="form/end/dateTime/hour/select/*"/>
</select>
- <select name="eventEndDate.minute">
+ <select name="eventEndDate.minute" id="eventEndDateMinute">
<xsl:copy-of select="form/end/dateTime/minute/select/*"/>
</select>
- <xsl:if test="form/end/dateTime/ampm/select">
- <select name="eventEndDate.ampm">
+ <xsl:if test="form/start/ampm">
+ <select name="eventEndDate.ampm" id="eventEndDateAmpm">
<xsl:copy-of select="form/end/dateTime/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
<select name="eventEndDate.tzid" id="endTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -2239,7 +2278,7 @@
</script>
</div>
<div id="rdateTimeFields" class="timeFields">
- <select name="eventRdate.hour">
+ <select name="eventRdate.hour" id="eventRdateHour">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
@@ -2265,7 +2304,7 @@
<option value="22">22</option>
<option value="23">23</option>
</select>
- <select name="eventRdate.minute">
+ <select name="eventRdate.minute" id="eventRdateMinute">
<option value="00" selected="selected">00</option>
<option value="05">05</option>
<option value="10">10</option>
@@ -2280,6 +2319,7 @@
<option value="55">55</option>
</select>
<xsl:text> </xsl:text>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
<select name="tzid" id="rdateTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
Modified: releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -310,6 +310,12 @@
<xsl:variable name="bwStr-Cloc-SelectTime">seleccionar hora</xsl:variable>
<xsl:variable name="bwStr-Cloc-Switch">intercambiar</xsl:variable>
<xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable>
+
+ <!-- xsl:template name="newclock" -->
+ <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable>
<!-- xsl:template match="event" mode="displayEvent" -->
<xsl:variable name="bwStr-DsEv-OkayToDelete">¿Seguro que quiere borrar este evento?</xsl:variable>
@@ -444,7 +450,7 @@
<xsl:variable name="bwStr-Cals-Alias">alias</xsl:variable>
<xsl:variable name="bwStr-Cals-Folder">carpeta</xsl:variable>
<xsl:variable name="bwStr-Cals-Calendar">calendario</xsl:variable>
- <xsl:variable name="bwStr-Cals-Add">add a calendar or folder</xsl:variable>
+ <xsl:variable name="bwStr-Cals-Add">añadir un calendario o una carpeta</xsl:variable>
<!-- xsl:template match="calendar" mode="listForDisplay" -->
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css 2011-02-01 20:05:27 UTC (rev 3156)
@@ -626,10 +626,16 @@
top: 160px;
margin: auto;
}
-#startTimeFields img,
-#endTimeFields img {
+#bedework #startTimeFields img,
+#bedework #endTimeFields img,
+#bedework #rdateTimeFields img{
vertical-align: middle;
}
+#bedework #calWidgetStartTimeHider,
+#bedework #calWidgetEndTimeHider,
+#bedework #rdateTimeFields {
+ width: 350px;
+}
#tztable {
margin-top: 1em;
}
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -248,8 +248,8 @@
</xsl:if>
<xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script>
- <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+ <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script>
+ <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/>
<xsl:choose>
<xsl:when test="$portalFriendly = 'true'">
<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
@@ -276,12 +276,38 @@
}).attr("readonly", "readonly");
$("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+ // starttime
+ $("#bwStartClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetStartTimeHider",
+ hourIds: ["eventStartDateHour","eventStartDateSchedHour"],
+ minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"],
+ ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// enddate
$("#bwEventWidgetEndDate").datepicker({
defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
}).attr("readonly", "readonly");
$("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>');
+ // endtime
+ $("#bwEndClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetEndTimeHider",
+ hourIds: ["eventEndDateHour"],
+ minuteIds: ["eventEndDateMinute"],
+ ampmIds: ["eventEndDateAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// recurrence until
$("#bwEventWidgetUntilDate").datepicker({
<xsl:choose>
@@ -303,6 +329,19 @@
dateFormat: "yymmdd"
}).attr("readonly", "readonly");
$("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+
+ // rdates and xdates times
+ $("#bwRecExcClock").bwTimePicker({
+ hour24: true,
+ withPadding: true,
+ attachToId: "rdateTimeFields",
+ hourIds: ["eventRdateHour"],
+ minuteIds: ["eventRdateMinute"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
}
</xsl:comment>
</script>
@@ -1493,19 +1532,19 @@
</div>
<div class="{$timeFieldsClass}" id="startTimeFields">
<span id="calWidgetStartTimeHider" class="show">
- <select name="eventStartDate.hour">
+ <select name="eventStartDate.hour" id="eventStartDateHour">
<xsl:copy-of select="form/start/hour/select/*"/>
</select>
- <select name="eventStartDate.minute">
+ <select name="eventStartDate.minute" id="eventStartDateMinute">
<xsl:copy-of select="form/start/minute/select/*"/>
</select>
<xsl:if test="form/start/ampm">
- <select name="eventStartDate.ampm">
+ <select name="eventStartDate.ampm" id="eventStartDateAmpm">
<xsl:copy-of select="form/start/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
<select name="eventStartDate.tzid" id="startTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -1583,19 +1622,19 @@
</div>
<div class="{$timeFieldsClass}" id="endTimeFields">
<span id="calWidgetEndTimeHider" class="show">
- <select name="eventEndDate.hour">
+ <select name="eventEndDate.hour" id="eventEndDateHour">
<xsl:copy-of select="form/end/dateTime/hour/select/*"/>
</select>
- <select name="eventEndDate.minute">
+ <select name="eventEndDate.minute" id="eventEndDateMinute">
<xsl:copy-of select="form/end/dateTime/minute/select/*"/>
</select>
- <xsl:if test="form/end/dateTime/ampm/select">
- <select name="eventEndDate.ampm">
+ <xsl:if test="form/start/ampm">
+ <select name="eventEndDate.ampm" id="eventEndDateAmpm">
<xsl:copy-of select="form/end/dateTime/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
<select name="eventEndDate.tzid" id="endTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -2239,7 +2278,7 @@
</script>
</div>
<div id="rdateTimeFields" class="timeFields">
- <select name="eventRdate.hour">
+ <select name="eventRdate.hour" id="eventRdateHour">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
@@ -2265,7 +2304,7 @@
<option value="22">22</option>
<option value="23">23</option>
</select>
- <select name="eventRdate.minute">
+ <select name="eventRdate.minute" id="eventRdateMinute">
<option value="00" selected="selected">00</option>
<option value="05">05</option>
<option value="10">10</option>
@@ -2280,6 +2319,7 @@
<option value="55">55</option>
</select>
<xsl:text> </xsl:text>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
<select name="tzid" id="rdateTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
Modified: trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -310,6 +310,12 @@
<xsl:variable name="bwStr-Cloc-SelectTime">select time</xsl:variable>
<xsl:variable name="bwStr-Cloc-Switch">switch</xsl:variable>
<xsl:variable name="bwStr-Cloc-Close">close</xsl:variable>
+
+ <!-- xsl:template name="newclock" -->
+ <xsl:variable name="bwStr-Cloc-Hour">Hour</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-Minute">Minute</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable>
<!-- xsl:template match="event" mode="displayEvent" -->
<xsl:variable name="bwStr-DsEv-OkayToDelete">Ok to delete this event?</xsl:variable>
Modified: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css 2011-02-01 20:05:27 UTC (rev 3156)
@@ -626,10 +626,16 @@
top: 160px;
margin: auto;
}
-#startTimeFields img,
-#endTimeFields img {
+#bedework #startTimeFields img,
+#bedework #endTimeFields img,
+#bedework #rdateTimeFields img{
vertical-align: middle;
}
+#bedework #calWidgetStartTimeHider,
+#bedework #calWidgetEndTimeHider,
+#bedework #rdateTimeFields {
+ width: 350px;
+}
#tztable {
margin-top: 1em;
}
Modified: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -248,8 +248,8 @@
</xsl:if>
<xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'">
<script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script>
- <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script>
- <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+ <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script>
+ <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/>
<xsl:choose>
<xsl:when test="$portalFriendly = 'true'">
<script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>
@@ -276,12 +276,38 @@
}).attr("readonly", "readonly");
$("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+ // starttime
+ $("#bwStartClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetStartTimeHider",
+ hourIds: ["eventStartDateHour","eventStartDateSchedHour"],
+ minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"],
+ ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// enddate
$("#bwEventWidgetEndDate").datepicker({
defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
}).attr("readonly", "readonly");
$("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>');
+ // endtime
+ $("#bwEndClock").bwTimePicker({
+ hour24: <xsl:value-of select="/bedework/hour24"/>,
+ attachToId: "calWidgetEndTimeHider",
+ hourIds: ["eventEndDateHour"],
+ minuteIds: ["eventEndDateMinute"],
+ ampmIds: ["eventEndDateAmpm"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
+
// recurrence until
$("#bwEventWidgetUntilDate").datepicker({
<xsl:choose>
@@ -303,6 +329,19 @@
dateFormat: "yymmdd"
}).attr("readonly", "readonly");
$("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+
+ // rdates and xdates times
+ $("#bwRecExcClock").bwTimePicker({
+ hour24: true,
+ withPadding: true,
+ attachToId: "rdateTimeFields",
+ hourIds: ["eventRdateHour"],
+ minuteIds: ["eventRdateMinute"],
+ hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>",
+ minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>",
+ amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>",
+ pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>"
+ });
}
</xsl:comment>
</script>
@@ -1493,19 +1532,19 @@
</div>
<div class="{$timeFieldsClass}" id="startTimeFields">
<span id="calWidgetStartTimeHider" class="show">
- <select name="eventStartDate.hour">
+ <select name="eventStartDate.hour" id="eventStartDateHour">
<xsl:copy-of select="form/start/hour/select/*"/>
</select>
- <select name="eventStartDate.minute">
+ <select name="eventStartDate.minute" id="eventStartDateMinute">
<xsl:copy-of select="form/start/minute/select/*"/>
</select>
<xsl:if test="form/start/ampm">
- <select name="eventStartDate.ampm">
+ <select name="eventStartDate.ampm" id="eventStartDateAmpm">
<xsl:copy-of select="form/start/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
<select name="eventStartDate.tzid" id="startTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -1583,19 +1622,19 @@
</div>
<div class="{$timeFieldsClass}" id="endTimeFields">
<span id="calWidgetEndTimeHider" class="show">
- <select name="eventEndDate.hour">
+ <select name="eventEndDate.hour" id="eventEndDateHour">
<xsl:copy-of select="form/end/dateTime/hour/select/*"/>
</select>
- <select name="eventEndDate.minute">
+ <select name="eventEndDate.minute" id="eventEndDateMinute">
<xsl:copy-of select="form/end/dateTime/minute/select/*"/>
</select>
- <xsl:if test="form/end/dateTime/ampm/select">
- <select name="eventEndDate.ampm">
+ <xsl:if test="form/start/ampm">
+ <select name="eventEndDate.ampm" id="eventEndDateAmpm">
<xsl:copy-of select="form/end/dateTime/ampm/select/*"/>
</select>
</xsl:if>
<xsl:text> </xsl:text>
- <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
<select name="eventEndDate.tzid" id="endTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
@@ -2239,7 +2278,7 @@
</script>
</div>
<div id="rdateTimeFields" class="timeFields">
- <select name="eventRdate.hour">
+ <select name="eventRdate.hour" id="eventRdateHour">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
@@ -2265,7 +2304,7 @@
<option value="22">22</option>
<option value="23">23</option>
</select>
- <select name="eventRdate.minute">
+ <select name="eventRdate.minute" id="eventRdateMinute">
<option value="00" selected="selected">00</option>
<option value="05">05</option>
<option value="10">10</option>
@@ -2280,6 +2319,7 @@
<option value="55">55</option>
</select>
<xsl:text> </xsl:text>
+ <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
<select name="tzid" id="rdateTzid" class="timezones">
<xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
Modified: trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2011-02-01 19:17:12 UTC (rev 3155)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2011-02-01 20:05:27 UTC (rev 3156)
@@ -310,6 +310,12 @@
<xsl:variable name="bwStr-Cloc-SelectTime">seleccionar hora</xsl:variable>
<xsl:variable name="bwStr-Cloc-Switch">intercambiar</xsl:variable>
<xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable>
+
+ <!-- xsl:template name="newclock" -->
+ <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable>
+ <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable>
<!-- xsl:template match="event" mode="displayEvent" -->
<xsl:variable name="bwStr-DsEv-OkayToDelete">¿Seguro que quiere borrar este evento?</xsl:variable>
More information about the Bedework-commit
mailing list