Changeset 3491

Show
Ignore:
Timestamp:
03/04/12 10:38:43
Author:
johnsa
Message:

public client: support new setSelectionList action

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3289 r3491  
    4545  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup" /> 
    4646  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection" /> 
     47  <xsl:variable name="setSelectionList" select="/bedework/urlPrefixes/main/setSelectionList" /> 
    4748  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/calendar/fetchPublicCalendars" /> 
    4849  <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/main/setViewPeriod" /> 

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

    r3289 r3491  
    4545  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup" /> 
    4646  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection" /> 
     47  <xsl:variable name="setSelectionList" select="/bedework/urlPrefixes/main/setSelectionList" /> 
    4748  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/calendar/fetchPublicCalendars" /> 
    4849  <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/main/setViewPeriod" /> 

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

    r3289 r3491  
    4545  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup" /> 
    4646  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/main/setSelection" /> 
     47  <xsl:variable name="setSelectionList" select="/bedework/urlPrefixes/main/setSelectionList" /> 
    4748  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/calendar/fetchPublicCalendars" /> 
    4849  <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/main/setViewPeriod" /> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/header.xsl

    r3483 r3491  
    126126          <a 
    127127            href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"> 
    128             <xsl:if test="/bedework/periodname='Day' and /bedework/page != 'eventList'"> 
     128            <xsl:if test="/bedework/periodname='Day' and /bedework/page = 'eventscalendar'"> 
    129129              <xsl:attribute name="class"> 
    130130                <xsl:value-of select="$currentClass" /> 
    …… 
    137137          <a 
    138138            href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"> 
    139             <xsl:if test="/bedework/periodname='Week' and /bedework/page != 'eventList'"> 
     139            <xsl:if test="/bedework/periodname='Week' and /bedework/page = 'eventscalendar'"> 
    140140              <xsl:attribute name="class"> 
    141141                <xsl:value-of select="$currentClass" /> 
    …… 
    148148          <a 
    149149            href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"> 
    150             <xsl:if test="/bedework/periodname='Month' and /bedework/page != 'eventList'"> 
     150            <xsl:if test="/bedework/periodname='Month' and /bedework/page = 'eventscalendar'"> 
    151151              <xsl:attribute name="class"> 
    152152                <xsl:value-of select="$currentClass" /> 
    …… 
    159159          <a 
    160160            href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"> 
    161             <xsl:if test="/bedework/periodname='Year' and /bedework/page != 'eventList'"> 
     161            <xsl:if test="/bedework/periodname='Year' and /bedework/page = 'eventscalendar'"> 
    162162              <xsl:attribute name="class"> 
    163163                <xsl:value-of select="$currentClass" /> 
    …… 
    170170          <a 
    171171            href="{$setViewPeriod}&amp;viewType=todayView"> 
    172             <xsl:if test="/bedework/periodname='Today' and /bedework/page != 'eventList'"> 
     172            <xsl:if test="/bedework/periodname='Today' and /bedework/page = 'eventscalendar'"> 
    173173              <xsl:attribute name="class"> 
    174174                <xsl:value-of select="$currentClass" /> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/subscriptions.xsl

    r3483 r3491  
    104104                <xsl:attribute name="class">root</xsl:attribute> 
    105105                <a href="{$setSelection}"> 
     106            <xsl:attribute name="href"> 
     107              <xsl:choose> 
     108                <xsl:when test="/bedework/page = 'eventList'"><xsl:value-of select="$setSelectionList"/></xsl:when> 
     109                <xsl:otherwise><xsl:value-of select="$setSelection"/></xsl:otherwise> 
     110              </xsl:choose> 
     111            </xsl:attribute> 
    106112                  <xsl:copy-of select="$bwStr-LCol-All"/> 
    107113                </a> 
    …… 
    111117                  <xsl:attribute name="href"> 
    112118                    <xsl:choose> 
    113                       <xsl:when test="/bedework/page = 'eventList'"><xsl:value-of select="$listEvents"/>&amp;virtualPath=<xsl:value-of select="$encVirtualPath"/>&amp;setappvar=curCollection(<xsl:value-of select="$name"/>)</xsl:when> 
     119                      <xsl:when test="/bedework/page = 'eventList'"><xsl:value-of select="$setSelectionList"/>&amp;virtualPath=<xsl:value-of select="$encVirtualPath"/>&amp;setappvar=curCollection(<xsl:value-of select="$name"/>)</xsl:when> 
    114120                      <xsl:otherwise><xsl:value-of select="$setSelection"/>&amp;virtualPath=<xsl:value-of select="$encVirtualPath"/>&amp;setappvar=curCollection(<xsl:value-of select="$name"/>)</xsl:otherwise> 
    115121                    </xsl:choose> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl

    r3488 r3491  
    5757       subscriptions but (currently) has no hierarchy. View are maintained in the  
    5858       "Calendar Suite" tab of the admin web client. --> 
    59 <xsl:variable name="useViewsNav">true</xsl:variable> 
     59<xsl:variable name="useViewsNav">false</xsl:variable> 
    6060 
    6161  <!-- SUBSCRIPTIONS LISTING --> 
    …… 
    6565       the top level subscriptions will be shown with all folders closed. Generating  
    6666       the subscriptions listing requires a second request to the server (an ajax call).  --> 
    67 <xsl:variable name="useSubscriptionsNav">false</xsl:variable>   
     67<xsl:variable name="useSubscriptionsNav">true</xsl:variable>   
    6868   
    6969