Changeset 1540

Show
Ignore:
Timestamp:
08/27/07 17:35:51
Author:
johnsa
Message:

user client: fix event links on freebusy page grid

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • releases/bedework-3.4/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1537 r1540  
    37233723          <xsl:apply-templates select="/bedework/freebusy" mode="freeBusyGrid"> 
    37243724            <xsl:with-param name="aggregation">true</xsl:with-param> 
     3725            <xsl:with-param name="type">meeting</xsl:with-param> 
    37253726          </xsl:apply-templates> 
    37263727 
     
    37353736  <xsl:template match="freebusy" mode="freeBusyGrid"> 
    37363737    <xsl:param name="aggregation">false</xsl:param> 
    3737     <!-- there's only one collection of freebusy; this for-each is 
    3738          being used to pick out just the freebusy node and 
    3739          shorten the select statements below. --> 
     3738    <xsl:param name="type">normal</xsl:param> 
    37403739      <table id="freeBusy"> 
    37413740        <tr> 
     
    38183817                  </xsl:choose> 
    38193818                </xsl:variable> 
    3820                 <a href="{$action}&amp;meetingStartdt={$startDate}&amp;meetingDuration={$meetingDuration}&amp;initDates=yes"> 
     3819                <xsl:variable name="urlString"> 
     3820                  <xsl:choose> 
     3821                   <xsl:when test="$type='meeting'"><xsl:value-of select="$action"/>&amp;meetingStartdt=<xsl:value-of select="$startDate"/>&amp;meetingDuration=<xsl:value-of select="$meetingDuration"/>&amp;initDates=yes</xsl:when> 
     3822                   <xsl:otherwise><xsl:value-of select="$action"/>&amp;startdate=<xsl:value-of select="$startDate"/>&amp;minutes=<xsl:value-of select="$meetingDuration"/></xsl:otherwise> 
     3823                 </xsl:choose> 
     3824                </xsl:variable> 
     3825                <a href="{$urlString}"> 
    38213826                  <xsl:choose> 
    38223827                    <xsl:when test="((numBusy &gt; 0) and (numBusy &lt; 9)) or ((numTentative &gt; 0) and (numTentative &lt; 9)) and (number(numBusy) + number(numTentative) &lt; 9)"> 
     
    40464051        <input type="submit" name="submit" value="Submit"/> 
    40474052      </form> 
    4048       <xsl:apply-templates select="." mode="freeBusyGrid"/> 
     4053      <xsl:apply-templates select="." mode="freeBusyGrid"> 
     4054        <xsl:with-param name="type">normal</xsl:with-param>  
     4055      </xsl:apply-templates> 
    40494056    </div> 
    40504057  </xsl:template>