Changeset 2098

Show
Ignore:
Timestamp:
03/05/09 22:10:32
Author:
johnsa
Message:

public client: display name of current collection when one is selected

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2096 r2098  
    430430         <td class="leftCell"> 
    431431           <xsl:choose> 
    432              <xsl:when test="/bedework/selectionState/selectionType = 'calendar'"> 
    433                Calendar: <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/> 
    434                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     432             <xsl:when test="/bedework/selectionState/selectionType = 'collections'"> 
     433               Calendar: 
     434               <strong> 
     435                 <xsl:call-template name="substring-afterLastInstanceOf"> 
     436                   <xsl:with-param name="string" select="/bedework/appvar[key='curCollection']/value"/> 
     437                   <xsl:with-param name="char">/</xsl:with-param> 
     438                 </xsl:call-template> 
     439               </strong> 
    435440             </xsl:when> 
    436441             <xsl:when test="/bedework/selectionState/selectionType = 'search'"> 
    437442               Current search: <xsl:value-of select="/bedework/search"/> 
    438                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    439              </xsl:when> 
    440              <xsl:when test="/bedework/selectionState/selectionType = 'subscription'"> 
    441                Subscription: (not implemented yet) 
    442                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    443              </xsl:when> 
    444              <xsl:when test="/bedework/selectionState/selectionType = 'filter'"> 
    445                Filter: (not implemented yet) 
    446                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    447443             </xsl:when> 
    448444             <xsl:otherwise><!-- view --> 
    …… 
    463459                </select> 
    464460              </form> 
    465               <span class="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span> 
    466461             </xsl:otherwise> 
    467462           </xsl:choose> 
     463           <span class="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span> 
    468464         </td> 
    469465         <td class="rightCell"> 
    …… 
    14661462    <xsl:variable name="url" select="encodedPath"/> 
    14671463    <li class="{$itemClass}"> 
    1468       <a href="{$setSelection}&amp;calUrl={$url}" title="view calendar"><xsl:value-of select="name"/></a> 
     1464      <xsl:variable name="calPath" select="path"/> 
     1465      <a href="{$setSelection}&amp;calUrl={$url}&amp;setappvar=curCollection({$calPath})" title="view calendar"><xsl:value-of select="name"/></a> 
    14691466      <xsl:if test="calType != '0'"> 
    14701467        <xsl:variable name="calPath" select="path"/>