Changeset 946

Show
Ignore:
Timestamp:
08/09/06 12:01:45
Author:
johnsa
Message:

applying patches from Dave Brondsema

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r583 r946  
    621621              <script language="JavaScript" type="text/javascript"> 
    622622              <xsl:comment> 
    623                 startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', 'startDateCalWidgetCallback'); 
     623                startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    624624              </xsl:comment> 
    625625              </script> 
     
    669669                <script language="JavaScript" type="text/javascript"> 
    670670                <xsl:comment> 
    671                   endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', 'endDateCalWidgetCallback'); 
     671                  endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    672672                </xsl:comment> 
    673673                </script> 
  • trunk/calendar3/deployment/webadmin/webapp/resources/resources/dynCalendarWidget.js

    r209 r946  
    77* 
    88* 
    9 * Modifications for inclusion in Bedework calendar system  
    10 * by Arlen Johnson 2006  
     9* Modifications for inclusion in Bedework calendar system 
     10* by Arlen Johnson & Dave Brondsema 2006 
    1111*/ 
    1212 
     
    2525* @param string objName      Name of the object that you create 
    2626* @param string callbackFunc Name of the callback function 
     27* @param string OPTIONAL     Optional images root path 
    2728* @param string OPTIONAL     Optional layer name 
    28 * @param string OPTIONAL     Optional images path 
    2929*/ 
    3030        function dynCalendar(objName, callbackFunc) 
     
    4141                this.objName        = objName; 
    4242                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                } 
    4448                this.layerID        = arguments[3] ? arguments[3] : 'dynCalendar_layer_' + dynCalendar_layers.length; 
    4549 
     
    107111                var nextMonth, nextYear, prevImgHTML, prevLinkHTML, nextImgHTML, nextLinkHTML; 
    108112                var monthComboOptions, monthCombo, yearComboOptions, yearCombo, html; 
    109                  
     113 
    110114                this.currentMonth = month = arguments[0] != null ? arguments[0] : this.currentMonth; 
    111115                this.currentYear  = year  = arguments[1] != null ? arguments[1] : this.currentYear; 
     
    150154                        previousYear--; 
    151155                } 
    152                  
     156 
    153157                nextYear  = thisMonth.getFullYear(); 
    154158                nextMonth = thisMonth.getMonth() + 1; 
     
    178182                        monthCombo = monthnames[thisMonth.getMonth()]; 
    179183                } 
    180                  
     184 
    181185                /** 
    182186        * Build year combo 
     
    267271                this.offsetY = Yoffset; 
    268272        } 
    269          
     273 
    270274/** 
    271275* Sets the images path 
     
    361365        { 
    362366                this._getLayer().style.visibility = 'hidden'; 
    363      
     367 
    364368    // for Bedework event editing; reveal time fields when cal widget is hidden 
    365369    changeClass('calWidgetStartTimeHider','shown'); 
     
    375379        { 
    376380                this._getLayer().style.visibility = 'visible'; 
    377      
     381 
    378382    // for Bedework event editing; hide time fields when cal widget is visible 
    379383    // to avoid IE rendering oddities (IE always displays the "windowed" layer 
     
    450454                                arguments[0] = null; 
    451455                        } 
    452          
     456 
    453457                        dynCalendar_oldOnmousemove(); 
    454458                } 
     
    468472                                } 
    469473                        } 
    470          
     474 
    471475                        dynCalendar_oldOnclick(arguments[0] ? arguments[0] : null); 
    472476                } 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css

    r548 r946  
    179179} 
    180180#tabsTable .rightCell { 
    181   background : url(../../images/demo/std-tab-space.gif); 
     181  background : url(../../images/std-tab-space.gif); 
    182182  padding-right: 0.5em; 
    183183} 
     
    763763} 
    764764#calPageTable ul.calendarTree li.folder { 
    765   list-style-image: url(../../images/demo/catIcon.gif); 
     765  list-style-image: url(../../images/catIcon.gif); 
    766766  padding-top: 0.25em; 
    767767  padding-bottom: 0.25em; 
    768768} 
    769769#calPageTable ul.calendarTree li.calendar { 
    770   list-style-image: url(../../images/demo/calIcon-sm.gif); 
     770  list-style-image: url(../../images/calIcon-sm.gif); 
    771771} 
    772772.noEventsCell { 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css

    r548 r946  
    188188} 
    189189#tabsTable .rightCell { 
    190   background : url(../../images/demo/std-tab-space.gif); 
     190  background : url(../../images/std-tab-space.gif); 
    191191  padding-right: 0.5em; 
    192192} 
     
    760760} 
    761761#calPageTable ul.calendarTree li.folder { 
    762   list-style-image: url(../../images/demo/catIcon.gif); 
     762  list-style-image: url(../../images/catIcon.gif); 
    763763  padding-top: 0.25em; 
    764764  padding-bottom: 0.25em; 
    765765} 
    766766#calPageTable ul.calendarTree li.calendar { 
    767   list-style-image: url(../../images/demo/calIcon-sm.gif); 
     767  list-style-image: url(../../images/calIcon-sm.gif); 
    768768} 
    769769.noEventsCell { 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css

    r548 r946  
    188188} 
    189189#tabsTable .rightCell { 
    190   background : url(../../images/demo/std-tab-space.gif); 
     190  background : url(../../images/std-tab-space.gif); 
    191191  padding-right: 0.5em; 
    192192} 
     
    761761} 
    762762#calPageTable ul.calendarTree li.folder { 
    763   list-style-image: url(../../images/demo/catIcon.gif); 
     763  list-style-image: url(../../images/catIcon.gif); 
    764764  padding-top: 0.25em; 
    765765  padding-bottom: 0.25em; 
    766766} 
    767767#calPageTable ul.calendarTree li.calendar { 
    768   list-style-image: url(../../images/demo/calIcon-sm.gif); 
     768  list-style-image: url(../../images/calIcon-sm.gif); 
    769769} 
    770770.noEventsCell {