Changeset 138

Show
Ignore:
Timestamp:
02/09/06 20:59:37
Author:
johnsa
Message:

updates to time displays in public stylesheet based on new time model (more is needed here)

changed distribution of calendars listing in public stylesheet to make it more evenly distributed in two columns out of the box for the quickstart

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r134 r138  
    550550          <!-- was using abbrev dayname: substring(start/dayname,1,3) --> 
    551551          <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text> 
    552           <span class="time"><xsl:value-of select="start/time"/></span> 
    553           <xsl:if test="end/time != '' or end/longdate != start/longdate"> - </xsl:if> 
     552          <xsl:if test="start/allday = 'false'"> 
     553            <span class="time"><xsl:value-of select="start/time"/></span> 
     554          </xsl:if> 
     555          <xsl:if test="end/allday = 'false' or end/longdate != start/longdate"> - </xsl:if> 
    554556          <xsl:if test="end/longdate != start/longdate"><xsl:value-of select="substring(end/dayname,1,3)"/>, <xsl:value-of select="end/longdate"/><xsl:text> </xsl:text></xsl:if> 
    555           <xsl:if test="end/time != ''"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
     557          <xsl:if test="end/allday = 'false'"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
     558          <xsl:if test="start/allday = 'true'"><span class="time"><em>(all day)</em></span></xsl:if> 
    556559        </td> 
    557560      </tr> 
    …… 
    877880        <span class="{$eventTipClass}"> 
    878881          <strong><xsl:value-of select="summary"/></strong><br/> 
    879           <xsl:if test="start/time != ''"> 
    880             Time: <xsl:value-of select="start/time"/> 
    881             <xsl:if test="end/time != ''"> 
    882               - <xsl:value-of select="end/time"/> 
    883             </xsl:if> 
    884             <br/> 
    885           </xsl:if> 
     882          Time:  
     883          <xsl:choose> 
     884            <xsl:when test="start/allday = 'false'"> 
     885              <xsl:value-of select="start/time"/> 
     886               - <xsl:value-of select="end/time"/>               
     887            </xsl:when> 
     888            <xsl:otherwise> 
     889              all day 
     890            </xsl:otherwise> 
     891          </xsl:choose><br/> 
    886892          <xsl:if test="location/address"> 
    887893            Location: <xsl:value-of select="location/address"/><br/> 
    …… 
    960966  <!--==== CALENDARS PAGE ====--> 
    961967  <xsl:template match="calendars"> 
    962     <xsl:variable name="topLevelCalCount" select="count(/bedework/calendars/calendar/calendar)"/> 
     968    <xsl:variable name="topLevelCalCount" select="count(calendar/calendar)"/> 
    963969    <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
    964970      <tr> 
    …… 
    975981        <td class="leftCell"> 
    976982          <ul class="calendarTree"> 
    977             <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]" mode="calTree"/> 
     983            <xsl:apply-templates select="calendar/calendar[position() &lt;= ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
    978984          </ul> 
    979985        </td> 
    980986        <td> 
    981987          <ul class="calendarTree"> 
    982             <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]" mode="calTree"/> 
     988            <xsl:apply-templates select="calendar/calendar[position() &gt; ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
    983989          </ul> 
    984990        </td>