Changeset 3431

Show
Ignore:
Timestamp:
12/05/11 15:48:02
Author:
johnsa
Message:

public client: take advantage of the subscriptions tree widget in the bedework theme (as set in the theme settings)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/de_DE/strings.xsl

    r3188 r3431  
    9696  <xsl:variable name="bwStr-LCol-JsMessage">Bitte aktivieren Javascript in ihrem Browser um den interaktiven Kalender anschauen zu k&#246;nnen.</xsl:variable> 
    9797  <xsl:variable name="bwStr-LCol-CalendarViews">Kalender Ansicht</xsl:variable> 
     98  <xsl:variable name="bwStr-LCol-Calendars">Kalender</xsl:variable> 
    9899  <xsl:variable name="bwStr-LCol-FilterOnCalendars">FILTER AUF KALENDER:</xsl:variable> 
    99100  <xsl:variable name="bwStr-LCol-ViewAllCalendars">Ansicht aller Kalender</xsl:variable> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl

    r3188 r3431  
    9696  <xsl:variable name="bwStr-LCol-JsMessage">To view the interactive calendar, please enable Javascript on your browser.</xsl:variable> 
    9797  <xsl:variable name="bwStr-LCol-CalendarViews">Calendar Views</xsl:variable> 
     98  <xsl:variable name="bwStr-LCol-Calendars">Calendars</xsl:variable> 
    9899  <xsl:variable name="bwStr-LCol-FilterOnCalendars">FILTER ON CALENDARS:</xsl:variable> 
    99100  <xsl:variable name="bwStr-LCol-ViewAllCalendars">View All Calendars</xsl:variable> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/es_ES/strings.xsl

    r3188 r3431  
    9696  <xsl:variable name="bwStr-LCol-JsMessage">Para ver la agenda interactiva, active Javascript en su navegador.</xsl:variable> 
    9797  <xsl:variable name="bwStr-LCol-CalendarViews">Vistas de Agenda</xsl:variable> 
     98  <xsl:variable name="bwStr-LCol-Calendars">Agendas</xsl:variable> 
    9899  <xsl:variable name="bwStr-LCol-FilterOnCalendars">FILTRAR AGENDAS:</xsl:variable> 
    99100  <xsl:variable name="bwStr-LCol-ViewAllCalendars">Ver Todas las Agendas</xsl:variable> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/bedework.xsl

    r2837 r3431  
    5858  <xsl:include href="leftColumn.xsl" /> 
    5959  <xsl:include href="views.xsl" /> 
     60  <xsl:include href="subscriptions.xsl" /> 
    6061  <xsl:include href="featuredEvents.xsl"/> 
    6162  <xsl:include href="navigation.xsl" /> 
     
    9394            <div id="contentSection"> 
    9495 
    95               <!-- LEFT COLUMN: calendar widget, views, and links --> 
     96              <!-- LEFT COLUMN: calendar widget, views, subscriptions, and links --> 
    9697              <xsl:call-template name="leftColumn" /> 
    9798 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/bwTheme.css

    r3427 r3431  
    430430 color: #DDB500; 
    431431} 
     432#subsTree { 
     433        margin: 1em 0 0 1em; 
     434} 
     435#subsTree ul li li { 
     436        margin: 0 0 0 2em; 
     437} 
    432438ul.sideLinksExpand { 
    433439 font-size: 1em; 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/javascript/bedework.js

    r2850 r3431  
    5656  linkWindow.focus(); 
    5757} 
     58// Using the subscriptions tree for navigation (as defined in themeSettings.xsl). 
     59// Get them and load them onto the page. 
     60function loadSubscriptions(containerId) { 
     61  $.getJSON('/feeder/calendar/fetchPublicCalendars.do?skinName=widget-json-cals', function(data) { 
     62    var subsTree = '<ul>' + buildSubsTree(data.bwCals.calendars) + '</ul>'; 
     63    $(containerId).html(subsTree); 
     64  }); 
     65} 
     66function buildSubsTree(calObj) { 
     67  var subsTreeHtml = ""; 
     68  $.each(calObj,function(i) { 
     69    if (this.calType < 2) { // show only calendars and folders 
     70      subsTreeHtml += "<li>" + this.name; 
     71      if(this.children != undefined) { 
     72        subsTreeHtml += "<ul>"; 
     73        subsTreeHtml += buildSubsTree(this.children); 
     74        subsTreeHtml += "</ul>"; 
     75      } 
     76      subsTreeHtml += "</li>"; 
     77    } 
     78  }); 
     79   
     80  return(subsTreeHtml); 
     81} 
    5882 
    5983// topLink is defined in themeSettings.xsl 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/leftColumn.xsl

    r2837 r3431  
    2626      <xsl:call-template name="jsDateSelectionCal" /> 
    2727      <div class="clear">&#160;</div> 
    28       <xsl:call-template name="viewList" /> 
     28      <xsl:if test="$useViewsNav = 'true'"> 
     29        <xsl:call-template name="viewList" /> 
     30      </xsl:if> 
     31      <xsl:if test="$useSubscriptionsNav = 'true'"> 
     32        <xsl:call-template name="subscriptionsTree" /> 
     33      </xsl:if> 
    2934      <xsl:call-template name="displaySideBar" /> 
    3035    </div> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl

    r3188 r3431  
    4545   
    4646 
     47   
     48  <!-- VIEWS and SUBSCRIPTIONS NAVIGATION TREES --> 
     49  <!-- In this theme, you can use the calendar suite's views,    
     50       its underlying calendar subscriptions, or both to construct the left navigation menu. 
     51       If both are used, you'll see both menus in the left menu bar. 
     52       Typically, you'll want to use one or the other. --> 
     53   
     54  <!-- VIEWS LISTING --> 
     55  <!-- "Views" provide an abstraction layer of arbitrary named collections of  
     56       subscriptions but (currently) has no hierarchy. View are maintained in the  
     57       "Calendar Suite" tab of the admin web client. --> 
     58<xsl:variable name="useViewsNav">false</xsl:variable> 
     59 
     60  <!-- SUBSCRIPTIONS LISTING --> 
     61  <!-- "Subscriptions" provide the full hierarchy of calendars within a calendar suite. 
     62       These are presented with an explorer-like navigation paradigm.  This listing 
     63       is managed in the "Calendar Suite" tab of the admin web client. By deafault,  
     64       the top level subscriptions will be shown with all folders closed. Generating  
     65       the subscriptions listing requires a second request to the server (an ajax call).  --> 
     66<xsl:variable name="useSubscriptionsNav">true</xsl:variable>   
     67   
     68   
     69   
     70   
    4771   
    4872