Changeset 475

Show
Ignore:
Timestamp:
05/13/06 15:32:40
Author:
johnsa
Message:

adding styles and text to indicate status CANCELLED to personal client; including status for non CONFIRMED events in both user clients.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r474 r475  
    600600        </td> 
    601601      </tr> 
    602        <xsl:if test="cost!=''"> 
     602      <xsl:if test="status !='' and status != 'CONFIRMED'"> 
     603        <tr> 
     604          <td class="fieldname">Status:</td> 
     605          <td class="fieldval"> 
     606            <xsl:value-of select="status"/> 
     607          </td> 
     608        </tr> 
     609      </xsl:if> 
     610      <xsl:if test="cost!=''"> 
    603611        <tr> 
    604612          <td class="fieldname">Cost:</td> 
    …… 
    908916        </xsl:variable> 
    909917        <span class="{$eventTipClass}"> 
    910           <xsl:if test="status='CANCELLED'"><span class="eventTipStatus">CANCELLED</span></xsl:if> 
     918          <xsl:if test="status='CANCELLED'"><span class="eventTipStatus">CANCELLED: </span></xsl:if> 
    911919          <strong><xsl:value-of select="summary"/></strong><br/> 
    912920          Time: 

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

    r474 r475  
    961961        </xsl:variable> 
    962962        <span class="{$eventTipClass}"> 
    963           <xsl:if test="status='CANCELLED'"><span class="eventTipStatus">CANCELLED</span></xsl:if> 
     963          <xsl:if test="status='CANCELLED'"><span class="eventTipStatus">CANCELLED: </span></xsl:if> 
    964964          <strong><xsl:value-of select="summary"/></strong><br/> 
    965965          Time: 
    …… 
    10771077    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    10781078    <h2> 
     1079      <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    10791080      <xsl:choose> 
    10801081        <xsl:when test="link != ''"> 
    …… 
    12161217        </td> 
    12171218      </tr> 
     1219      <xsl:if test="status !='' and status != 'CONFIRMED'"> 
     1220        <tr> 
     1221          <td class="fieldname">Status:</td> 
     1222          <td class="fieldval"> 
     1223            <xsl:value-of select="status"/> 
     1224          </td> 
     1225        </tr> 
     1226      </xsl:if> 
    12181227      <xsl:if test="organizer"> 
    12191228        <tr>