Changeset 1960
- Timestamp:
- 11/10/08 17:34:29
- Files:
-
- trunk/deployment/resources/javascript/jquery/jquery-ui-1.5.2.min.js (added)
- trunk/deployment/resources/javascript/jquery/themes (added)
- trunk/deployment/resources/javascript/jquery/themes/ui.datepicker.css (added)
- trunk/deployment/resources/javascript/jquery/ui (added)
- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (4 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r1958 r1960 394 394 /bedework/page='rdates' or 395 395 /bedework/page='calendarListForExport'"> 396 <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script> 397 <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 398 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script> 399 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script> 400 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script> 396 401 397 <xsl:choose> 402 398 <xsl:when test="$portalFriendly = 'true'"> … … 405 401 </xsl:when> 406 402 <xsl:otherwise> 407 <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script> 408 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js"> </script> 403 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script> 404 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script> 405 <link rel="stylesheet" href="/bedework-common/javascript/jquery/themes/flora/flora.datepicker.css"/> 406 <script type="text/javascript"> 407 <xsl:comment> 408 $.datepicker.setDefaults({ 409 constrainInput: true, 410 dateFormat: "yy-mm-dd", 411 showOn: "both", 412 buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif", 413 buttonImageOnly: true, 414 gotoCurrent: true, 415 duration: "" 416 }); 417 </xsl:comment> 418 </script> 419 <!-- script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script> 420 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js"> </script--> 409 421 </xsl:otherwise> 410 422 </xsl:choose> 423 <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script> 424 <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 425 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script> 426 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script> 427 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script> 411 428 </xsl:if> 412 429 <xsl:if test="/bedework/editableAccess/access/acl/ace"> … … 2350 2367 </xsl:when> 2351 2368 <xsl:otherwise> 2352 < span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">2369 <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 2353 2370 <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 2354 2371 <xsl:text> </xsl:text> 2355 </span> 2372 </span --> 2373 <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 2374 <script language="JavaScript" type="text/javascript"> 2375 <xsl:comment> 2376 $("#bwEventWidgetStartDate").datepicker({ 2377 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"/>) 2378 }).attr("readonly", "readonly"); 2379 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 2380 //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 2381 </xsl:comment> 2382 </script> 2356 2383 <input type="hidden" name="eventStartDate.year"> 2357 2384 <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> … … 4511 4538 <th>Description:</th> 4512 4539 <td> 4513 <textarea name="calendar.description" cols=" 40" rows="4">4540 <textarea name="calendar.description" cols="30" rows="4"> 4514 4541 <xsl:value-of select="desc"/> 4515 4542 <xsl:if test="normalize-space(desc) = ''"> trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
r1918 r1960 602 602 } 603 603 604 605 604 /* jQuery Features */ 605 606 $(document).ready(function(){ 607 608 $.datepicker.setDefaults({ 609 showOn: "both", 610 buttonImageOnly: false 611 }) 612 613 }); 614 615 616
