Changeset 2491

Show
Ignore:
Timestamp:
12/16/09 21:57:50
Author:
bleibson
Message:

o Needed to set the mode in some calls to the event template where they weren't set. This closes http://www.bedework.org/trac/bedework/ticket/489,

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-html.xsl

    r2490 r2491  
    10211021    <li> 
    10221022      <!-- <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass} {$subscriptionClass}"> --> 
    1023             <a href="{$bwCacheHostUrl}/v1.0/event/list-html/{$recurrenceId}/{$guid}" class="{$eventClass} {$subscriptionClass}"> 
    1024         <xsl:if test="status='CANCELLED'"><xsl:copy-of select="$bwStr-EvCG-CanceledColon"/><xsl:text> </xsl:text></xsl:if> 
     1023          <a href="{$bwCacheHostUrl}/v1.0/event/list-html/{$recurrenceId}/{$guid}" class="{$eventClass} {$subscriptionClass}"> 
     1024      <xsl:if test="status='CANCELLED'"><xsl:copy-of select="$bwStr-EvCG-CanceledColon"/><xsl:text> </xsl:text></xsl:if> 
     1025      <xsl:choose> 
     1026        <xsl:when test="start/shortdate != ../shortdate"> 
     1027          <xsl:copy-of select="$bwStr-EvCG-Cont"/> 
     1028        </xsl:when> 
     1029        <xsl:when test="start/allday = 'false'"> 
     1030          <xsl:value-of select="start/time"/>: 
     1031        </xsl:when> 
     1032        <xsl:otherwise> 
     1033          <xsl:copy-of select="$bwStr-EvCG-AllDayColon"/> 
     1034        </xsl:otherwise> 
     1035      </xsl:choose> 
     1036      <xsl:value-of select="summary"/> 
     1037      <xsl:variable name="eventTipClass"> 
    10251038        <xsl:choose> 
    1026           <xsl:when test="start/shortdate != ../shortdate"> 
    1027             <xsl:copy-of select="$bwStr-EvCG-Cont"/> 
    1028           </xsl:when> 
    1029           <xsl:when test="start/allday = 'false'"> 
    1030             <xsl:value-of select="start/time"/>: 
    1031           </xsl:when> 
     1039          <xsl:when test="$dayPos &gt; 5"> 
     1040                eventTipReverse 
     1041              </xsl:when> 
    10321042          <xsl:otherwise> 
    1033             <xsl:copy-of select="$bwStr-EvCG-AllDayColon"/> 
    1034           </xsl:otherwise> 
     1043                eventTip 
     1044             </xsl:otherwise> 
    10351045        </xsl:choose> 
    1036         <xsl:value-of select="summary"/> 
    1037         <xsl:variable name="eventTipClass"> 
    1038           <xsl:choose> 
    1039             <xsl:when test="$dayPos &gt; 5">eventTipReverse</xsl:when> 
    1040             <xsl:otherwise>eventTip</xsl:otherwise> 
    1041           </xsl:choose> 
    1042         </xsl:variable> 
     1046      </xsl:variable> 
    10431047        <span class="{$eventTipClass}"> 
    10441048          <xsl:if test="status='CANCELLED'"><span class="eventTipStatusCancelled"><xsl:copy-of select="$bwStr-EvCG-CanceledColon"/></span></xsl:if> 
     
    10651069              </xsl:if> 
    10661070            </xsl:otherwise> 
    1067           </xsl:choose><br/> 
     1071          </xsl:choose> 
     1072          <br/> 
    10681073          <xsl:if test="location/address"> 
    10691074            <xsl:copy-of select="$bwStr-EvCG-Location"/><xsl:text> </xsl:text><xsl:value-of select="location/address"/><br/> 
     
    12381243            <xsl:choose> 
    12391244                  <xsl:when test="$group = 'all'"> 
    1240                 <xsl:apply-templates select="event[categories/category/id = $catid]">   
     1245                <xsl:apply-templates select="event[categories/category/id = $catid] mode="calendarLayout"">   
    12411246                  <xsl:with-param name="dayPos" select="$dayPos"/> 
    12421247                </xsl:apply-templates>  
    12431248              </xsl:when> 
    12441249              <xsl:otherwise> 
    1245                 <xsl:apply-templates select="event[categories/category/id = $catid]"> 
     1250                <xsl:apply-templates select="event[categories/category/id = $catid] mode="calendarLayout""> 
    12461251                  <xsl:with-param name="dayPos" select="$dayPos"/> 
    12471252                </xsl:apply-templates> 
     
    12601265                        <xsl:choose> 
    12611266                          <xsl:when test="$list = 'all'"> 
    1262                     <xsl:apply-templates select="event"
     1267                    <xsl:apply-templates select="event" mode="calendarLayout"
    12631268                          <xsl:with-param name="dayPos" select="$dayPos"/> 
    12641269                        </xsl:apply-templates>