Changeset 2353

Show
Ignore:
Timestamp:
08/18/09 09:34:00
Author:
johnsa
Message:

user client: restore of subscription colors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2307 r2353  
    15241524    <xsl:variable name="calendarColor"> 
    15251525      <xsl:choose> 
     1526        <xsl:when test="color and color != ''"><xsl:value-of select="color"/></xsl:when> 
    15261527        <xsl:when test="xproperties/X-BEDEWORK-ALIAS/values/text = /bedework/myCalendars//calendar/path"><xsl:value-of select="/bedework/myCalendars//calendar[path=xproperties/X-BEDEWORK-ALIAS/values/text]/color"/></xsl:when> 
    15271528        <xsl:when test="calendar/color != ''"><xsl:value-of select="calendar/color"/></xsl:when> 
    …… 
    51855186            <!-- type is defaulted to calendar.  It is changed when a typeSwitch is clicked. --> 
    51865187            <input type="hidden" value="calendar" name="type" id="bwCalType"/> 
    5187             <input type="radio" value="calendar" name="typeSwitch" checked="checked" onclick="changeClass('subscriptionTypes','invisible');changeClass('bwColorField','visible');setField('bwCalType',this.value);"/> Calendar 
    5188             <input type="radio" value="folder" name="typeSwitch" onclick="changeClass('subscriptionTypes','invisible');changeClass('bwColorField','invisible');bwUpdateColor('','bwCalColor');setField('bwCalType',this.value);"/> Folder 
    5189             <input type="radio" value="subscription" name="typeSwitch" onclick="changeClass('subscriptionTypes','visible');changeClass('bwColorField','invisible');bwUpdateColor('','bwCalColor');setField('bwCalType',this.value);"/> Subscription 
     5188            <input type="radio" value="calendar" name="typeSwitch" checked="checked" onclick="changeClass('subscriptionTypes','invisible');setField('bwCalType',this.value);"/> Calendar 
     5189            <input type="radio" value="folder" name="typeSwitch" onclick="changeClass('subscriptionTypes','invisible');setField('bwCalType',this.value);"/> Folder 
     5190            <input type="radio" value="subscription" name="typeSwitch" onclick="changeClass('subscriptionTypes','visible');setField('bwCalType',this.value);"/> Subscription 
    51905191          </td> 
    51915192        </tr> 
    …… 
    53605361          </td> 
    53615362        </tr> 
    5362         <xsl:if test="isSubscription='false'"> 
    5363           <!-- we can't color subscriptions yet --> 
    5364           <tr> 
    5365             <th>Color:</th> 
    5366             <td> 
    5367               <input type="text" name="calendar.color" id="bwCalColor" size="7"> 
    5368                 <xsl:attribute name="value"><xsl:value-of select="color"/></xsl:attribute> 
    5369                 <xsl:attribute name="style">background-color: <xsl:value-of select="color"/>;color: black;</xsl:attribute> 
    5370               </input> 
    5371               <xsl:call-template name="colorPicker"> 
    5372                 <xsl:with-param name="colorFieldId">bwCalColor</xsl:with-param> 
    5373               </xsl:call-template> 
    5374             </td> 
    5375           </tr> 
    5376         </xsl:if> 
     5363        <tr> 
     5364          <th>Color:</th> 
     5365          <td> 
     5366            <input type="text" name="calendar.color" id="bwCalColor" size="7"> 
     5367              <xsl:attribute name="value"><xsl:value-of select="color"/></xsl:attribute> 
     5368              <xsl:attribute name="style">background-color: <xsl:value-of select="color"/>;color: black;</xsl:attribute> 
     5369            </input> 
     5370            <xsl:call-template name="colorPicker"> 
     5371              <xsl:with-param name="colorFieldId">bwCalColor</xsl:with-param> 
     5372            </xsl:call-template> 
     5373          </td> 
     5374        </tr> 
    53775375        <tr> 
    53785376          <th>Display:</th> 
    …… 
    59745972          </tr> 
    59755973          <tr> 
    5976             <td class="fieldname">Style:</td> 
     5974            <td class="fieldname">Color:</td> 
    59775975            <td> 
    59785976              <select name="calendar.color"> 
    …… 
    60876085        </tr> 
    60886086        <tr> 
    6089           <td class="fieldname">Style:</td> 
     6087          <td class="fieldname">Color:</td> 
    60906088          <td> 
    60916089            <xsl:variable name="subStyle" select="style"/>