Changeset 2652

Show
Ignore:
Timestamp:
01/11/10 16:29:33
Author:
johnsa
Message:

public client: set ongoing events to use category uid rather than value (name)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2528 r2652  
    1010    <ul class="eventList"> 
    1111      <xsl:choose> 
    12         <xsl:when test="/bedework/eventscalendar//event[categories/category[value = $ongoingEventsCatName]]"> 
     12        <xsl:when test="/bedework/eventscalendar//event[categories/category[uid = $ongoingEventsCatUid]]"> 
    1313          <xsl:for-each 
    14             select="/bedework/eventscalendar/year/month/week/day/event[categories/category[value = $ongoingEventsCatName]]"> 
     14            select="/bedework/eventscalendar/year/month/week/day/event[categories/category[uid = $ongoingEventsCatUid]]"> 
    1515            <xsl:sort select="start/unformatted" order="ascending" data-type="number" /> 
    1616            <xsl:sort select="id" data-type="number" /> 

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

    r2651 r2652  
    4141       the javascript code expected. If you use the Share This 
    4242       service, you will likely want to turn off the Facebook  
    43        icon (above) as it is included in the service.  
     43       icon (above) as it is included already.  
    4444       See http://www.bedework.org/trac/bedework/wiki/BedeworkManual/v3.6/ShareThis --> 
    4545  <xsl:variable name="eventIconShareThis">true</xsl:variable>  
    …… 
    4747 
    4848  <!-- FEATURED EVENTS --> 
    49   <!-- display the featured event images? --> 
     49  <!-- Display the featured event images? --> 
    5050  <xsl:variable name="featuredEventsEnabled">true</xsl:variable> 
    5151  <xsl:variable name="featuredEventsAlwaysOn">false</xsl:variable> 
    …… 
    5959 
    6060  <!-- ONGOING EVENTS --> 
    61   <!-- use the ongoing events sidebar? --> 
    62   <!-- if ongoing events sidebar is enabled, 
     61  <!-- Use the ongoing events sidebar? --> 
     62  <!-- If ongoing events sidebar is enabled, 
    6363   you must set UseCategory for ongoing events to appear. --> 
    6464  <xsl:variable name="ongoingEventsEnabled">true</xsl:variable> 
    6565 
    66   <!-- use the specified category to mark an event as ongoing. 
    67        the CatName is for reference and is optional. The CatUid  
    68        is used for filtering out the ongoing events.  --> 
     66  <!-- Use the specified category to mark an event as ongoing.  --> 
    6967  <xsl:variable name="ongoingEventsUseCategory">true</xsl:variable> 
    70   <xsl:variable name="ongoingEventsCatName">sys/Ongoing</xsl:variable> 
     68  <!-- the following CatUid represents category "sys/Ongoing" --> 
    7169  <xsl:variable name="ongoingEventsCatUid">402881e7-25b99d14-0125-b9a50c22-00000002</xsl:variable> 
    7270 

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

    r2533 r2652  
    1515          <xsl:when test="$ongoingEventsAlwaysDisplayed = 'true'">true</xsl:when> 
    1616          <xsl:when test="$ongoingEventsUseCategory = 'true' and 
    17                           /bedework/eventscalendar//event/categories//category/value = $ongoingEventsCatName">true</xsl:when> 
     17                          /bedework/eventscalendar//event/categories//category/uid = $ongoingEventsCatUid">true</xsl:when> 
    1818          <xsl:otherwise>false</xsl:otherwise> 
    1919        </xsl:choose>