Changeset 2136
- Timestamp:
- 04/16/09 15:45:00
- Files:
-
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (3 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/json-list-src.xsl (added)
- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
r2133 r2136 727 727 <th class="icalIcon" rowspan="2"> 728 728 <div id="eventIcons"> 729 <xsl:if test="recurrenceId = ''"> 730 <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 731 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 732 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 733 add to my calendar</a> 734 </xsl:if> 729 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 730 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 731 add to my calendar 732 </a> 735 733 <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 736 734 <a href="{$export}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> … … 1052 1050 </td> 1053 1051 <td class="icons"> 1054 <xsl:if test="recurrenceId = ''"> 1055 <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 1056 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 1057 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 1058 </a> 1059 </xsl:if> 1052 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 1053 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 1054 </a> 1060 1055 <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 1061 1056 <a href="{$export}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> … … 1115 1110 1116 1111 <xsl:text> </xsl:text> 1117 <xsl:if test="recurrenceId = ''"> 1118 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 1119 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 1120 </a> 1121 <xsl:text> </xsl:text> 1122 </xsl:if> 1112 <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 1113 <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 1114 </a> 1115 <xsl:text> </xsl:text> 1123 1116 <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 1124 1117 <a href="{$export}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
r2123 r2136 1066 1066 width: 28px; 1067 1067 } 1068 #bwColorPicker { 1069 white-space: nowrap; 1070 } 1068 1071 #bedework table.widget { 1069 1072 margin: 1em 1em 0 0; trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r2135 r2136 202 202 <xsl:choose> 203 203 <xsl:when test="/bedework/page = 'addEvent'"> 204 <xsl:attribute name="onload">focusElement('bwEventTitle'); </xsl:attribute>204 <xsl:attribute name="onload">focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute> 205 205 </xsl:when> 206 206 <xsl:when test="/bedework/page = 'editEvent'"> 207 <xsl:attribute name="onload">initRXDates();initXProperties();focusElement('bwEventTitle'); </xsl:attribute>207 <xsl:attribute name="onload">initRXDates();initXProperties();focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute> 208 208 </xsl:when> 209 209 <xsl:when test="/bedework/page = 'attendees'"> … … 402 402 losing the script closing tags (which avoids browser problems) --> 403 403 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 404 <!-- 404 405 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script> 405 406 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script> 406 <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 407 <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> --> 408 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js"> </script> 409 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js"> </script> 410 <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 407 411 408 412 <xsl:if test="/bedework/page='modSchedulingPrefs' or … … 454 458 duration: "" 455 459 }); 460 461 function bwSetupDatePickers() { 462 // startdate 463 $("#bwEventWidgetStartDate").datepicker({ 464 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 465 }).attr("readonly", "readonly"); 466 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 467 468 // enddate 469 $("#bwEventWidgetEndDate").datepicker({ 470 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"/>) 471 }).attr("readonly", "readonly"); 472 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 473 474 // recurrence until 475 $("#bwEventWidgetUntilDate").datepicker({ 476 <xsl:choose> 477 <xsl:when test="/bedework/formElements/form/recurrence/until"> 478 defaultDate: new Date(<xsl:value-of select="substring(/bedework/formElements/form/recurrence/until,1,4)"/>, <xsl:value-of select="number(substring(/bedework/formElements/form/recurrence/until,5,2)) - 1"/>, <xsl:value-of select="substring(/bedework/formElements/form/recurrence/until,7,2)"/>), 479 </xsl:when> 480 <xsl:otherwise> 481 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>), 482 </xsl:otherwise> 483 </xsl:choose> 484 altField: "#bwEventUntilDate", 485 altFormat: "yymmdd" 486 }).attr("readonly", "readonly"); 487 $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 488 489 // rdates and xdates 490 $("#bwEventWidgetRdate").datepicker({ 491 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>), 492 dateFormat: "yymmdd" 493 }).attr("readonly", "readonly"); 494 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 495 } 456 496 </xsl:comment> 457 497 </script> … … 2557 2597 <script type="text/javascript"> 2558 2598 <xsl:comment> 2559 $("#bwEventWidgetStartDate").datepicker({2599 /*$("#bwEventWidgetStartDate").datepicker({ 2560 2600 defaultDate: new Date(<xsl:value-of select="form/start/yearText/input/@value"/>, <xsl:value-of select="number(form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/>) 2561 2601 }).attr("readonly", "readonly"); 2562 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 2602 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>');*/ 2563 2603 </xsl:comment> 2564 2604 </script> … … 2653 2693 <script type="text/javascript"> 2654 2694 <xsl:comment> 2655 $("#bwEventWidgetEndDate").datepicker({2695 /*$("#bwEventWidgetEndDate").datepicker({ 2656 2696 defaultDate: new Date(<xsl:value-of select="form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>) 2657 2697 }).attr("readonly", "readonly"); 2658 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 2698 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>');*/ 2659 2699 </xsl:comment> 2660 2700 </script> … … 3242 3282 <script type="text/javascript"> 3243 3283 <xsl:comment> 3244 $("#bwEventWidgetUntilDate").datepicker({3284 /*$("#bwEventWidgetUntilDate").datepicker({ 3245 3285 <xsl:choose> 3246 3286 <xsl:when test="form/recurrence/until"> … … 3254 3294 altFormat: "yymmdd" 3255 3295 }).attr("readonly", "readonly"); 3256 $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 3296 $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>');*/ 3257 3297 </xsl:comment> 3258 3298 </script> … … 3499 3539 <script type="text/javascript"> 3500 3540 <xsl:comment> 3501 $("#bwEventWidgetRdate").datepicker({3541 /* $("#bwEventWidgetRdate").datepicker({ 3502 3542 defaultDate: new Date(<xsl:value-of select="form/start/yearText/input/@value"/>, <xsl:value-of select="number(form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/>), 3503 3543 dateFormat: "yymmdd" 3504 3544 }).attr("readonly", "readonly"); 3505 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 3545 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>');*/ 3506 3546 </xsl:comment> 3507 3547 </script>
