Changeset 2121

Show
Ignore:
Timestamp:
04/08/09 23:59:42
Author:
johnsa
Message:

correcting some invalid html output

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/default/default/bedeworkAccess.xsl

    r2083 r2121  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 
     2<xsl:stylesheet 
     3  version="1.0" 
     4  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     5  xmlns="http://www.w3.org/1999/xhtml"> 
     6<xsl:output 
     7  method="xml" 
     8  indent="no" 
     9  media-type="text/html" 
     10  doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" 
     11  doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" 
     12  standalone="yes" 
     13  omit-xml-declaration="yes"/> 
    314  <xsl:template name="entityAccessForm"> 
    415    <xsl:param name="type"/><!-- optional: currently used for inbox and outbox to conditionally display scheduling access --> 

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

    r2119 r2121  
    15381538      </xsl:choose> 
    15391539    </xsl:variable> 
     1540    <xsl:variable name="calendarColor"> 
     1541      <xsl:choose> 
     1542        <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> 
     1543        <xsl:when test="calendar/color != ''"><xsl:value-of select="calendar/color"/></xsl:when> 
     1544      </xsl:choose> 
     1545    </xsl:variable> 
    15401546    <!-- Calendar colors are set in the add/modify calendar forms which, if present, 
    15411547         override the background-color set by eventClass. User styles should 
    …… 
    15441550      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" 
    15451551        class="{$eventRootClass} {$eventClass}"> 
    1546         <xsl:if test="status != 'CANCELLED' and calendar/color != ''"> 
    1547           <xsl:attribute name="style">background-color: <xsl:value-of select="calendar/color"/>; color: black;</xsl:attribute> 
     1552        <xsl:if test="status != 'CANCELLED' and $calendarColor != ''"> 
     1553          <xsl:attribute name="style">background-color: <xsl:value-of select="$calendarColor"/>; color: black;</xsl:attribute> 
    15481554        </xsl:if> 
    15491555        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    …… 
    25962602                      </xsl:otherwise> 
    25972603                    </xsl:choose> 
    2598                     <script language="JavaScript" type="text/javascript"> 
     2604                    <script type="text/javascript"> 
    25992605                      <xsl:comment> 
    26002606                      startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    …… 
    26082614                    </span --> 
    26092615                    <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 
    2610                     <script language="JavaScript" type="text/javascript"> 
     2616                    <script type="text/javascript"> 
    26112617                      <xsl:comment> 
    26122618                      $("#bwEventWidgetStartDate").datepicker({ 
    …… 
    26932699                        </xsl:otherwise> 
    26942700                      </xsl:choose> 
    2695                       <script language="JavaScript" type="text/javascript"> 
     2701                      <script type="text/javascript"> 
    26962702                      <xsl:comment> 
    26972703                        endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/'); 
    …… 
    27052711                      </span--> 
    27062712                      <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 
    2707                       <script language="JavaScript" type="text/javascript"> 
     2713                      <script type="text/javascript"> 
    27082714                        <xsl:comment> 
    27092715                        $("#bwEventWidgetEndDate").datepicker({ 
    …… 
    32943300                        <input type="hidden" name="bwEventUntilDate" id="bwEventUntilDate" size="10"/> 
    32953301                        <input type="text" name="bwEventWidgetUntilDate" id="bwEventWidgetUntilDate" size="10" onfocus="selectRecurCountUntil('recurUntil')"/> 
    3296                         <script language="JavaScript" type="text/javascript"> 
     3302                        <script type="text/javascript"> 
    32973303                          <xsl:comment> 
    32983304                          $("#bwEventWidgetUntilDate").datepicker({ 
    …… 
    35513557                         iconURL="{$resourcesRoot}/resources/calIcon.gif"/--> 
    35523558                  <input type="text" name="eventRdate.date" id="bwEventWidgetRdate" size="10"/> 
    3553                   <script language="JavaScript" type="text/javascript"> 
     3559                  <script type="text/javascript"> 
    35543560                    <xsl:comment> 
    35553561                    $("#bwEventWidgetRdate").datepicker({ 
    …… 
    48944900              <xsl:with-param name="colorFieldId">bwCalColor</xsl:with-param> 
    48954901            </xsl:call-template> 
    4896             <!-- select name="calendar.color"> 
    4897               <option value="">default</option> 
    4898               <xsl:for-each select="document('../../../bedework-common/default/default/subColors.xml')/subscriptionColors/color"> 
    4899                 <xsl:variable name="subColor" select="."/> 
    4900                 <xsl:variable name="subColorClass" select="@classname"/> 
    4901                 <option value="{$subColor}" style="background-color:{$subColor};color:black;"> 
    4902                   <xsl:value-of select="@name"/> 
    4903                 </option> 
    4904               </xsl:for-each> 
    4905             </select--> 
    49064902          </td> 
    49074903        </tr> 
    …… 
    55765572  </xsl:template> 
    55775573 
     5574  <!-- This template is deprecated --> 
    55785575  <xsl:template name="addPublicAlias"> 
    55795576    <h2>Subscribe to a Public Calendar</h2> 
    …… 
    68416838                  </xsl:choose> 
    68426839                </div> 
    6843                 <!--<script language="JavaScript" type="text/javascript"> 
     6840                <!--<script type="text/javascript"> 
    68446841                <xsl:comment> 
    68456842                  startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback'); 
    …… 
    68896886                    </xsl:choose> 
    68906887                  </div> 
    6891                   <!--<script language="JavaScript" type="text/javascript"> 
     6888                  <!--<script type="text/javascript"> 
    68926889                  <xsl:comment> 
    68936890                    endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback');