Changeset 1966
- Timestamp:
- 11/13/08 11:09:59
- Files:
-
- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (7 diffs)
- trunk/deployment/webadmin/webapp/resources/default/default/jquery.css (added)
- trunk/deployment/webadmin/webapp/resources/resources/bedeworkAccess.js (modified) (1 prop)
- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (7 diffs, 1 prop)
- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r1893 r1966 210 210 211 211 <!-- the following variable can be set to "true" or "false"; 212 to use dojo widgets and fancier UI features, set to false - these are 213 not guaranteed to work in portals --> 212 to use jQuery widgets and fancier UI features, set to false - these are 213 not guaranteed to work in portals. Setting to true will make the 214 add/edit event form much faster, but will not support internationalization. --> 214 215 <xsl:variable name="portalFriendly">false</xsl:variable> 215 216 … … 226 227 <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script> 227 228 <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 228 <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script> 229 <xsl:choose> 230 <xsl:when test="$portalFriendly = 'true'"> 231 <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script> 232 <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 233 </xsl:when> 234 <xsl:otherwise> 235 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js"> </script> 236 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js"> </script> 237 <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 238 <script type="text/javascript"> 239 <xsl:comment> 240 $.datepicker.setDefaults({ 241 constrainInput: true, 242 dateFormat: "yy-mm-dd", 243 showOn: "both", 244 buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif", 245 buttonImageOnly: true, 246 gotoCurrent: true, 247 duration: "" 248 }); 249 </xsl:comment> 250 </script> 251 <!-- script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script--> 252 </xsl:otherwise> 253 </xsl:choose> 229 254 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script> 230 255 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script> 231 <xsl:if test="$portalFriendly = 'true'">232 <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js"> </script>233 <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>234 </xsl:if>235 256 <script type="text/javascript"> 236 257 <xsl:comment> … … 1237 1258 </xsl:when> 1238 1259 <xsl:otherwise> 1239 < span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">1260 <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 1240 1261 <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 1241 1262 <xsl:text> </xsl:text> 1242 </span> 1263 </span--> 1264 <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 1265 <script language="JavaScript" type="text/javascript"> 1266 <xsl:comment> 1267 $("#bwEventWidgetStartDate").datepicker({ 1268 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"/>) 1269 }).attr("readonly", "readonly"); 1270 $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 1271 //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 1272 </xsl:comment> 1273 </script> 1243 1274 <input type="hidden" name="eventStartDate.year"> 1244 1275 <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> … … 1316 1347 </xsl:when> 1317 1348 <xsl:otherwise> 1318 < span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">1349 <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 1319 1350 <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 1320 1351 <xsl:text> </xsl:text> 1321 </span> 1352 </span--> 1353 <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 1354 <script language="JavaScript" type="text/javascript"> 1355 <xsl:comment> 1356 $("#bwEventWidgetEndDate").datepicker({ 1357 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"/>) 1358 }).attr("readonly", "readonly"); 1359 $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 1360 </xsl:comment> 1361 </script> 1322 1362 <input type="hidden" name="eventEndDate.year"> 1323 1363 <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> … … 1655 1695 until 1656 1696 <span id="untilHolder"> 1657 < span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif">1697 <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 1658 1698 <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 1659 1699 <xsl:text> </xsl:text> 1660 </span> 1700 </span --> 1701 <input type="hidden" name="bwEventUntilDate" id="bwEventUntilDate" size="10"/> 1702 <input type="text" name="bwEventWidgetUntilDate" id="bwEventWidgetUntilDate" size="10" onfocus="selectRecurCountUntil('recurUntil')"/> 1703 <script language="JavaScript" type="text/javascript"> 1704 <xsl:comment> 1705 $("#bwEventWidgetUntilDate").datepicker({ 1706 <xsl:choose> 1707 <xsl:when test="form/recurrence/until"> 1708 defaultDate: new Date(<xsl:value-of select="substring(form/recurrence/until,1,4)"/>, <xsl:value-of select="number(substring(form/recurrence/until,5,2)) - 1"/>, <xsl:value-of select="substring(form/recurrence/until,7,2)"/>), 1709 </xsl:when> 1710 <xsl:otherwise> 1711 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"/>), 1712 </xsl:otherwise> 1713 </xsl:choose> 1714 altField: "#bwEventUntilDate", 1715 altFormat: "yymmdd" 1716 }).attr("readonly", "readonly"); 1717 $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 1718 </xsl:comment> 1719 </script> 1661 1720 </span> 1662 1721 </p> … … 1893 1952 store as UTC<br/>--> 1894 1953 <div class="dateFields"> 1895 < input name="eventRdate.date"1954 <!-- input name="eventRdate.date" 1896 1955 dojoType="dropdowndatepicker" 1897 1956 formatLength="medium" … … 1899 1958 saveFormat="yyyyMMdd" 1900 1959 id="bwEventWidgeRdate" 1901 iconURL="{$resourcesRoot}/resources/calIcon.gif"/> 1960 iconURL="{$resourcesRoot}/resources/calIcon.gif"/--> 1961 <input type="text" name="eventRdate.date" id="bwEventWidgetRdate" size="10"/> 1962 <script language="JavaScript" type="text/javascript"> 1963 <xsl:comment> 1964 $("#bwEventWidgetRdate").datepicker({ 1965 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"/>), 1966 dateFormat: "yymmdd" 1967 }).attr("readonly", "readonly"); 1968 $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 1969 </xsl:comment> 1970 </script> 1902 1971 </div> 1903 1972 <div id="rdateTimeFields" class="timeFields"> trunk/deployment/webadmin/webapp/resources/resources/bedeworkAccess.js
- Property svn:eol-style deleted
trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
- Property svn:eol-style deleted
r1918 r1966 25 25 special, consequential, or incidental damages related to the software, 26 26 to the maximum extent the law permits. */ 27 28 dojo.require("dojo.event.*");29 dojo.require("dojo.widget.*");30 dojo.require("dojo.widget.DropdownDatePicker");31 dojo.require("dojo.widget.DropdownTimePicker");32 27 33 28 // ======================================================================== … … 337 332 //setAccessAcl(formObj); 338 333 } 334 335 /* Set dates based on jQuery widgets */ 339 336 function setDates(formObj) { 340 337 var startDate = new Date(); 341 startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate();338 startDate = $("#bwEventWidgetStartDate").datepicker("getDate"); 342 339 formObj["eventStartDate.year"].value = startDate.getFullYear(); 343 340 formObj["eventStartDate.month"].value = startDate.getMonth() + 1; … … 345 342 346 343 var endDate = new Date(); 347 endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate();344 endDate = $("#bwEventWidgetEndDate").datepicker("getDate"); 348 345 formObj["eventEndDate.year"].value = endDate.getFullYear(); 349 346 formObj["eventEndDate.month"].value = endDate.getMonth() + 1; … … 351 348 } 352 349 function setBedeworkXProperties(formObj,submitter) { 353 // set up specific Bedework X-Properties on event form submission350 // Set up specific Bedework X-Properties on event form submission 354 351 // Depends on bedeworkXProperties.js 355 352 // Set application local x-properties here. … … 668 665 // the following will not be adequate for recurrences smaller than a day; 669 666 // we will need to set the time properly at that point. 670 formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 667 // Dojo is deprecated: 668 //formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 669 formObj.until.value = formObj.bwEventUntilDate.value + "T000000"; 671 670 break; 672 671 } … … 682 681 } 683 682 return true; 684 }685 686 function setRdateDateTime(formObj) {687 var rdateTime = dojo.byId("bwEventWidgeRdateTime");688 alert (rdateTime.getValue());689 if (rdateTime.getValue() != "") {690 /*var rdateTimeObj = rdateTime.getTime();691 var timeString = rdateTimeObj.692 formOjb.datetime.value += "T" +*/693 }694 }695 696 function untilClickHandler(evt) {697 selectRecurCountUntil('recurUntil');698 683 } 699 684 … … 706 691 } 707 692 708 709 function init() {710 if(dojo.byId("untilHolder")) {711 var untilHolder = dojo.byId("untilHolder");712 dojo.event.connect(untilHolder, "onclick", untilClickHandler);713 } // else we are editing an instance of a recurrence714 }715 716 dojo.addOnLoad(init);717 718 trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
r1962 r1966 41 41 * date: String: internal date 42 42 * time: String 43 * tzid timezone id or null43 * tzid: timezone id or null 44 44 */ 45 45 function BwREXdate(date, time, allDay, floating, utc, tzid) { … … 276 276 // Set up specific Bedework X-Properties on event form submission 277 277 // Depends on bedeworkXProperties.js 278 // Set application x-properties here.278 // Set application local x-properties here. 279 279 280 280 // X-BEDEWORK-IMAGE and its parameters:
