Changeset 220

Show
Ignore:
Timestamp:
02/27/06 15:43:04
Author:
johnsa
Message:

status CANCELLED taken into account in public client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r214 r220  
    519519        <th class="fieldname">Event:</th> 
    520520        <th class="fieldval"> 
     521          <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    521522          <xsl:choose> 
    522523            <xsl:when test="link != ''"> 
    …… 
    738739                <xsl:variable name="descriptionClass"> 
    739740                  <xsl:choose> 
    740                     <xsl:when test="priority='cancelled'">description cancelled</xsl:when> 
     741                    <xsl:when test="status='CANCELLED'">description cancelled</xsl:when> 
    741742                    <xsl:otherwise>description</xsl:otherwise> 
    742743                  </xsl:choose> 
    743744                </xsl:variable> 
    744745                <td class="{$descriptionClass}"> 
     746                  <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
    745747                  <xsl:choose> 
    746748                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    747749                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    748                         <strong><xsl:value-of select="summary"/>: </strong> 
     750                        <strong> 
     751                          <xsl:value-of select="summary"/>: 
     752                        </strong> 
    749753                        <xsl:value-of select="description"/>&#160; 
    750754                        <em> 
    …… 
    865869      <xsl:choose> 
    866870        <!-- Special styles for the month grid --> 
    867         <xsl:when test="status='cancelled'">eventCancelled</xsl:when> 
     871        <xsl:when test="status='CANCELLED'">eventCancelled</xsl:when> 
    868872        <xsl:when test="calendar/name='Holidays'">holiday</xsl:when> 
    869873        <!-- Alternating colors for all standard events --> 
    …… 
    874878    <li> 
    875879      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
     880        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    876881        <xsl:value-of select="summary"/> 
    877882        <xsl:variable name="eventTipClass"> 

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

    r200 r220  
    131131        </logic:iterate> 
    132132      </logic:present> 
    133     </categories> 
     133    </categories><%-- 
     134          Value: string, only one of CONFIRMED, TENTATIVE, or CANCELLED --%> 
     135    <status><bean:write name="event" property="status" /></status> 
    134136    <logic:present name="detailView" scope="request"><%-- 
    135137      Only output these attributes if we are in detailed mode... --%>