Changeset 92

Show
Ignore:
Timestamp:
02/06/06 15:07:18
Author:
johnsa
Message:

changed calendar jsp pages for public client to reflect new calendar objects

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r90 r92  
    339339                <xsl:variable name="dateRangeStyle"> 
    340340                  <xsl:choose> 
    341                     <xsl:when test="start/date = parent::day/date"> 
     341                    <xsl:when test="substring(start/utcdate,1,8) = parent::day/date"> 
    342342                      <xsl:choose> 
    343                         <xsl:when test="(start/hour24 = '0') and (end/hour24 = '0')">dateRangeCrossDay</xsl:when> 
     343                        <xsl:when test="start/allday = 'true'">dateRangeCrossDay</xsl:when> 
    344344                        <xsl:when test="start/hour24 &lt; 6">dateRangeEarlyMorning</xsl:when> 
    345345                        <xsl:when test="start/hour24 &lt; 12">dateRangeMorning</xsl:when> 
    …… 
    353353                <td class="{$dateRangeStyle}" style="text-align:right;"> 
    354354                  <xsl:choose> 
     355                    <xsl:when test="start/allday = 'true'"> 
     356                      <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     357                        All day 
     358                      </a> 
     359                    </xsl:when> 
    355360                    <xsl:when test="start/time!=''"> 
    356361                      <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    …… 
    366371                      </a> 
    367372                    </xsl:when> 
    368                     <xsl:otherwise> 
    369                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    370                         All day 
    371                       </a> 
    372                     </xsl:otherwise> 
    373373                  </xsl:choose> 
    374374                </td> 
    375375                <td class="{$dateRangeStyle}" style="text-align:center;padding:0em;"> 
    376376                  <xsl:choose> 
     377                    <xsl:when test="end/allday = 'true'"><!-- do nothing --> 
     378                    </xsl:when> 
    377379                    <xsl:when test="end/time!=''"> 
    378380                      <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    …… 
    405407                <xsl:variable name="descriptionClass"> 
    406408                  <xsl:choose> 
    407                     <xsl:when test="contains(summary,'CANCELLED')">description cancelled</xsl:when> 
     409                    <xsl:when test="priority='cancelled'">description cancelled</xsl:when> 
    408410                    <xsl:otherwise>description</xsl:otherwise> 
    409411                  </xsl:choose> 

  • trunk/calendar3/webclient/war/docs/calendars.jsp

    r2 r92  
    77  <%-- List of all calendars and subcalendars. --%> 
    88  <calendars> 
     9     <bean:define id="calendar" name="calForm" property="publicCalendars" 
     10             toScope="session" /> 
     11    <%@include file="/docs/emitCalendar.jsp"%> 
     12 
     13    <!-- old 2.3 code: keep for a short while 
    914    <logic:present name="calForm" property="publicCalendars" > 
    1015      <bean:define id="calendars" name="calForm" property="publicCalendars" /> 
    …… 
    1419      </logic:iterate> 
    1520    </logic:present> 
     21    --> 
    1622  </calendars> 
    1723