Changeset 946
- Timestamp:
- 08/09/06 12:01:45
- Files:
-
- trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (2 diffs)
- trunk/calendar3/deployment/webadmin/webapp/resources/resources/dynCalendarWidget.js (modified) (11 diffs)
- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css (modified) (2 diffs)
- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css (modified) (2 diffs)
- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl
r583 r946 621 621 <script language="JavaScript" type="text/javascript"> 622 622 <xsl:comment> 623 startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', 'startDateCalWidgetCallback' );623 startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 624 624 </xsl:comment> 625 625 </script> … … 669 669 <script language="JavaScript" type="text/javascript"> 670 670 <xsl:comment> 671 endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', 'endDateCalWidgetCallback' );671 endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 672 672 </xsl:comment> 673 673 </script> trunk/calendar3/deployment/webadmin/webapp/resources/resources/dynCalendarWidget.js
r209 r946 7 7 * 8 8 * 9 * Modifications for inclusion in Bedework calendar system 10 * by Arlen Johnson 20069 * Modifications for inclusion in Bedework calendar system 10 * by Arlen Johnson & Dave Brondsema 2006 11 11 */ 12 12 … … 25 25 * @param string objName Name of the object that you create 26 26 * @param string callbackFunc Name of the callback function 27 * @param string OPTIONAL Optional images root path 27 28 * @param string OPTIONAL Optional layer name 28 * @param string OPTIONAL Optional images path29 29 */ 30 30 function dynCalendar(objName, callbackFunc) … … 41 41 this.objName = objName; 42 42 this.callbackFunc = callbackFunc; 43 this.imagesPath = arguments[2] ? arguments[2] : '/caladminrsrc/resources/'; 43 if (arguments[2]) { 44 this.imagesPath = arguments[2]; 45 } else { 46 this.imagesPath = '/caladminrsrc/resources/'; 47 } 44 48 this.layerID = arguments[3] ? arguments[3] : 'dynCalendar_layer_' + dynCalendar_layers.length; 45 49 … … 107 111 var nextMonth, nextYear, prevImgHTML, prevLinkHTML, nextImgHTML, nextLinkHTML; 108 112 var monthComboOptions, monthCombo, yearComboOptions, yearCombo, html; 109 113 110 114 this.currentMonth = month = arguments[0] != null ? arguments[0] : this.currentMonth; 111 115 this.currentYear = year = arguments[1] != null ? arguments[1] : this.currentYear; … … 150 154 previousYear--; 151 155 } 152 156 153 157 nextYear = thisMonth.getFullYear(); 154 158 nextMonth = thisMonth.getMonth() + 1; … … 178 182 monthCombo = monthnames[thisMonth.getMonth()]; 179 183 } 180 184 181 185 /** 182 186 * Build year combo … … 267 271 this.offsetY = Yoffset; 268 272 } 269 273 270 274 /** 271 275 * Sets the images path … … 361 365 { 362 366 this._getLayer().style.visibility = 'hidden'; 363 367 364 368 // for Bedework event editing; reveal time fields when cal widget is hidden 365 369 changeClass('calWidgetStartTimeHider','shown'); … … 375 379 { 376 380 this._getLayer().style.visibility = 'visible'; 377 381 378 382 // for Bedework event editing; hide time fields when cal widget is visible 379 383 // to avoid IE rendering oddities (IE always displays the "windowed" layer … … 450 454 arguments[0] = null; 451 455 } 452 456 453 457 dynCalendar_oldOnmousemove(); 454 458 } … … 468 472 } 469 473 } 470 474 471 475 dynCalendar_oldOnclick(arguments[0] ? arguments[0] : null); 472 476 } trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css
r548 r946 179 179 } 180 180 #tabsTable .rightCell { 181 background : url(../../images/ demo/std-tab-space.gif);181 background : url(../../images/std-tab-space.gif); 182 182 padding-right: 0.5em; 183 183 } … … 763 763 } 764 764 #calPageTable ul.calendarTree li.folder { 765 list-style-image: url(../../images/ demo/catIcon.gif);765 list-style-image: url(../../images/catIcon.gif); 766 766 padding-top: 0.25em; 767 767 padding-bottom: 0.25em; 768 768 } 769 769 #calPageTable ul.calendarTree li.calendar { 770 list-style-image: url(../../images/ demo/calIcon-sm.gif);770 list-style-image: url(../../images/calIcon-sm.gif); 771 771 } 772 772 .noEventsCell { trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css
r548 r946 188 188 } 189 189 #tabsTable .rightCell { 190 background : url(../../images/ demo/std-tab-space.gif);190 background : url(../../images/std-tab-space.gif); 191 191 padding-right: 0.5em; 192 192 } … … 760 760 } 761 761 #calPageTable ul.calendarTree li.folder { 762 list-style-image: url(../../images/ demo/catIcon.gif);762 list-style-image: url(../../images/catIcon.gif); 763 763 padding-top: 0.25em; 764 764 padding-bottom: 0.25em; 765 765 } 766 766 #calPageTable ul.calendarTree li.calendar { 767 list-style-image: url(../../images/ demo/calIcon-sm.gif);767 list-style-image: url(../../images/calIcon-sm.gif); 768 768 } 769 769 .noEventsCell { trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css
r548 r946 188 188 } 189 189 #tabsTable .rightCell { 190 background : url(../../images/ demo/std-tab-space.gif);190 background : url(../../images/std-tab-space.gif); 191 191 padding-right: 0.5em; 192 192 } … … 761 761 } 762 762 #calPageTable ul.calendarTree li.folder { 763 list-style-image: url(../../images/ demo/catIcon.gif);763 list-style-image: url(../../images/catIcon.gif); 764 764 padding-top: 0.25em; 765 765 padding-bottom: 0.25em; 766 766 } 767 767 #calPageTable ul.calendarTree li.calendar { 768 list-style-image: url(../../images/ demo/calIcon-sm.gif);768 list-style-image: url(../../images/calIcon-sm.gif); 769 769 } 770 770 .noEventsCell {
