Changeset 2517

Show
Ignore:
Timestamp:
12/19/09 02:19:11
Author:
johnsa
Message:

public client: minor updates, list calendars page in place

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2509 r2517  
    199199 
    200200  <!--  xsl:template match="calendars" --> 
    201   <xsl:variable name="bwStr-Cals-AllTopicalAreas">All Topical Areas</xsl:variable> 
    202   <xsl:variable name="bwStr-Cals-SelectTopicalArea">Select a topical area from the list below to see only its events.</xsl:variable> 
     201  <xsl:variable name="bwStr-Cals-AllTopicalAreas">All Calendars</xsl:variable> 
     202  <xsl:variable name="bwStr-Cals-SelectTopicalArea">Select a calendar to see only its events.</xsl:variable> 
    203203 
    204204  <!--  xsl:template match="calendar" mode="calTree" --> 
    …… 
    208208  <!--  xsl:template match="currentCalendar" mode="export" --> 
    209209  <xsl:variable name="bwStr-Cals-ExportCals">Export Calendars as iCal</xsl:variable> 
    210   <xsl:variable name="bwStr-Cals-CalendarToExport">Calendar to export:</xsl:variable> 
     210  <xsl:variable name="bwStr-Cals-CalendarToExport">Exporting:</xsl:variable> 
    211211  <xsl:variable name="bwStr-Cals-Name">Name:</xsl:variable> 
    212212  <xsl:variable name="bwStr-Cals-Path">Path:</xsl:variable> 

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

    r2515 r2517  
    5454  <!-- DEFINE INCLUDES --> 
    5555  <!-- Theme preferences --> 
    56   <xsl:include href="themeSettings.xsl" /> 
    57  
     56  <xsl:include href="./themeSettings.xsl" /> 
     57s 
    5858  <!-- theme utility functions --> 
    59   <xsl:include href="themeUtil.xsl" /> 
     59  <xsl:include href="./themeUtil.xsl" /> 
    6060 
    6161  <!-- Page subsections --> 
    62   <xsl:include href="head.xsl" /> 
    63   <xsl:include href="header.xsl" /> 
    64   <xsl:include href="leftColumn.xsl" /> 
     62  <xsl:include href="./head.xsl" /> 
     63  <xsl:include href="./header.xsl" /> 
     64  <xsl:include href="./leftColumn.xsl" /> 
    6565  <xsl:include href="views.xsl" /> 
    6666  <xsl:include href="featuredEvents.xsl"/> 

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

    r2511 r2517  
    77  <!-- list of available calendars --> 
    88  <xsl:template match="calendars"> 
    9     <xsl:variable name="topLevelCalCount" 
    10       select="count(calendar/calendar)" /> 
     9    <xsl:variable name="topLevelCalCount" select="count(calendar/calendar[calType != 5 and calType != 6 and name != 'calendar'])"/> 
    1110 
    1211    <div class="secondaryColHeader"> 
    1312      <h3><xsl:copy-of select="$bwStr-Cals-AllTopicalAreas"/></h3> 
    1413    </div> 
     14    <p class="info"> 
     15      <xsl:copy-of select="$bwStr-Cals-SelectTopicalArea"/> 
     16    </p> 
    1517 
    16     <ul class="calendarTree"> 
    17       <li> 
    18         <a class="breadcrumb" href="/cal/"> 
    19           « Return to Main Calendar 
    20         </a> 
    21       </li> 
    22       <xsl:apply-templates select="calendar/calendar" 
    23         mode="calTree" /> 
    24     </ul> 
     18    <!-- adjust the following calculations to get a balanced layout between the cells --> 
     19    <div class="calendarList"> 
     20      <ul class="calendarTree"> 
     21        <xsl:apply-templates select="calendar/calendar[(calType != 5 and calType != 6 and name != 'calendar') and (position() &lt;= ceiling($topLevelCalCount div 2)+2)]" mode="calTree"/> 
     22      </ul> 
     23    </div> 
     24    <div class="calendarList"> 
     25      <ul class="calendarTree"> 
     26        <xsl:apply-templates select="calendar/calendar[(calType != 5 and calType != 6 and name != 'calendar') and (position() &gt; ceiling($topLevelCalCount div 2)+2)]" mode="calTree"/> 
     27      </ul> 
     28    </div> 
    2529  </xsl:template> 
    2630 
    …… 
    2832    <xsl:variable name="itemClass"> 
    2933      <xsl:choose> 
    30         <xsl:when test="calendarCollection='false'"> 
    31           folder 
    32         </xsl:when> 
    33         <xsl:otherwise>calendar</xsl:otherwise> 
     34        <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Calr-Folder"/></xsl:when> 
     35        <xsl:otherwise><xsl:copy-of select="$bwStr-Calr-Calendar"/></xsl:otherwise> 
    3436      </xsl:choose> 
    3537    </xsl:variable> 
    36     <xsl:variable name="url" select="encodedPath" /> 
     38    <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 
    3739    <li class="{$itemClass}"> 
    38       <a href="{$setSelection}&amp;calUrl={$url}" 
    39         title="view calendar"> 
    40         <xsl:value-of select="name" /> 
    41       </a> 
    42       <xsl:if test="calendarCollection='true'"> 
    43         <xsl:variable name="calPath" select="path" /> 
    44         <span class="exportCalLink"> 
    45           <a 
    46             href="{$calendar-fetchForExport}&amp;calPath={$calPath}" 
    47             title="export calendar as iCal"> 
    48             <img 
    49               src="{$resourcesRoot}/images/calIconExport-sm.gif" 
    50               alt="export calendar" /> 
    51           </a> 
    52         </span> 
    53       </xsl:if> 
     40      <xsl:variable name="calPath" select="path"/> 
     41      <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;setappvar=curCollection({$calPath})" title="view calendar"><xsl:value-of select="name"/></a> 
     42      <xsl:variable name="calPath" select="path"/> 
     43      <span class="exportCalLink"> 
     44        <a href="{$calendar-fetchForExport}&amp;calPath={$calPath}&amp;virtualPath={$virtualPath}" title="export calendar as iCal"> 
     45          <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 
     46        </a> 
     47      </span> 
    5448      <xsl:if test="calendar"> 
    5549        <ul> 
    56           <xsl:apply-templates select="calendar" 
    57             mode="calTree" /> 
     50          <xsl:apply-templates select="calendar" mode="calTree"/> 
    5851        </ul> 
    5952      </xsl:if> 
    6053    </li> 
    6154  </xsl:template> 
     55 
    6256  <!-- calendar export page --> 
    6357  <xsl:template match="currentCalendar" mode="export"> 
    64     <h2 class="bwStatusConfirmed">Export Calendar</h2> 
     58    <div class="secondaryColHeader"> 
     59      <h3><xsl:copy-of select="$bwStr-Cals-ExportCals"/></h3> 
     60    </div> 
    6561    <div id="export"> 
    6662      <p> 
    67         <strong>Calendar to export:</strong> 
     63        <xsl:copy-of select="$bwStr-Cals-CalendarToExport"/> 
     64        <xsl:text> </xsl:text> 
     65        <em><xsl:value-of select="name"/></em> 
    6866      </p> 
    69       <div class="indent"> 
    70         Name: 
    71         <strong> 
    72           <em> 
    73             <xsl:value-of select="name" /> 
    74           </em> 
    75         </strong> 
    76         <br /> 
    77         Path: 
    78         <xsl:value-of select="path" /> 
    79       </div> 
    80       <p> 
    81         <strong>Event date limits:</strong> 
    82       </p> 
    83       <form name="exportCalendarForm" id="exportCalendarForm" 
    84         action="{$export}" method="post"> 
     67 
     68      <form name="exportCalendarForm" id="exportCalendarForm" action="{$export}" method="post"> 
     69        <xsl:copy-of select="$bwStr-Cals-EventDateLimits"/><br/> 
    8570        <input type="hidden" name="calPath"> 
    86           <xsl:attribute name="value"> 
    87             <xsl:value-of select="path" /> 
    88           </xsl:attribute> 
     71          <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    8972        </input> 
    9073        <!-- fill these on submit --> 
    91         <input type="hidden" name="eventStartDate.year" 
    92           value="" /> 
    93         <input type="hidden" name="eventStartDate.month" 
    94           value="" /> 
    95         <input type="hidden" name="eventStartDate.day" value="" /> 
    96         <input type="hidden" name="eventEndDate.year" value="" /> 
    97         <input type="hidden" name="eventEndDate.month" value="" /> 
    98         <input type="hidden" name="eventEndDate.day" value="" /> 
     74        <input type="hidden" name="eventStartDate.year" value=""/> 
     75        <input type="hidden" name="eventStartDate.month" value=""/> 
     76        <input type="hidden" name="eventStartDate.day" value=""/> 
     77        <input type="hidden" name="eventEndDate.year" value=""/> 
     78        <input type="hidden" name="eventEndDate.month" value=""/> 
     79        <input type="hidden" name="eventEndDate.day" value=""/> 
    9980        <!-- static fields --> 
    100         <input type="hidden" name="nocache" value="no" /> 
    101         <input type="hidden" name="skinName" value="ical" /> 
    102         <input type="hidden" name="contentType" 
    103           value="text/calendar" /> 
     81        <input type="hidden" name="nocache" value="no"/> 
    10482        <input type="hidden" name="contentName"> 
    105           <xsl:attribute name="value"><xsl:value-of 
    106               select="name" />.ics</xsl:attribute> 
     83          <xsl:attribute name="value"><xsl:value-of select="name"/>.ics</xsl:attribute> 
    10784        </input> 
    10885        <!-- visible fields --> 
    109         <input type="radio" name="dateLimits" value="active" 
    110           checked="checked" 
    111           onclick="changeClass('exportDateRange','invisible')" /> 
    112         today forward 
    113         <input type="radio" name="dateLimits" value="none" 
    114           onclick="changeClass('exportDateRange','invisible')" /> 
    115         all dates 
    116         <input type="radio" name="dateLimits" value="limited" 
    117           onclick="changeClass('exportDateRange','visible')" /> 
    118         date range 
     86        <input type="radio" name="dateLimits" value="active" checked="checked" onclick="changeClass('exportDateRange','invisible')"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Cals-TodayForward"/> 
     87        <input type="radio" name="dateLimits" value="none" onclick="changeClass('exportDateRange','invisible')"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Cals-AllDates"/> 
     88        <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Cals-DateRange"/> 
    11989        <div id="exportDateRange" class="invisible"> 
    120           Start: 
    121           <div dojoType="dropdowndatepicker" 
    122             formatLength="medium" saveFormat="yyyyMMdd" 
    123             id="bwExportCalendarWidgetStartDate"> 
    124             <xsl:text> </xsl:text> 
    125           </div> 
    126           Ends 
    127           <div dojoType="dropdowndatepicker" 
    128             formatLength="medium" saveFormat="yyyyMMdd" 
    129             id="bwExportCalendarWidgetEndDate"> 
    130             <xsl:text> </xsl:text> 
    131           </div> 
     90          <xsl:copy-of select="$bwStr-Cals-Start"/><xsl:text> </xsl:text> 
     91          <input type="text" name="bwExportCalendarWidgetStartDate" id="bwExportCalendarWidgetStartDate" size="10"/> 
     92          <span id="bwExportEndField"><xsl:copy-of select="$bwStr-Cals-End"/><xsl:text> </xsl:text> 
     93          <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/></span> 
    13294        </div> 
    133         <p> 
    134           <input type="submit" value="export" 
    135             class="bwWidgetSubmit" onclick="fillExportFields(this.form)" /> 
    136         </p> 
     95        <input type="submit" value="{$bwStr-Cals-Export}" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/> 
    13796      </form> 
    13897    </div> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/fixed.css

    r2511 r2517  
    721721 font-weight: bold; 
    722722} 
     723div.calendarList { 
     724  float: left; 
     725  margin: 0 0 0 4em; 
     726} 
     727.info { 
     728  font-size: 1.1em; 
     729  margin: 1em 1em 0 1em; 
     730} 
    723731table#searchTable { 
    724732 font-size: .9em; 
    …… 
    797805} 
    798806ul.calendarTree li { 
     807 font-weight: bold; 
     808 padding-top: 0.25em; 
     809 padding-bottom: 0.25em; 
    799810} 
    800811ul.calendarTree li a { 
    801812 color: #335080; 
    802813} 
     814ul.calendarTree li ul { 
     815 margin: 0 0 .5em 1.5em; 
     816} 
     817ul.calendarTree li ul li { 
     818 font-weight: normal; 
     819 margin: 0; 
     820 padding: 0; 
     821} 
    803822ul.calendarTree li.folder { 
    804  font-weight: bold; 
    805  margin: .8em 0 0 0; 
     823  /*list-style-image: url("../images/catIcon.gif");*/ 
    806824} 
    807825ul.calendarTree li.calendar { 
    808  font-weight: normal; 
    809  margin: .2em 0 0 0; 
    810 } 
    811 ul.calendarTree li ul { 
    812  margin: 0 0 .5em 1em; 
    813 } 
    814 ul.calendarTree li ul li { 
    815  margin: 0; 
    816  padding: 0; 
     826  /*list-style-image: url("../images/calIcon-sm.gif");*/ 
     827} 
     828ul.calendarTree .exportCalLink { 
     829  font-size: 0.6em; 
     830  padding-left: 1em; 
     831  color: #aaa; 
     832  background-color: transparent; 
     833} 
     834ul.calendarTree .exportCalLink a:link, 
     835ul.calendarTree .exportCalLink a:active, 
     836ul.calendarTree .exportCalLink a:visited { 
     837  color: #aaa; 
     838  background-color: transparent; 
     839  text-decoration: none; 
     840} 
     841ul.calendarTree .exportCalLink a:hover { 
     842  color: #333; 
     843  background-color: transparent; 
     844  text-decoration: none; 
     845} 
     846#export { 
     847  font-size: 1.1em; 
     848  margin: 0px; 
     849  padding: 1em; 
     850} 
     851#export em { 
     852  font-size: 1.2em; 
     853  font-style: italic; 
     854} 
     855#export p { 
     856  margin-bottom: 1em; 
     857} 
     858#exportDateRange { 
     859  font-size: 1em; 
     860} 
     861.bwWidgetSubmit { 
     862  display: block; 
     863  margin-top: 0.5em; 
     864} 
     865.invisible { 
     866  display: none; 
    817867} 
    818868div.right_column { 

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

    r2511 r2517  
    1414      <!-- display information about the current selection state if not default --> 
    1515      <xsl:choose> 
    16         <xsl:when test="/bedework/selectionState/selectionType = 'calendar'"> 
     16        <xsl:when test="/bedework/selectionState/selectionType = 'collections'"> 
    1717          <tr> 
    1818            <td class="eventFilterInfo" colspan="3"> 
    19               Displaying Events for Topical Area 
     19              Displaying Events for Calendar 
    2020              <span class="displayFilterName"> 
    21                 <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/> 
     21                <xsl:call-template name="substring-afterLastInstanceOf"> 
     22                  <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 
     23                  <xsl:with-param name="char">/</xsl:with-param> 
     24                </xsl:call-template> 
    2225              </span><xsl:text> </xsl:text> 
    2326              <a id="allView" href="{$setSelection}">(show all)</a></td> 

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

    r2511 r2517  
    2828  <xsl:template name="displaySideBar"> 
    2929    <div class="sideBarContainer"> 
    30       <h4>FILTER BY TOPICAL AREA:</h4> 
     30      <h4>FILTER ON CALENDARS:</h4> 
    3131      <ul class="sideLinks"> 
    3232        <li> 
    3333          <a href="{$fetchPublicCalendars}"> 
    34             All Topical Areas 
     34            View All Calendars 
    3535          </a> 
    3636        </li> 

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

    r2511 r2517  
    44  xmlns="http://www.w3.org/1999/xhtml"> 
    55 
    6   <!--==== THEME UTILITIES ====--> 
    7   <xsl:template match="events" mode="ongoingEventsExist"> 
    8     <xsl:choose> 
    9  
    10                             ($ongoingEventsUseCategory = 'true' and /bedework/eventscalendar//events[category/name = $ongoingEventsCatName]) or 
    11                             ($ongoingEventsUseDayRange = 'true' and $ 
    12   </xsl:template> 
    136 
    147 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bwclassicTheme/bwclassic.xsl

    r2510 r2517  
    6565 
    6666  <!-- Page subsections --> 
    67   <xsl:include href="./bwclassicTheme/event.xsl" /> 
     67  <xsl:include href="./event.xsl" /> 
    6868 
    6969  <!-- DEFINE GLOBAL CONSTANTS -->