Changeset 2195

Show
Ignore:
Timestamp:
05/22/09 16:05:41
Author:
johnsa
Message:

check status and updated text cancelled to canceled

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/default/default/messages.xsl

    r2021 r2195  
    6565 
    6666      <xsl:when test="id='org.bedework.client.message.cancelled'"> 
    67           Action cancelled. 
     67          Action canceled. 
    6868      </xsl:when> 
    6969 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2194 r2195  
    23332333              <input type="radio" name="eventStatus" value="CANCELLED"> 
    23342334                <xsl:if test="form/status = 'CANCELLED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    2335               </input>cancelled 
     2335              </input>canceled 
    23362336            </span> 
    23372337            <xsl:if test="$canEdit = 'false'"> 
    …… 
    53115311            <input type="radio" value="CONFIRMED" name="status"/> confirmed<br/> 
    53125312            <input type="radio" value="TENTATIVE" name="status"/> tentative<br/> 
    5313             <input type="radio" value="CANCELLED" name="status"/> cancelled<br/> 
     5313            <input type="radio" value="CANCELLED" name="status"/> canceled<br/> 
    53145314          </td> 
    53155315        </tr> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl

    r2173 r2195  
    213213    </xsl:variable> 
    214214    <h2 class="{$statusClass}"> 
    215       <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     215      <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    216216      <xsl:choose> 
    217217        <xsl:when test="link != ''"> 
    …… 
    546546                </td> 
    547547                <td class="description"> 
    548                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     548                  <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    549549                  <xsl:choose> 
    550550                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 

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

    r2194 r2195  
    451451               <form name="selectViewForm" method="post" action="{$setSelection}"> 
    452452                <select name="viewName" onchange="submit()" > 
     453                  <xsl:if test="/bedework/page = 'eventList'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    453454                  <xsl:for-each select="/bedework/views/view"> 
    454455                    <xsl:variable name="name" select="name"/> 
    …… 
    588589       link to this event 
    589590     </a> 
    590       <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     591      <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    591592      <xsl:choose> 
    592593        <xsl:when test="link != ''"> 
    …… 
    987988                     These are set in the add/modify subscription forms in the admin client; 
    988989                     if present, these override the background-color set by eventClass. The 
    989                      subscription styles should not be used for cancelled events (tentative is ok). --> 
     990                     subscription styles should not be used for canceled events (tentative is ok). --> 
    990991                <xsl:variable name="subscriptionClass"> 
    991992                  <xsl:if test="status != 'CANCELLED' and 
    …… 
    994995                </xsl:variable> 
    995996                <td class="{$descriptionClass} {$subscriptionClass}"> 
    996                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     997                  <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    997998                  <xsl:choose> 
    998999                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    …… 
    10721073  <xsl:template match="events" mode="eventList"> 
    10731074    <h2 class="bwStatusConfirmed"> 
    1074       Next 7 Days 
    1075       <!-- xsl:choose> 
    1076         <xsl:when test="/bedework/now/longdate = /bedework/events/event[position()=last()]/start/longdate"><xsl:value-of select="/bedework/now/longdate"/></xsl:when> 
    1077         <xsl:otherwise><xsl:value-of select="/bedework/now/longdate"/> - <xsl:value-of select="/bedework/events/event[position()=last()]/start/longdate"/></xsl:otherwise> 
    1078       </xsl:choose--> 
     1075      <!-- <form name="bwListEventsForm" action="{$listEvents}" method="post"> 
     1076        <input type="hidden" name="setappvar"/>--> 
     1077        Next 7 Days 
     1078        <!-- 
     1079        <span id="bwListEventsFormControls"> 
     1080          <select name="catuid" onchange="this.form.submit();"> 
     1081            <option value="">filter by category...</option> 
     1082            <xsl:for-each select="/bedework/categories/category"> 
     1083              <option> 
     1084                <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     1085                <xsl:value-of select="keyword"/> 
     1086              </option> 
     1087            </xsl:for-each> 
     1088          </select> 
     1089          <select name="days" onchange="this.form.submit();"> 
     1090            <xsl:call-template name="buildListEventsDaysOptions"> 
     1091              <xsl:with-param name="i">1</xsl:with-param> 
     1092              <xsl:with-param name="total">31</xsl:with-param> 
     1093            </xsl:call-template> 
     1094          </select> 
     1095        </span> 
     1096      </form>--> 
    10791097    </h2> 
    10801098 
    …… 
    10991117                </xsl:attribute> 
    11001118 
    1101                 <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     1119                <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    11021120                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    11031121 
    …… 
    11791197      </ul> 
    11801198    </div> 
     1199  </xsl:template> 
     1200 
     1201  <xsl:template name="buildListEventsDaysOptions"> 
     1202    <xsl:param name="i">1</xsl:param> 
     1203    <xsl:param name="total">31</xsl:param> 
     1204    <xsl:param name="default">7</xsl:param> 
     1205    <xsl:variable name="selected"><xsl:value-of select="/bedework/appvar[key='listEventsDays']/value"/></xsl:variable> 
     1206 
     1207    <option onclick="this.form.setappvar.value='listEventsDay({$i})'"> 
     1208      <xsl:attribute name="value"><xsl:value-of select="$i"/></xsl:attribute> 
     1209      <xsl:if test="($selected != '' and $i = $selected) or ($selected = '' and $i = $default)"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1210      <xsl:value-of select="$i"/> 
     1211    </option> 
     1212 
     1213    <xsl:if test="$i &lt; $total"> 
     1214      <xsl:call-template name="buildListEventsDaysOptions"> 
     1215        <xsl:with-param name="i"><xsl:value-of select="$i + 1"/></xsl:with-param> 
     1216        <xsl:with-param name="total"><xsl:value-of select="$total"/></xsl:with-param> 
     1217        <xsl:with-param name="default"><xsl:value-of select="$default"/></xsl:with-param> 
     1218      </xsl:call-template> 
     1219    </xsl:if> 
     1220 
    11811221  </xsl:template> 
    11821222 
    …… 
    12831323    <li> 
    12841324      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
    1285         <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     1325        <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    12861326        <xsl:choose> 
    12871327          <xsl:when test="start/shortdate != ../shortdate"> 
    …… 
    13031343        </xsl:variable> 
    13041344        <span class="{$eventTipClass}"> 
    1305           <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELLED</span></xsl:if> 
     1345          <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELED</span></xsl:if> 
    13061346          <xsl:if test="status='TENTATIVE'"><span class="eventTipStatusTentative">TENTATIVE</span></xsl:if> 
    13071347          <strong><xsl:value-of select="summary"/></strong><br/> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/js-list.xsl

    r2173 r2195  
    7474    <!-- finally, produce the javascript --> 
    7575    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    76     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     76    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
    7777    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    7878  </xsl:template> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl

    r2173 r2195  
    7474    <!-- finally, produce the javascript --> 
    7575    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    76     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     76    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
    7777    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    7878  </xsl:template> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss-list.xsl

    r2173 r2195  
    8989  <xsl:template match="event"> 
    9090    <item> 
    91       <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
     91      <title><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    9292      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    …… 
    111111        --><xsl:text> </xsl:text><!-- 
    112112        --><xsl:value-of select="description"/><!-- 
    113         --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!-- 
     113        --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELED)</xsl:if><!-- 
    114114      --></description> 
    115115    </item> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl

    r2173 r2195  
    7878  <xsl:template match="event"> 
    7979    <item> 
    80       <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
     80      <title><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    8181      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    8282      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!-- 
    …… 
    100100        --><xsl:text> </xsl:text><!-- 
    101101        --><xsl:value-of select="description"/><!-- 
    102         --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!-- 
     102        --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELED)</xsl:if><!-- 
    103103      --></description> 
    104104    </item> 

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

    r2194 r2195  
    588588       link to this event 
    589589     </a> 
    590       <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     590      <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    591591      <xsl:choose> 
    592592        <xsl:when test="link != ''"> 
    …… 
    987987                     These are set in the add/modify subscription forms in the admin client; 
    988988                     if present, these override the background-color set by eventClass. The 
    989                      subscription styles should not be used for cancelled events (tentative is ok). --> 
     989                     subscription styles should not be used for canceled events (tentative is ok). --> 
    990990                <xsl:variable name="subscriptionClass"> 
    991991                  <xsl:if test="status != 'CANCELLED' and 
    …… 
    994994                </xsl:variable> 
    995995                <td class="{$descriptionClass} {$subscriptionClass}"> 
    996                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     996                  <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    997997                  <xsl:choose> 
    998998                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    …… 
    10991099                </xsl:attribute> 
    11001100 
    1101                 <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     1101                <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    11021102                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    11031103 
    …… 
    12751275         These are set in the add/modify subscription forms in the admin client; 
    12761276         if present, these override the background-color set by eventClass. The 
    1277          subscription styles should not be used for cancelled events (tentative is ok). --> 
     1277         subscription styles should not be used for canceled events (tentative is ok). --> 
    12781278    <xsl:variable name="subscriptionClass"> 
    12791279      <xsl:if test="status != 'CANCELLED' and 
    …… 
    12831283    <li> 
    12841284      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> 
    1285         <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     1285        <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    12861286        <xsl:choose> 
    12871287          <xsl:when test="start/shortdate != ../shortdate"> 
    …… 
    13031303        </xsl:variable> 
    13041304        <span class="{$eventTipClass}"> 
    1305           <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELLED</span></xsl:if> 
     1305          <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELED</span></xsl:if> 
    13061306          <xsl:if test="status='TENTATIVE'"><span class="eventTipStatusTentative">TENTATIVE</span></xsl:if> 
    13071307          <strong><xsl:value-of select="summary"/></strong><br/> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/rss-list.xsl

    r2173 r2195  
    8989  <xsl:template match="event"> 
    9090    <item> 
    91       <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
     91      <title><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    9292      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    …… 
    111111        --><xsl:text> </xsl:text><!-- 
    112112        --><xsl:value-of select="description"/><!-- 
    113         --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!-- 
     113        --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELED)</xsl:if><!-- 
    114114      --></description> 
    115115    </item> 

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

    r2191 r2195  
    940940                <xsl:if test="form/status = 'CANCELLED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    941941              </input> 
    942               cancelled 
     942              canceled 
    943943            </td> 
    944944          </tr> 
    …… 
    957957            <td class="fieldname"><em>Event URL:</em></td> 
    958958            <td class="fieldval"> 
    959               <input type="text" name="event.link" size="30" value=""> 
     959              <input type="text" name="eventLink" size="30" value=""> 
    960960                <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute> 
    961961              </input> 
    …… 
    16081608            <input type="radio" value="CONFIRMED" name="status"/> confirmed<br/> 
    16091609            <input type="radio" value="TENTATIVE" name="status"/> tentative<br/> 
    1610             <input type="radio" value="CANCELLED" name="status"/> cancelled<br/> 
     1610            <input type="radio" value="CANCELLED" name="status"/> canceled<br/> 
    16111611          </td> 
    16121612        </tr> 

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

    r2193 r2195  
    11771177                <xsl:variable name="subStyle" select="subscription/subStyle"/> 
    11781178                <td class="{$descriptionClass} {$subStyle}"> 
    1179                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     1179                  <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    11801180                  <xsl:choose> 
    11811181                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    …… 
    13361336                </xsl:attribute> 
    13371337 
    1338                 <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
     1338                <xsl:if test="status='CANCELLED'"><strong>CANCELED: </strong></xsl:if> 
    13391339                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    13401340 
    …… 
    15431543    <!-- Calendar colors are set in the add/modify calendar forms which, if present, 
    15441544         override the background-color set by eventClass. User styles should 
    1545          not be used for cancelled events (tentative is ok). --> 
     1545         not be used for canceled events (tentative is ok). --> 
    15461546    <li> 
    15471547      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" 
    …… 
    15501550          <xsl:attribute name="style">background-color: <xsl:value-of select="$calendarColor"/>; color: black;</xsl:attribute> 
    15511551        </xsl:if> 
    1552         <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     1552        <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    15531553        <xsl:choose> 
    15541554          <xsl:when test="start/shortdate != ../shortdate"> 
    …… 
    15771577        </xsl:variable> 
    15781578        <span class="{$eventTipClass}"> 
    1579           <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELLED</span></xsl:if> 
     1579          <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled">CANCELED</span></xsl:if> 
    15801580          <xsl:if test="status='TENTATIVE'"><span class="eventTipStatusTentative">TENTATIVE</span></xsl:if> 
    15811581          <xsl:choose> 
    …… 
    17681768    </xsl:variable> 
    17691769    <h2 class="{$statusClass}"> 
    1770       <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     1770      <xsl:if test="status='CANCELLED'">CANCELED: </xsl:if> 
    17711771      <xsl:choose> 
    17721772        <xsl:when test="link != ''"> 
    …… 
    30583058              <xsl:if test="form/status = 'CANCELLED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    30593059            </input> 
    3060             cancelled 
     3060            canceled 
    30613061          </td> 
    30623062        </tr> 
    …… 
    61126112            <input type="radio" value="CONFIRMED" name="status"/> confirmed<br/> 
    61136113            <input type="radio" value="TENTATIVE" name="status"/> tentative<br/> 
    6114             <input type="radio" value="CANCELLED" name="status"/> cancelled<br/> 
     6114            <input type="radio" value="CANCELLED" name="status"/> canceled<br/> 
    61156115          </td> 
    61166116        </tr> 
    …… 
    66226622        <xsl:choose> 
    66236623          <xsl:when test="scheduleMethod = '5'"> 
    6624             Meeting Cancelled 
     6624            Meeting Canceled 
    66256625          </xsl:when> 
    66266626          <xsl:when test="scheduleMethod = '8'"> 
    …… 
    66516651            <tr> 
    66526652              <td colspan="2" class="highlight"> 
    6653                 This meeting has been cancelled. 
     6653                This meeting has been canceled. 
    66546654              </td> 
    66556655            </tr> 
    …… 
    67666766                  <input type="hidden" name="method" value="REPLY"/> 
    67676767                  <select name="cancelAction"> 
    6768                     <option value="mark">mark event as cancelled</option> 
     6768                    <option value="mark">mark event as canceled</option> 
    67696769                    <option value="delete">delete event</option> 
    67706770                  </select> 
    …… 
    72817281                <input type="submit" value="accept / modify" name="accept"/> 
    72827282                <input type="submit" value="decline" name="decline"/> 
    7283                 <input type="submit" value="cancel" name="cancelled"/> 
     7283                <input type="submit" value="cancel" name="canceled"/> 
    72847284              </xsl:when> 
    72857285              <xsl:otherwise><!-- normal reply --> 
    72867286                <input type="submit" value="ok" name="update"/> 
    7287                 <input type="submit" value="cancel" name="cancelled"/> 
     7287                <input type="submit" value="cancel" name="canceled"/> 
    72887288              </xsl:otherwise> 
    72897289            </xsl:choose> 
    …… 
    78797879                  <xsl:attribute name="selected">selected</xsl:attribute> 
    78807880                </xsl:if> 
    7881                 set event status to CANCELLED 
     7881                set event status to CANCELED 
    78827882              </option> 
    78837883              <option value="2"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/rss-list.xsl

    r2173 r2195  
    8989  <xsl:template match="event"> 
    9090    <item> 
    91       <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
     91      <title><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    9292      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    …… 
    111111        --><xsl:text> </xsl:text><!-- 
    112112        --><xsl:value-of select="description"/><!-- 
    113         --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!-- 
     113        --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELED)</xsl:if><!-- 
    114114      --></description> 
    115115    </item>