Changeset 154

Show
Ignore:
Timestamp:
02/13/06 13:49:59
Author:
johnsa
Message:

updates to skin sets and simple stylesheet cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r142 r154  
    829829        <tr> 
    830830          <xsl:for-each select="day"> 
    831            <xsl:variable name="dayPos" select="position()"/> 
     831            <xsl:variable name="dayPos" select="position()"/> 
    832832            <xsl:choose> 
    833833              <xsl:when test="filler='true'"> 
    …… 
    880880        <span class="{$eventTipClass}"> 
    881881          <strong><xsl:value-of select="summary"/></strong><br/> 
    882           Time:  
     882          Time: 
    883883          <xsl:choose> 
    884884            <xsl:when test="start/allday = 'false'"> 
    885885              <xsl:value-of select="start/time"/> 
    886                - <xsl:value-of select="end/time"/>               
     886               - <xsl:value-of select="end/time"/> 
    887887            </xsl:when> 
    888888            <xsl:otherwise> 

  • trunk/calendar3/skins/webpublic/rensselaer/default/default/default.xsl

    r133 r154  
    214214            </td> 
    215215            <td class="centerCell"> 
    216                 &#160; 
     216              &#160; 
    217217            </td> 
    218218            <td class="rightCell rssPrint"> 
    219              <a href="javascript:window.print()" title="print this view"> 
     219              <a href="javascript:window.print()" title="print this view"> 
    220220                <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print 
    221221              </a> 
    …… 
    359359           <xsl:choose> 
    360360             <xsl:when test="/bedework/selectionState/selectionType = 'calendar'"> 
    361                Calendar: 
     361               Calendar: <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/> 
    362362               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    363363             </xsl:when> 
    …… 
    513513          <!-- was using abbrev dayname: substring(start/dayname,1,3) --> 
    514514          <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text> 
    515           <span class="time"><xsl:value-of select="start/time"/></span> 
    516           <xsl:if test="end/time != '' or end/longdate != start/longdate"> - </xsl:if> 
     515          <xsl:if test="start/allday = 'false'"> 
     516            <span class="time"><xsl:value-of select="start/time"/></span> 
     517          </xsl:if> 
     518          <xsl:if test="end/allday = 'false' or end/longdate != start/longdate"> - </xsl:if> 
    517519          <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> 
    518           <xsl:if test="end/time != ''"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
     520          <xsl:if test="end/allday = 'false'"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
     521          <xsl:if test="start/allday = 'true'"><span class="time"><em>(all day)</em></span></xsl:if> 
    519522        </td> 
    520523      </tr> 
    …… 
    840843        <span class="{$eventTipClass}"> 
    841844          <strong><xsl:value-of select="summary"/></strong><br/> 
    842           <xsl:if test="start/time != ''"> 
    843             Time: <xsl:value-of select="start/time"/> 
    844             <xsl:if test="end/time != ''"> 
    845               - <xsl:value-of select="end/time"/> 
    846             </xsl:if> 
    847             <br/> 
    848           </xsl:if> 
     845          Time: 
     846          <xsl:choose> 
     847            <xsl:when test="start/allday = 'false'"> 
     848              <xsl:value-of select="start/time"/> 
     849               - <xsl:value-of select="end/time"/> 
     850            </xsl:when> 
     851            <xsl:otherwise> 
     852              all day 
     853            </xsl:otherwise> 
     854          </xsl:choose><br/> 
    849855          <xsl:if test="location/address"> 
    850856            Location: <xsl:value-of select="location/address"/><br/> 
    …… 
    923929  <!--==== CALENDARS PAGE ====--> 
    924930  <xsl:template match="calendars"> 
    925     <xsl:variable name="topLevelCalCount" select="count(/bedework/calendars/calendar/calendar)"/> 
     931    <xsl:variable name="topLevelCalCount" select="count(calendar/calendar)"/> 
    926932    <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
    927933      <tr> 
    …… 
    938944        <td class="leftCell"> 
    939945          <ul class="calendarTree"> 
    940             <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]" mode="calTree"/> 
     946            <xsl:apply-templates select="calendar/calendar[position() &lt;= ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
    941947          </ul> 
    942948        </td> 
    943949        <td> 
    944950          <ul class="calendarTree"> 
    945             <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]" mode="calTree"/> 
     951            <xsl:apply-templates select="calendar/calendar[position() &gt; ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
    946952          </ul> 
    947953        </td> 
    …… 
    968974  </xsl:template> 
    969975 
     976  <!--==== FOOTER ====--> 
     977 
    970978  <xsl:template name="footer"> 
    971979    <div id="footer"> 
    …… 
    984992      <tr> 
    985993        <td class="leftCell"> 
    986           Based on the <a href="http://www.washington.edu/ucal/">University of Washington Calendar</a> 
     994          Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> 
    987995        </td> 
    988996        <td class="rightCell"> 
    989           <form name="skinSelectForm" method="get" action="{$setup}"> 
     997          <!--<form name="skinSelectForm" method="get" action="{$setup}"> 
    990998            skin selector: 
    991999            <select name="skinNameSticky" onChange="submit()"> 
    …… 
    9951003              <option value="rensselaer">Rensselaer</option> 
    9961004            </select> 
    997           </form> 
     1005          </form>--> 
    9981006        </td> 
    9991007      </tr>