Changeset 121

Show
Ignore:
Timestamp:
02/08/06 11:07:24
Author:
johnsa
Message:

update to public client to display current selectionType

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r115 r121  
    467467         <td class="leftCell"> 
    468468           <xsl:choose> 
    469              <xsl:when test="/bedework/name!=''"> 
     469             <xsl:when test="/bedework/selectionType = 'calendar'"> 
     470               Calendar: 
     471               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     472             </xsl:when> 
     473             <xsl:when test="/bedework/selectionType = 'search'"> 
     474               Current search: <xsl:value-of select="/bedework/search"/> 
     475               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     476             </xsl:when> 
     477             <xsl:when test="/bedework/selectionType = 'subscription'"> 
     478               Subscription: (not implemented yet) 
     479               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     480             </xsl:when> 
     481             <xsl:when test="/bedework/selectionType = 'filter'"> 
     482               Filter: (not implemented yet) 
     483               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     484             </xsl:when> 
     485             <xsl:otherwise><!-- view --> 
    470486               View: 
    471487               <form name="selectViewForm" method="get" action="{$setSelection}"> 
     
    485501              </form> 
    486502              <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
    487              </xsl:when> 
    488              <xsl:when test="/bedework/search!=''"> 
    489                Current search: <xsl:value-of select="/bedework/search"/> 
    490                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    491              </xsl:when> 
     503             </xsl:otherwise> 
    492504           </xsl:choose> 
    493505         </td> 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/rensselaer.xsl

    r115 r121  
    432432    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="searchBarTable"> 
    433433       <tr> 
    434          <td class="leftCell"><xsl:choose> 
    435              <xsl:when test="/bedework/name!=''"> 
     434         <td class="leftCell"> 
     435           <xsl:choose> 
     436             <xsl:when test="/bedework/selectionType = 'calendar'"> 
     437               Calendar: 
     438               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     439             </xsl:when> 
     440             <xsl:when test="/bedework/selectionType = 'search'"> 
     441               Current search: <xsl:value-of select="/bedework/search"/> 
     442               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     443             </xsl:when> 
     444             <xsl:when test="/bedework/selectionType = 'subscription'"> 
     445               Subscription: (not implemented yet) 
     446               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     447             </xsl:when> 
     448             <xsl:when test="/bedework/selectionType = 'filter'"> 
     449               Filter: (not implemented yet) 
     450               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
     451             </xsl:when> 
     452             <xsl:otherwise><!-- view --> 
    436453               View: 
    437454               <form name="selectViewForm" method="get" action="{$setSelection}"> 
     
    451468              </form> 
    452469              <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
    453              </xsl:when> 
    454              <xsl:when test="/bedework/search!=''"> 
    455                Current search: <xsl:value-of select="/bedework/search"/> 
    456                <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    457              </xsl:when> 
     470             </xsl:otherwise> 
    458471           </xsl:choose> 
    459472         </td>