Changeset 1963
- Timestamp:
- 11/12/08 14:48:46
- Files:
-
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (2 diffs)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jquery.css (added)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/images/calIcon.gif (added)
- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/resources/javascript/bedework.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
r1874 r1963 132 132 <!-- load javascript --> 133 133 <xsl:if test="/bedework/page='event' or /bedework/page='calendarList' or /bedework/page='displayCalendarForExport'"> 134 <script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js"> </script> 134 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script> 135 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script> 136 <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 137 <script type="text/javascript"> 138 <xsl:comment> 139 $.datepicker.setDefaults({ 140 constrainInput: true, 141 dateFormat: "yy-mm-dd", 142 showOn: "both", 143 buttonImage: "<xsl:value-of select='$resourcesRoot'/>/images/calIcon.gif", 144 buttonImageOnly: true, 145 gotoCurrent: true, 146 duration: "" 147 }); 148 </xsl:comment> 149 </script> 150 <!-- script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js"> </script --> 135 151 <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js"> </script> 136 152 </xsl:if> … … 1538 1554 <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range 1539 1555 <div id="exportDateRange" class="invisible"> 1540 Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 1541 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div> 1556 <!-- Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 1557 End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div>--> 1558 Start: <input type="text" name="bwExportCalendarWidgetStartDate" id="bwExportCalendarWidgetStartDate" size="10"/> 1559 End: <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/> 1542 1560 </div> 1561 <script language="JavaScript" type="text/javascript"> 1562 <xsl:comment> 1563 $("#bwExportCalendarWidgetStartDate").datepicker({ 1564 }).attr("readonly", "readonly"); 1565 $("#bwExportCalendarWidgetEndDate").datepicker({ 1566 }).attr("readonly", "readonly"); 1567 </xsl:comment> 1568 </script> 1543 1569 <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/></p> 1544 1570 </form> trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/resources/javascript/bedework.js
r1792 r1963 18 18 function fillExportFields(formObj) { 19 19 var startDate = new Date(); 20 startDate = dojo.widget.byId("bwExportCalendarWidgetStartDate").getDate(); 20 //startDate = dojo.widget.byId("bwExportCalendarWidgetStartDate").getDate(); 21 startDate = $("bwExportCalendarWidgetStartDate").datepicker("getDate"); 21 22 formObj["eventStartDate.year"].value = startDate.getFullYear(); 22 23 formObj["eventStartDate.month"].value = startDate.getMonth() + 1; … … 24 25 25 26 var endDate = new Date(); 26 endDate = dojo.widget.byId("bwExportCalendarWidgetEndDate").getDate();27 endDate = $("bwExportCalendarWidgetEndDate").datepicker("getDate"); 27 28 formObj["eventEndDate.year"].value = endDate.getFullYear(); 28 29 formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
