Changeset 3272

Show
Ignore:
Timestamp:
05/31/11 22:24:42
Author:
johnsa
Message:

public web client theme: correct xsl in ongoing events listing to ensure that recurring events appear

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.6/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/ongoing.xsl

    r2652 r3272  
    1414            select="/bedework/eventscalendar/year/month/week/day/event[categories/category[uid = $ongoingEventsCatUid]]"> 
    1515            <xsl:sort select="start/unformatted" order="ascending" data-type="number" /> 
    16             <xsl:sort select="id" data-type="number" /> 
    17             <xsl:variable name="lastId" select="id" /> 
    18             <xsl:if test="not(preceding::event[id=$lastId])"> 
     16            <xsl:sort select="guid" order="ascending" /> 
     17            <xsl:variable name="lastId" select="guid" /> 
     18            <xsl:if test="not(preceding::event[guid=$lastId])"> 
    1919              <xsl:call-template name="ongoingEvent" /> 
    2020            </xsl:if> 

  • releases/bedework-3.7/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/ongoing.xsl

    r2837 r3272  
    3232            select="/bedework/eventscalendar/year/month/week/day/event[categories/category[uid = $ongoingEventsCatUid]]"> 
    3333            <xsl:sort select="start/unformatted" order="ascending" data-type="number" /> 
    34             <xsl:sort select="id" data-type="number" /> 
    35             <xsl:variable name="lastId" select="id" /> 
    36             <xsl:if test="not(preceding::event[id=$lastId])"> 
     34            <xsl:sort select="guid" order="ascending" /> 
     35            <xsl:variable name="lastId" select="guid" /> 
     36            <xsl:if test="not(preceding::event[guid=$lastId])"> 
    3737              <xsl:call-template name="ongoingEvent" /> 
    3838            </xsl:if> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/ongoing.xsl

    r2837 r3272  
    3232            select="/bedework/eventscalendar/year/month/week/day/event[categories/category[uid = $ongoingEventsCatUid]]"> 
    3333            <xsl:sort select="start/unformatted" order="ascending" data-type="number" /> 
    34             <xsl:sort select="id" data-type="number" /> 
    35             <xsl:variable name="lastId" select="id" /> 
    36             <xsl:if test="not(preceding::event[id=$lastId])"> 
     34            <xsl:sort select="guid" order="ascending" /> 
     35            <xsl:variable name="lastId" select="guid" /> 
     36            <xsl:if test="not(preceding::event[guid=$lastId])"> 
    3737              <xsl:call-template name="ongoingEvent" /> 
    3838            </xsl:if>