Changeset 1057

Show
Ignore:
Timestamp:
10/27/06 14:50:38
Author:
johnsa
Message:

updates to search result xml; produce bedework subscription colors in a more general way

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1056 r1057  
    17031703 
    17041704      <xsl:for-each select="/bedeworkadmin/categories/category"> 
    1705         <xsl:variable name="categoryKey" select="keyword"/> 
     1705        <xsl:variable name="categoryKey" select="normalize-space(keyword)"/> 
    17061706        <tr> 
    17071707          <td> 
    17081708            <a href="{$category-fetchForUpdate}&amp;categoryKey={$categoryKey}"> 
    1709               <xsl:copy-of select="keyword"/> 
     1709              <xsl:value-of select="keyword"/> 
    17101710            </a> 
    17111711          </td> 

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

    r1055 r1057  
    845845                          </xsl:if> 
    846846                        </em> 
     847                        - <xsl:value-of select="calendar/name"/> 
    847848                      </a> 
    848849                      <xsl:if test="link != ''"> 
    …… 
    855856                        <xsl:value-of select="summary"/> 
    856857                        <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
     858                         - <em><xsl:value-of select="calendar/name"/></em> 
    857859                      </a> 
    858860                    </xsl:otherwise> 
    …… 
    962964      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
    963965        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     966        <xsl:choose> 
     967          <xsl:when test="start/allday = 'false'"> 
     968            <xsl:value-of select="start/time"/>: 
     969          </xsl:when> 
     970          <xsl:otherwise> 
     971            all day: 
     972          </xsl:otherwise> 
     973        </xsl:choose> 
    964974        <xsl:value-of select="summary"/> 
    965975        <xsl:variable name="eventTipClass"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css

    r998 r1057  
    66   begin with a number, so all color classes are prepended with "c" */ 
    77 
    8 .cFFFFFF { 
    9   background-color: #FFFFFF !important; 
     8.bwwhite { 
     9  background-color: #ffffff !important; 
    1010  color: black; 
    1111} 
    12 .cFDDEEE { 
    13   background-color: #FDDEEE !important; 
     12.bwltpink { 
     13  background-color: #fddeee !important; 
    1414  color: black; 
    1515} 
    16 .cDDD4E8 { 
    17   background-color: #DDD4E8 !important; 
     16.bwltpurple { 
     17  background-color: #ddd4e8 !important; 
    1818  color: black; 
    1919} 
    20 .cBFD5E8 { 
    21   background-color: #BFD5E8 !important; 
     20.bwltsteelblue { 
     21  background-color: #bfd5e8 !important; 
    2222  color: black; 
    2323} 
    24 .cCCECEF { 
    25   background-color: #CCECEF !important; 
     24.bwltblue { 
     25  background-color: #ccecef !important; 
    2626  color: black; 
    2727} 
    28 .cB3E2DD { 
    29   background-color: #B3E2DD !important; 
     28.bwltaquamarine { 
     29  background-color: #b3e2dd !important; 
    3030  color: black; 
    3131} 
    32 .cCFECCF { 
    33   background-color: #CFECCF !important; 
     32.bwltaquamarine { 
     33  background-color: #cfeccf !important; 
    3434  color: black; 
    3535} 
    36 .cE0F3B0 { 
    37   background-color: #E0F3B0 !important; 
     36.bwltgreen { 
     37  background-color: #e0f3b0 !important; 
    3838  color: black; 
    3939} 
    40 .cFFFFB0 { 
    41   background-color: #FFFFB0 !important; 
     40.bwltyellow { 
     41  background-color: #ffffb0 !important; 
    4242  color: black; 
    4343} 
    44 .cFEEBC9 { 
    45   background-color: #FEEBC9 !important; 
     44.bwltsalmon { 
     45  background-color: #feebc9 !important; 
    4646  color: black; 
    4747} 
    4848/* medium pastels */ 
    49 .cEEEEEE { 
    50   background-color: #EEEEEE !important; 
     49.bwgray { 
     50  background-color: #eeeeee !important; 
    5151  color: black; 
    5252} 
    53 .cFBB6D1 { 
    54   background-color: #FBB6D1 !important; 
     53.bwpink { 
     54  background-color: #fbb6d1 !important; 
    5555  color: black; 
    5656} 
    57 .cC1B3D7 { 
    58   background-color: #C1B3D7 !important; 
     57.bwpurple { 
     58  background-color: #c1b3d7 !important; 
    5959  color: black; 
    6060  /* purple swallows up the default border color, so for this one alone, 
    …… 
    6262  border-bottom: 1px solid #999 !important; 
    6363} 
    64 .c94A8D0 { 
    65   background-color: #94A8D0 !important; 
     64.bwsteelblue { 
     65  background-color: #94a8d0 !important; 
    6666  color: black; 
    6767} 
    68 .c9ACEDF { 
    69   background-color: #9ACEDF !important; 
     68.bwblue { 
     69  background-color: #9acedf !important; 
    7070  color: black; 
    7171} 
    72 .c86CFBE { 
    73   background-color: #86CFBE !important; 
     72.bwaquamarine { 
     73  background-color: #86cfbe !important; 
    7474  color: black; 
    7575} 
    76 .cB5E1AE { 
    77   background-color: #B5E1AE !important; 
     76.bwseagreen { 
     77  background-color: #b5e1ae !important; 
    7878  color: black; 
    7979} 
    80 .cBFE476 { 
    81   background-color: #BFE476 !important; 
     80.bwgreen { 
     81  background-color: #bfe476 !important; 
    8282  color: black; 
    8383  /* gree swallows up the default border color, so for this one alone, 
    …… 
    8585  border-bottom: 1px solid #999 !important; 
    8686} 
    87 .cFFFA81 { 
    88   background-color: #FFFA81 !important; 
     87.bwyellow { 
     88  background-color: #fffa81 !important; 
    8989  color: black; 
    9090} 
    91 .cFDCAA2 { 
    92   background-color: #FDCAA2 !important; 
     91.bwsalmon { 
     92  background-color: #fdcaa2 !important; 
    9393  color: black; 
    9494} 
    9595/* dark pastels */ 
    96 .cDDDDDD { 
    97   background-color: #DDDDDD !important; 
     96.bwmdgray { 
     97  background-color: #dddddd !important; 
    9898  color: black; 
    9999} 
    100 .cF98CB6 { 
    101   background-color: #F98CB6 !important; 
     100.bwmdpink { 
     101  background-color: #f98cb6 !important; 
    102102  color: black; 
    103103} 
    104 .cA589C1 { 
    105   background-color: #A589C1 !important; 
     104.bwmdpurple { 
     105  background-color: #a589c1 !important; 
    106106  color: black; 
    107107} 
    108 .c7589BF { 
    109   background-color: #7589BF !important; 
     108.bwmdsteelblue { 
     109  background-color: #7589bf !important; 
    110110  color: black; 
    111111} 
    112 .c6FB7D6 { 
    113   background-color: #6FB7D6 !important; 
     112.bwmdblue { 
     113  background-color: #6fb7d6 !important; 
    114114  color: black; 
    115115} 
    116 .c48B5A3 { 
    117   background-color: #48B5A3 !important; 
     116.bwmdaquamarine { 
     117  background-color: #48b5a3 !important; 
    118118  color: black; 
    119119} 
    120 .c91D290 { 
    121   background-color: #91D290 !important; 
     120.bwmdseagreen { 
     121  background-color: #91d290 !important; 
    122122  color: black; 
    123123} 
    124 .c85CA5D { 
    125   background-color: #85CA5D !important; 
     124.bwmdgreen { 
     125  background-color: #85ca5d !important; 
    126126  color: black; 
    127127} 
    128 .cFFED62 { 
    129   background-color: #FFED62 !important; 
     128.bwmdyellow { 
     129  background-color: #ffed62 !important; 
    130130  color: black; 
    131131} 
    132 .cFCA985 { 
    133   background-color: #FCA985 !important; 
     132.bwmdsalmon { 
     133  background-color: #fca985 !important; 
    134134  color: black; 
    135135} 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml

    r998 r1057  
    33<subscriptionColors> 
    44  <!-- light pastels --> 
    5   <color name="white">cFFFFFF</color> 
    6   <color name="lt pink">cFDDEEE</color> 
    7   <color name="lt purple">cDDD4E8</color> 
    8   <color name="lt steelblue">cBFD5E8</color> 
    9   <color name="lt blue">cCCECEF</color> 
    10   <color name="lt aquamarine">cB3E2DD</color> 
    11   <color name="lt seagreen">cCFECCF</color> 
    12   <color name="lt green">cE0F3B0</color> 
    13   <color name="lt yellow">cFFFFB0</color> 
    14   <color name="lt salmon">cFEEBC9</color> 
     5  <color name="white">bwwhite</color> 
     6  <color name="lt pink">bwltpink</color> 
     7  <color name="lt purple">bwltpurple</color> 
     8  <color name="lt steelblue">bwltsteelblue</color> 
     9  <color name="lt blue">bwltblue</color> 
     10  <color name="lt aquamarine">bwltaquamarine</color> 
     11  <color name="lt seagreen">bwltaquamarine</color> 
     12  <color name="lt green">bwltgreen</color> 
     13  <color name="lt yellow">bwltyellow</color> 
     14  <color name="lt salmon">bwltsalmon</color> 
    1515 
    1616  <!-- medium pastels --> 
    17   <color name="gray">cEEEEEE</color> 
    18   <color name="pink">cFBB6D1</color> 
    19   <color name="purple">cC1B3D7</color> 
    20   <color name="steelblue">c94A8D0</color> 
    21   <color name="blue">c9ACEDF</color> 
    22   <color name="aquamarine">c86CFBE</color> 
    23   <color name="seagreen">cB5E1AE</color> 
    24   <color name="green">cBFE476</color> 
     17  <color name="gray">bwgray</color> 
     18  <color name="pink">bwpink</color> 
     19  <color name="purple">bwpurple</color> 
     20  <color name="steelblue">bwsteelblue</color> 
     21  <color name="blue">bwblue</color> 
     22  <color name="aquamarine">bwaquamarine</color> 
     23  <color name="seagreen">bwseagreen</color> 
     24  <color name="green">bwgreen</color> 
    2525  <!-- don't allow bright yellow - reserve for a hover color 
    26   <color name="yellow">cFFFA81</color> --> 
    27   <color name="salmon">cFDCAA2</color> 
     26  <color name="yellow">bwyellow</color> --> 
     27  <color name="salmon">bwsalmon</color> 
    2828 
    2929  <!-- dark pastels --> 
    30   <color name="md gray">cDDDDDD</color> 
    31   <color name="md pink">cF98CB6</color> 
    32   <color name="md purple">cA589C1</color> 
    33   <color name="md steelblue">c7589BF</color> 
    34   <color name="md blue">c6FB7D6</color> 
    35   <color name="md aquamarine">c48B5A3</color> 
    36   <color name="md seagreen">c91D290</color> 
    37   <color name="md green">c85CA5D</color> 
     30  <color name="md gray">bwmdgray</color> 
     31  <color name="md pink">bwmdpink</color> 
     32  <color name="md purple">bwmdpurple</color> 
     33  <color name="md steelblue">bwmdsteelblue</color> 
     34  <color name="md blue">bwmdblue</color> 
     35  <color name="md aquamarine">bwmdaquamarine</color> 
     36  <color name="md seagreen">bwmdseagreen</color> 
     37  <color name="md green">bwmdgreen</color> 
    3838  <!-- don't allow bright yellow - reserve for a hover color 
    39   <color name="md yellow">cFFED62</color> --> 
    40   <color name="md salmon">cFCA985</color> 
     39  <color name="md yellow">bwmdyellow</color> --> 
     40  <color name="md salmon">bwmdsalmon</color> 
    4141</subscriptionColors>