Changeset 1147

Show
Ignore:
Timestamp:
12/12/06 14:07:47
Author:
johnsa
Message:

personal client: continued interface work on recurrence form elements

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1146 r1147  
    20362036            <script language="JavaScript" type="text/javascript"> 
    20372037            <xsl:comment> 
    2038               startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/','true'); 
     2038              startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback',true,'<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    20392039            </xsl:comment> 
    20402040            </script> 
    …… 
    20962096              <script language="JavaScript" type="text/javascript"> 
    20972097              <xsl:comment> 
    2098                 endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/', 'true'); 
     2098                endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback',true,'<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    20992099              </xsl:comment> 
    21002100              </script> 
    …… 
    22262226                </td> 
    22272227                <td class="recurrenceRules"> 
    2228                   <div id="onceRecurrenceRules"> 
     2228                  <div id="noneRecurrenceRules"> 
    22292229                    <p>does not recur</p> 
    22302230                  </div> 
    …… 
    24802480                     &#160; 
    24812481                     <input type="radio" name="rCountUntil" value="count" checked="checked"/> 
    2482                      <input type="text" value="1" size="2" name="count"/> times 
    2483                      &#160; 
    2484                      <input type="radio" name="rCountUntil" value="count"/> 
    24852482                     until 
    24862483                     <div class="dateFields"> 
    …… 
    25112508                     <script language="JavaScript" type="text/javascript"> 
    25122509                     <xsl:comment> 
    2513                        untilDateDynCalWidget = new dynCalendar('untilDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'untilDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/','false'); 
     2510                       untilDateDynCalWidget = new dynCalendar('untilDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'untilDateCalWidgetCallback',false,'<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    25142511                     </xsl:comment> 
    25152512                     </script> 
     2513                     &#160; 
     2514                     <input type="radio" name="rCountUntil" value="count"/> 
     2515                     <input type="text" value="1" size="2" name="count"/> times 
    25162516                   </div> 
    25172517                </td> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.js

    r1146 r1147  
    2828* @param int    dy           Day (date) value (1-31) 
    2929* @param string callbackFunc Name of the callback function 
     30* @param boolean hideBwFields Hide Bedework time fields when widget appears (true/false) 
    3031* @param string OPTIONAL     Optional images root path 
    3132* @param string OPTIONAL     Optional layer name 
    …… 
    5051                this.objName        = objName; 
    5152                this.callbackFunc   = callbackFunc; 
    52     if (arguments[5]) { 
    53                         this.imagesPath = arguments[5]; 
     53    this.hideBwFields   = hideBwFields; 
     54 
     55    if (arguments[6]) { 
     56                        this.imagesPath = arguments[6]; 
    5457                } else { 
    5558                        this.imagesPath = '/ucalrsrc/resources/'; 
    …… 
    376379 
    377380    // for Bedework event editing; reveal time fields when cal widget is hidden 
    378     if (hideBwFields) { 
     381    if (this.hideBwFields) { 
    379382      changeClass('calWidgetStartTimeHider','shown'); 
    380383      changeClass('calWidgetEndTimeHider','shown'); 
    …… 
    394397    // to avoid IE rendering oddities (IE always displays the "windowed" layer 
    395398    // above everything else -- that includes select boxes. 
    396     if (hideBwFields) { 
     399    if (this.hideBwFields) { 
    397400      changeClass('calWidgetStartTimeHider','invisible'); 
    398401      changeClass('calWidgetEndTimeHider','invisible'); 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js

    r1146 r1147  
    8686  changeClass('recurrenceUntilRules','shown'); 
    8787 
    88   if (freq == 'ONCE') { 
    89     changeClass('onceRecurrenceRules','shown'); 
     88  if (freq == 'NONE') { 
     89    changeClass('noneRecurrenceRules','shown'); 
    9090    changeClass('recurrenceUntilRules','invisible'); 
    9191  } else { 
    92     changeClass('onceRecurrenceRules','invisible'); 
     92    changeClass('noneRecurrenceRules','invisible'); 
    9393  } 
    9494  if (freq == 'HOURLY') {