Changeset 2302

Show
Ignore:
Timestamp:
07/28/09 16:24:53
Author:
johnsa
Message:

cleaning up of calendar color (as much as can be at the moment)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2235 r2302  
    133133          </xsl:otherwise> 
    134134        </xsl:choose> 
    135         <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
     135        <link rel="stylesheet" href="../../../bedework-common/default/default/subColors.css"/> 
    136136        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    137137        <!-- load javascript --> 
    …… 
    990990                     subscription styles should not be used for canceled events (tentative is ok). --> 
    991991                <xsl:variable name="subscriptionClass"> 
    992                   <xsl:if test="status != 'CANCELLED' and 
    993                                 subscription/subStyle != '' and 
    994                                 subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if> 
     992                  <xsl:if test="status != 'CANCELLED'"> 
     993                    <xsl:apply-templates select="categories" mode="customEventColor"/> 
     994                  </xsl:if> 
    995995                </xsl:variable> 
    996996                <td class="{$descriptionClass} {$subscriptionClass}"> 
    …… 
    13171317         subscription styles should not be used for cancelled events (tentative is ok). --> 
    13181318    <xsl:variable name="subscriptionClass"> 
    1319       <xsl:if test="status != 'CANCELLED' and 
    1320                     subscription/subStyle != '' and 
    1321                     subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if> 
     1319      <xsl:if test="status != 'CANCELLED'"> 
     1320        <xsl:apply-templates select="categories" mode="customEventColor"/> 
     1321      </xsl:if> 
    13221322    </xsl:variable> 
    13231323    <li> 
    …… 
    13831383      </a> 
    13841384    </li> 
     1385  </xsl:template> 
     1386 
     1387  <xsl:template match="categories" mode="customEventColor"> 
     1388    <!-- Set custom color schemes here. 
     1389         This template looks at the categories found in the event and 
     1390         returns a color class for use with the "subscriptionClass" variable. 
     1391         The classes suggested below come from bwColors.css found in the bedework-common directory. --> 
     1392    <xsl:choose> 
     1393       <!-- 
     1394       <xsl:when test="category/value = 'Athletics'">bwltpurple</xsl:when> 
     1395       <xsl:when test="category/value = 'Arts'">bwltsalmon</xsl:when> 
     1396       --> 
     1397       <xsl:otherwise></xsl:otherwise> <!-- do nothing --> 
     1398    </xsl:choose> 
    13851399  </xsl:template> 
    13861400 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2300 r2302  
    400400    <meta content="text/html;charset=utf-8" http-equiv="Content-Type" /> 
    401401    <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    402     <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
    403402    <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    404403    <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" />