Changeset 3156
- Timestamp:
- 02/01/11 15:05:27
- Files:
-
- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (9 diffs)
- releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css (modified) (1 diff)
- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (modified) (9 diffs)
- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (modified) (2 diffs)
- trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (9 diffs)
- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (modified) (9 diffs)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.css
r3038 r3156 627 627 margin: auto; 628 628 } 629 #startTimeFields img, 630 #endTimeFields img { 629 #bedework #startTimeFields img, 630 #bedework #endTimeFields img, 631 #bedework #rdateTimeFields img{ 631 632 vertical-align: middle; 633 } 634 #bedework #calWidgetStartTimeHider, 635 #bedework #calWidgetEndTimeHider, 636 #bedework #rdateTimeFields { 637 width: 350px; 632 638 } 633 639 #tztable { releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
r3128 r3156 249 249 <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 250 250 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 251 <script type="text/javascript" src=" {$resourcesRoot}/resources/bwClock.js"> </script>252 <link rel="stylesheet" href=" {$resourcesRoot}/resources/bwClock.css"/>251 <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script> 252 <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 253 253 <xsl:choose> 254 254 <xsl:when test="$portalFriendly = 'true'"> … … 277 277 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 278 278 279 // starttime 280 $("#bwStartClock").bwTimePicker({ 281 hour24: <xsl:value-of select="/bedework/hour24"/>, 282 attachToId: "calWidgetStartTimeHider", 283 hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 284 minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 285 ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 286 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 287 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 288 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 289 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 290 }); 291 279 292 // enddate 280 293 $("#bwEventWidgetEndDate").datepicker({ … … 282 295 }).attr("readonly", "readonly"); 283 296 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 297 298 // endtime 299 $("#bwEndClock").bwTimePicker({ 300 hour24: <xsl:value-of select="/bedework/hour24"/>, 301 attachToId: "calWidgetEndTimeHider", 302 hourIds: ["eventEndDateHour"], 303 minuteIds: ["eventEndDateMinute"], 304 ampmIds: ["eventEndDateAmpm"], 305 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 306 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 307 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 308 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 309 }); 284 310 285 311 // recurrence until … … 304 330 }).attr("readonly", "readonly"); 305 331 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 332 333 // rdates and xdates times 334 $("#bwRecExcClock").bwTimePicker({ 335 hour24: true, 336 withPadding: true, 337 attachToId: "rdateTimeFields", 338 hourIds: ["eventRdateHour"], 339 minuteIds: ["eventRdateMinute"], 340 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 341 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 342 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 343 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 344 }); 306 345 } 307 346 </xsl:comment> … … 1494 1533 <div class="{$timeFieldsClass}" id="startTimeFields"> 1495 1534 <span id="calWidgetStartTimeHider" class="show"> 1496 <select name="eventStartDate.hour" >1535 <select name="eventStartDate.hour" id="eventStartDateHour"> 1497 1536 <xsl:copy-of select="form/start/hour/select/*"/> 1498 1537 </select> 1499 <select name="eventStartDate.minute" >1538 <select name="eventStartDate.minute" id="eventStartDateMinute"> 1500 1539 <xsl:copy-of select="form/start/minute/select/*"/> 1501 1540 </select> 1502 1541 <xsl:if test="form/start/ampm"> 1503 <select name="eventStartDate.ampm" >1542 <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 1504 1543 <xsl:copy-of select="form/start/ampm/select/*"/> 1505 1544 </select> 1506 1545 </xsl:if> 1507 1546 <xsl:text> </xsl:text> 1508 < a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1547 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 1509 1548 1510 1549 <select name="eventStartDate.tzid" id="startTzid" class="timezones"> … … 1584 1623 <div class="{$timeFieldsClass}" id="endTimeFields"> 1585 1624 <span id="calWidgetEndTimeHider" class="show"> 1586 <select name="eventEndDate.hour" >1625 <select name="eventEndDate.hour" id="eventEndDateHour"> 1587 1626 <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 1588 1627 </select> 1589 <select name="eventEndDate.minute" >1628 <select name="eventEndDate.minute" id="eventEndDateMinute"> 1590 1629 <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 1591 1630 </select> 1592 <xsl:if test="form/ end/dateTime/ampm/select">1593 <select name="eventEndDate.ampm" >1631 <xsl:if test="form/start/ampm"> 1632 <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 1594 1633 <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 1595 1634 </select> 1596 1635 </xsl:if> 1597 1636 <xsl:text> </xsl:text> 1598 < a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1637 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 1599 1638 1600 1639 <select name="eventEndDate.tzid" id="endTzid" class="timezones"> … … 2240 2279 </div> 2241 2280 <div id="rdateTimeFields" class="timeFields"> 2242 <select name="eventRdate.hour" >2281 <select name="eventRdate.hour" id="eventRdateHour"> 2243 2282 <option value="00">00</option> 2244 2283 <option value="01">01</option> … … 2266 2305 <option value="23">23</option> 2267 2306 </select> 2268 <select name="eventRdate.minute" >2307 <select name="eventRdate.minute" id="eventRdateMinute"> 2269 2308 <option value="00" selected="selected">00</option> 2270 2309 <option value="05">05</option> … … 2281 2320 </select> 2282 2321 <xsl:text> </xsl:text> 2322 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 2283 2323 2284 2324 <select name="tzid" id="rdateTzid" class="timezones"> releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl
r3128 r3156 311 311 <xsl:variable name="bwStr-Cloc-Switch">switch</xsl:variable> 312 312 <xsl:variable name="bwStr-Cloc-Close">close</xsl:variable> 313 314 <!-- xsl:template name="newclock" --> 315 <xsl:variable name="bwStr-Cloc-Hour">Hour</xsl:variable> 316 <xsl:variable name="bwStr-Cloc-Minute">Minute</xsl:variable> 317 <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 318 <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 313 319 314 320 <!-- xsl:template match="event" mode="displayEvent" --> releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.css
r3124 r3156 627 627 margin: auto; 628 628 } 629 #startTimeFields img, 630 #endTimeFields img { 629 #bedework #startTimeFields img, 630 #bedework #endTimeFields img, 631 #bedework #rdateTimeFields img{ 631 632 vertical-align: middle; 633 } 634 #bedework #calWidgetStartTimeHider, 635 #bedework #calWidgetEndTimeHider, 636 #bedework #rdateTimeFields { 637 width: 350px; 632 638 } 633 639 #tztable { releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
r3128 r3156 249 249 <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 250 250 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 251 <script type="text/javascript" src=" {$resourcesRoot}/resources/bwClock.js"> </script>252 <link rel="stylesheet" href=" {$resourcesRoot}/resources/bwClock.css"/>251 <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script> 252 <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 253 253 <xsl:choose> 254 254 <xsl:when test="$portalFriendly = 'true'"> … … 277 277 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 278 278 279 // starttime 280 $("#bwStartClock").bwTimePicker({ 281 hour24: <xsl:value-of select="/bedework/hour24"/>, 282 attachToId: "calWidgetStartTimeHider", 283 hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 284 minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 285 ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 286 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 287 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 288 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 289 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 290 }); 291 279 292 // enddate 280 293 $("#bwEventWidgetEndDate").datepicker({ … … 282 295 }).attr("readonly", "readonly"); 283 296 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 297 298 // endtime 299 $("#bwEndClock").bwTimePicker({ 300 hour24: <xsl:value-of select="/bedework/hour24"/>, 301 attachToId: "calWidgetEndTimeHider", 302 hourIds: ["eventEndDateHour"], 303 minuteIds: ["eventEndDateMinute"], 304 ampmIds: ["eventEndDateAmpm"], 305 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 306 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 307 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 308 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 309 }); 284 310 285 311 // recurrence until … … 304 330 }).attr("readonly", "readonly"); 305 331 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 332 333 // rdates and xdates times 334 $("#bwRecExcClock").bwTimePicker({ 335 hour24: true, 336 withPadding: true, 337 attachToId: "rdateTimeFields", 338 hourIds: ["eventRdateHour"], 339 minuteIds: ["eventRdateMinute"], 340 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 341 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 342 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 343 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 344 }); 306 345 } 307 346 </xsl:comment> … … 1494 1533 <div class="{$timeFieldsClass}" id="startTimeFields"> 1495 1534 <span id="calWidgetStartTimeHider" class="show"> 1496 <select name="eventStartDate.hour" >1535 <select name="eventStartDate.hour" id="eventStartDateHour"> 1497 1536 <xsl:copy-of select="form/start/hour/select/*"/> 1498 1537 </select> 1499 <select name="eventStartDate.minute" >1538 <select name="eventStartDate.minute" id="eventStartDateMinute"> 1500 1539 <xsl:copy-of select="form/start/minute/select/*"/> 1501 1540 </select> 1502 1541 <xsl:if test="form/start/ampm"> 1503 <select name="eventStartDate.ampm" >1542 <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 1504 1543 <xsl:copy-of select="form/start/ampm/select/*"/> 1505 1544 </select> 1506 1545 </xsl:if> 1507 1546 <xsl:text> </xsl:text> 1508 < a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1547 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 1509 1548 1510 1549 <select name="eventStartDate.tzid" id="startTzid" class="timezones"> … … 1584 1623 <div class="{$timeFieldsClass}" id="endTimeFields"> 1585 1624 <span id="calWidgetEndTimeHider" class="show"> 1586 <select name="eventEndDate.hour" >1625 <select name="eventEndDate.hour" id="eventEndDateHour"> 1587 1626 <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 1588 1627 </select> 1589 <select name="eventEndDate.minute" >1628 <select name="eventEndDate.minute" id="eventEndDateMinute"> 1590 1629 <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 1591 1630 </select> 1592 <xsl:if test="form/ end/dateTime/ampm/select">1593 <select name="eventEndDate.ampm" >1631 <xsl:if test="form/start/ampm"> 1632 <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 1594 1633 <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 1595 1634 </select> 1596 1635 </xsl:if> 1597 1636 <xsl:text> </xsl:text> 1598 < a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1637 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 1599 1638 1600 1639 <select name="eventEndDate.tzid" id="endTzid" class="timezones"> … … 2240 2279 </div> 2241 2280 <div id="rdateTimeFields" class="timeFields"> 2242 <select name="eventRdate.hour" >2281 <select name="eventRdate.hour" id="eventRdateHour"> 2243 2282 <option value="00">00</option> 2244 2283 <option value="01">01</option> … … 2266 2305 <option value="23">23</option> 2267 2306 </select> 2268 <select name="eventRdate.minute" >2307 <select name="eventRdate.minute" id="eventRdateMinute"> 2269 2308 <option value="00" selected="selected">00</option> 2270 2309 <option value="05">05</option> … … 2281 2320 </select> 2282 2321 <xsl:text> </xsl:text> 2322 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 2283 2323 2284 2324 <select name="tzid" id="rdateTzid" class="timezones"> releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
r3128 r3156 311 311 <xsl:variable name="bwStr-Cloc-Switch">intercambiar</xsl:variable> 312 312 <xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable> 313 314 <!-- xsl:template name="newclock" --> 315 <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable> 316 <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable> 317 <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 318 <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 313 319 314 320 <!-- xsl:template match="event" mode="displayEvent" --> … … 445 451 <xsl:variable name="bwStr-Cals-Folder">carpeta</xsl:variable> 446 452 <xsl:variable name="bwStr-Cals-Calendar">calendario</xsl:variable> 447 <xsl:variable name="bwStr-Cals-Add">a dd a calendar or folder</xsl:variable>453 <xsl:variable name="bwStr-Cals-Add">añadir un calendario o una carpeta</xsl:variable> 448 454 449 455 <!-- xsl:template match="calendar" mode="listForDisplay" --> trunk/deployment/webadmin/webapp/resources/default/default/default.css
r3038 r3156 627 627 margin: auto; 628 628 } 629 #startTimeFields img, 630 #endTimeFields img { 629 #bedework #startTimeFields img, 630 #bedework #endTimeFields img, 631 #bedework #rdateTimeFields img{ 631 632 vertical-align: middle; 633 } 634 #bedework #calWidgetStartTimeHider, 635 #bedework #calWidgetEndTimeHider, 636 #bedework #rdateTimeFields { 637 width: 350px; 632 638 } 633 639 #tztable { trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r3127 r3156 249 249 <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 250 250 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 251 <script type="text/javascript" src=" {$resourcesRoot}/resources/bwClock.js"> </script>252 <link rel="stylesheet" href=" {$resourcesRoot}/resources/bwClock.css"/>251 <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script> 252 <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 253 253 <xsl:choose> 254 254 <xsl:when test="$portalFriendly = 'true'"> … … 277 277 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 278 278 279 // starttime 280 $("#bwStartClock").bwTimePicker({ 281 hour24: <xsl:value-of select="/bedework/hour24"/>, 282 attachToId: "calWidgetStartTimeHider", 283 hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 284 minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 285 ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 286 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 287 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 288 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 289 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 290 }); 291 279 292 // enddate 280 293 $("#bwEventWidgetEndDate").datepicker({ … … 282 295 }).attr("readonly", "readonly"); 283 296 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 297 298 // endtime 299 $("#bwEndClock").bwTimePicker({ 300 hour24: <xsl:value-of select="/bedework/hour24"/>, 301 attachToId: "calWidgetEndTimeHider", 302 hourIds: ["eventEndDateHour"], 303 minuteIds: ["eventEndDateMinute"], 304 ampmIds: ["eventEndDateAmpm"], 305 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 306 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 307 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 308 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 309 }); 284 310 285 311 // recurrence until … … 304 330 }).attr("readonly", "readonly"); 305 331 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 332 333 // rdates and xdates times 334 $("#bwRecExcClock").bwTimePicker({ 335 hour24: true, 336 withPadding: true, 337 attachToId: "rdateTimeFields", 338 hourIds: ["eventRdateHour"], 339 minuteIds: ["eventRdateMinute"], 340 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 341 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 342 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 343 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 344 }); 306 345 } 307 346 </xsl:comment> … … 1494 1533 <div class="{$timeFieldsClass}" id="startTimeFields"> 1495 1534 <span id="calWidgetStartTimeHider" class="show"> 1496 <select name="eventStartDate.hour" >1535 <select name="eventStartDate.hour" id="eventStartDateHour"> 1497 1536 <xsl:copy-of select="form/start/hour/select/*"/> 1498 1537 </select> 1499 <select name="eventStartDate.minute" >1538 <select name="eventStartDate.minute" id="eventStartDateMinute"> 1500 1539 <xsl:copy-of select="form/start/minute/select/*"/> 1501 1540 </select> 1502 1541 <xsl:if test="form/start/ampm"> 1503 <select name="eventStartDate.ampm" >1542 <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 1504 1543 <xsl:copy-of select="form/start/ampm/select/*"/> 1505 1544 </select> 1506 1545 </xsl:if> 1507 1546 <xsl:text> </xsl:text> 1508 < a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1547 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 1509 1548 1510 1549 <select name="eventStartDate.tzid" id="startTzid" class="timezones"> … … 1584 1623 <div class="{$timeFieldsClass}" id="endTimeFields"> 1585 1624 <span id="calWidgetEndTimeHider" class="show"> 1586 <select name="eventEndDate.hour" >1625 <select name="eventEndDate.hour" id="eventEndDateHour"> 1587 1626 <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 1588 1627 </select> 1589 <select name="eventEndDate.minute" >1628 <select name="eventEndDate.minute" id="eventEndDateMinute"> 1590 1629 <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 1591 1630 </select> 1592 <xsl:if test="form/ end/dateTime/ampm/select">1593 <select name="eventEndDate.ampm" >1631 <xsl:if test="form/start/ampm"> 1632 <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 1594 1633 <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 1595 1634 </select> 1596 1635 </xsl:if> 1597 1636 <xsl:text> </xsl:text> 1598 < a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1637 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 1599 1638 1600 1639 <select name="eventEndDate.tzid" id="endTzid" class="timezones"> … … 2240 2279 </div> 2241 2280 <div id="rdateTimeFields" class="timeFields"> 2242 <select name="eventRdate.hour" >2281 <select name="eventRdate.hour" id="eventRdateHour"> 2243 2282 <option value="00">00</option> 2244 2283 <option value="01">01</option> … … 2266 2305 <option value="23">23</option> 2267 2306 </select> 2268 <select name="eventRdate.minute" >2307 <select name="eventRdate.minute" id="eventRdateMinute"> 2269 2308 <option value="00" selected="selected">00</option> 2270 2309 <option value="05">05</option> … … 2281 2320 </select> 2282 2321 <xsl:text> </xsl:text> 2322 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 2283 2323 2284 2324 <select name="tzid" id="rdateTzid" class="timezones"> trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
r3127 r3156 311 311 <xsl:variable name="bwStr-Cloc-Switch">switch</xsl:variable> 312 312 <xsl:variable name="bwStr-Cloc-Close">close</xsl:variable> 313 314 <!-- xsl:template name="newclock" --> 315 <xsl:variable name="bwStr-Cloc-Hour">Hour</xsl:variable> 316 <xsl:variable name="bwStr-Cloc-Minute">Minute</xsl:variable> 317 <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 318 <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 313 319 314 320 <!-- xsl:template match="event" mode="displayEvent" --> trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css
r3121 r3156 627 627 margin: auto; 628 628 } 629 #startTimeFields img, 630 #endTimeFields img { 629 #bedework #startTimeFields img, 630 #bedework #endTimeFields img, 631 #bedework #rdateTimeFields img{ 631 632 vertical-align: middle; 633 } 634 #bedework #calWidgetStartTimeHider, 635 #bedework #calWidgetEndTimeHider, 636 #bedework #rdateTimeFields { 637 width: 350px; 632 638 } 633 639 #tztable { trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
r3127 r3156 249 249 <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 250 250 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 251 <script type="text/javascript" src=" {$resourcesRoot}/resources/bwClock.js"> </script>252 <link rel="stylesheet" href=" {$resourcesRoot}/resources/bwClock.css"/>251 <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js"> </script> 252 <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 253 253 <xsl:choose> 254 254 <xsl:when test="$portalFriendly = 'true'"> … … 277 277 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 278 278 279 // starttime 280 $("#bwStartClock").bwTimePicker({ 281 hour24: <xsl:value-of select="/bedework/hour24"/>, 282 attachToId: "calWidgetStartTimeHider", 283 hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 284 minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 285 ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 286 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 287 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 288 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 289 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 290 }); 291 279 292 // enddate 280 293 $("#bwEventWidgetEndDate").datepicker({ … … 282 295 }).attr("readonly", "readonly"); 283 296 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 297 298 // endtime 299 $("#bwEndClock").bwTimePicker({ 300 hour24: <xsl:value-of select="/bedework/hour24"/>, 301 attachToId: "calWidgetEndTimeHider", 302 hourIds: ["eventEndDateHour"], 303 minuteIds: ["eventEndDateMinute"], 304 ampmIds: ["eventEndDateAmpm"], 305 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 306 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 307 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 308 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 309 }); 284 310 285 311 // recurrence until … … 304 330 }).attr("readonly", "readonly"); 305 331 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 332 333 // rdates and xdates times 334 $("#bwRecExcClock").bwTimePicker({ 335 hour24: true, 336 withPadding: true, 337 attachToId: "rdateTimeFields", 338 hourIds: ["eventRdateHour"], 339 minuteIds: ["eventRdateMinute"], 340 hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 341 minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 342 amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 343 pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 344 }); 306 345 } 307 346 </xsl:comment> … … 1494 1533 <div class="{$timeFieldsClass}" id="startTimeFields"> 1495 1534 <span id="calWidgetStartTimeHider" class="show"> 1496 <select name="eventStartDate.hour" >1535 <select name="eventStartDate.hour" id="eventStartDateHour"> 1497 1536 <xsl:copy-of select="form/start/hour/select/*"/> 1498 1537 </select> 1499 <select name="eventStartDate.minute" >1538 <select name="eventStartDate.minute" id="eventStartDateMinute"> 1500 1539 <xsl:copy-of select="form/start/minute/select/*"/> 1501 1540 </select> 1502 1541 <xsl:if test="form/start/ampm"> 1503 <select name="eventStartDate.ampm" >1542 <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 1504 1543 <xsl:copy-of select="form/start/ampm/select/*"/> 1505 1544 </select> 1506 1545 </xsl:if> 1507 1546 <xsl:text> </xsl:text> 1508 < a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1547 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/> 1509 1548 1510 1549 <select name="eventStartDate.tzid" id="startTzid" class="timezones"> … … 1584 1623 <div class="{$timeFieldsClass}" id="endTimeFields"> 1585 1624 <span id="calWidgetEndTimeHider" class="show"> 1586 <select name="eventEndDate.hour" >1625 <select name="eventEndDate.hour" id="eventEndDateHour"> 1587 1626 <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 1588 1627 </select> 1589 <select name="eventEndDate.minute" >1628 <select name="eventEndDate.minute" id="eventEndDateMinute"> 1590 1629 <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 1591 1630 </select> 1592 <xsl:if test="form/ end/dateTime/ampm/select">1593 <select name="eventEndDate.ampm" >1631 <xsl:if test="form/start/ampm"> 1632 <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 1594 1633 <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 1595 1634 </select> 1596 1635 </xsl:if> 1597 1636 <xsl:text> </xsl:text> 1598 < a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a>1637 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/> 1599 1638 1600 1639 <select name="eventEndDate.tzid" id="endTzid" class="timezones"> … … 2240 2279 </div> 2241 2280 <div id="rdateTimeFields" class="timeFields"> 2242 <select name="eventRdate.hour" >2281 <select name="eventRdate.hour" id="eventRdateHour"> 2243 2282 <option value="00">00</option> 2244 2283 <option value="01">01</option> … … 2266 2305 <option value="23">23</option> 2267 2306 </select> 2268 <select name="eventRdate.minute" >2307 <select name="eventRdate.minute" id="eventRdateMinute"> 2269 2308 <option value="00" selected="selected">00</option> 2270 2309 <option value="05">05</option> … … 2281 2320 </select> 2282 2321 <xsl:text> </xsl:text> 2322 <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/> 2283 2323 2284 2324 <select name="tzid" id="rdateTzid" class="timezones"> trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
r3127 r3156 311 311 <xsl:variable name="bwStr-Cloc-Switch">intercambiar</xsl:variable> 312 312 <xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable> 313 314 <!-- xsl:template name="newclock" --> 315 <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable> 316 <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable> 317 <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 318 <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 313 319 314 320 <!-- xsl:template match="event" mode="displayEvent" -->
