Changeset 115

Show
Ignore:
Timestamp:
02/07/06 17:04:44
Author:
johnsa
Message:

adding cal and category icons for calendar tree in public view
modifying public calendar tree in stylesheets

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css

    r114 r115  
    523523#yearCalendarTable table.yearViewMonthTable { 
    524524  margin: 0em  1em 0.5em 1em; 
     525  border: 1px solid #ddd; 
    525526} 
    526527#yearCalendarTable table.yearViewMonthTable td { 

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

    r114 r115  
    958958      <tr> 
    959959        <td class="leftCell"> 
    960           <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]"/> 
     960          <ul class="calendarTree"> 
     961            <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]" mode="calTree"/> 
     962          </ul> 
    961963        </td> 
    962964        <td> 
    963           <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]"/> 
    964         </td> 
    965       </tr> 
    966     </table> 
    967   </xsl:template> 
    968  
    969   <xsl:template match="calendar"> 
     965          <ul class="calendarTree"> 
     966            <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]" mode="calTree"/> 
     967          </ul> 
     968        </td> 
     969      </tr> 
     970    </table> 
     971  </xsl:template> 
     972 
     973  <xsl:template match="calendar" mode="calTree"> 
     974    <xsl:variable name="itemClass"> 
     975      <xsl:choose> 
     976        <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     977        <xsl:otherwise>calendar</xsl:otherwise> 
     978      </xsl:choose> 
     979    </xsl:variable> 
    970980    <xsl:variable name="url" select="url"/> 
    971     <h2><a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a></h2> 
    972     <ul> 
    973       <xsl:for-each select="calendar"> 
    974         <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 
    975         <xsl:variable name="url" select="url"/> 
    976         <li><a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a></li> 
    977       </xsl:for-each> 
    978     </ul> 
     981    <li class="{$itemClass}"> 
     982      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a> 
     983      <xsl:if test="calendar"> 
     984        <ul> 
     985          <xsl:apply-templates select="calendar" mode="calTree"/> 
     986        </ul> 
     987      </xsl:if> 
     988    </li> 
    979989  </xsl:template> 
    980990 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/rensselaer.css

    r114 r115  
    675675  padding-left: 0; 
    676676} 
     677#calendarTree li.folder { 
     678  list-style-image: url(../../resources/catIcon.gif); 
     679} 
     680#calendarTree li.calendar { 
     681  list-style-image: url(../../resources/calIcon-sm.gif); 
     682} 
    677683.noEventsCell { 
    678684  padding: 1em; 

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

    r114 r115  
    930930      <tr> 
    931931        <td class="leftCell"> 
    932           <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]"/> 
     932          <ul class="calendarTree"> 
     933            <xsl:apply-templates select="calendar/calendar[position() &lt;= floor($topLevelCalCount div 2)]" mode="calTree"/> 
     934          </ul> 
    933935        </td> 
    934936        <td> 
    935           <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]"/> 
    936         </td> 
    937       </tr> 
    938     </table> 
    939   </xsl:template> 
    940  
    941   <xsl:template match="calendar"> 
     937          <ul class="calendarTree"> 
     938            <xsl:apply-templates select="calendar/calendar[position() &gt; floor($topLevelCalCount div 2)]" mode="calTree"/> 
     939          </ul> 
     940        </td> 
     941      </tr> 
     942    </table> 
     943  </xsl:template> 
     944 
     945  <xsl:template match="calendar" mode="calTree"> 
     946    <xsl:variable name="itemClass"> 
     947      <xsl:choose> 
     948        <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     949        <xsl:otherwise>calendar</xsl:otherwise> 
     950      </xsl:choose> 
     951    </xsl:variable> 
    942952    <xsl:variable name="url" select="url"/> 
    943     <h2><a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a></h2> 
    944     <ul> 
    945       <xsl:for-each select="calendar"> 
    946         <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 
    947         <xsl:variable name="url" select="url"/> 
    948         <li><a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a></li> 
    949       </xsl:for-each> 
    950     </ul> 
     953    <li class="{$itemClass}"> 
     954      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a> 
     955      <xsl:if test="calendar"> 
     956        <ul> 
     957          <xsl:apply-templates select="calendar" mode="calTree"/> 
     958        </ul> 
     959      </xsl:if> 
     960    </li> 
    951961  </xsl:template> 
    952962