Changeset 2477

Show
Ignore:
Timestamp:
12/14/09 00:45:11
Author:
johnsa
Message:

public client: more work on new default skin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/defaultTheme/ongoing.xsl

    r2474 r2477  
    88    <ul class="eventList"> 
    99      <xsl:for-each 
    10         select="/bedework/eventscalendar/year/month/week/day/event[(categories/category[value|word = 'Main']) and (categories/category[value|word = 'Ongoing']) and not(categories/category[value|word = 'Local'])]"> 
    11         <xsl:sort select="start/unformatted" order="ascending" 
    12           data-type="number" /> 
     10        select="/bedework/eventscalendar/year/month/week/day/event[categories/category[value|word = 'Ongoing']]"> 
     11        <xsl:sort select="start/unformatted" order="ascending" data-type="number" /> 
    1312        <xsl:sort select="id" data-type="number" /> 
    1413        <xsl:variable name="lastId" select="id" /> 
    1514        <xsl:if test="not(preceding::event[id=$lastId])"> 
    1615          <xsl:choose> 
    17             <xsl:when 
    18               test="(/bedework/appvar[key = 'group']/value = /bedework/urlPrefixes/groups/group/eventOwner) and (not(/bedework/appvar[key = 'category']/value) or (/bedework/appvar[key = 'category']/value = 'all'))"> 
     16            <xsl:when test="(/bedework/appvar[key = 'group']/value = /bedework/urlPrefixes/groups/group/eventOwner) and (not(/bedework/appvar[key = 'category']/value) or (/bedework/appvar[key = 'category']/value = 'all'))"> 
    1917              <xsl:variable name="creator" select="creator" /> 
    2018              <xsl:variable name="envgroup" select="/bedework/appvar[key = 'group']/value" /> 
     
    136134        </xsl:choose> 
    137135      </xsl:variable> 
    138       <xsl:if test="status != 'CONFIRMED'"> 
    139         <xsl:value-of select="status" /> 
    140         <xsl:text>: </xsl:text> 
    141       </xsl:if> 
    142       <xsl:value-of select="summary" /> 
     136      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     137        <xsl:if test="status != 'CONFIRMED'"> 
     138          <xsl:value-of select="status" /> 
     139          <xsl:text>: </xsl:text> 
     140        </xsl:if> 
     141        <xsl:value-of select="summary" /> 
     142      </a> 
    143143      , Ends 
    144144      <xsl:value-of select="end/shortdate" /> 
    145145      <xsl:text> </xsl:text> 
    146       <xsl:value-of select="end/time" /> 
    147       <xsl:text> |</xsl:text> 
    148       <a 
    149         href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    150         more 
    151       </a> 
    152       <xsl:text>|</xsl:text> 
     146      <xsl:if test="start/allday = 'false'"> 
     147        <xsl:value-of select="end/time" /> 
     148      </xsl:if> 
    153149    </li> 
    154150  </xsl:template>