Changeset 2533

Show
Ignore:
Timestamp:
12/23/09 00:33:23
Author:
johnsa
Message:

public client: finishing up ongoing events, commenting out deadlines for now

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2531 r2533  
    131131  <!--  xsl:template name="listView" --> 
    132132  <xsl:variable name="bwStr-LsVw-NoEventsToDisplay">No events found.  Please try a different view or time period.</xsl:variable> 
     133  <xsl:variable name="bwStr-LsVw-NoEventsToDisplayWithOngoing">No non-ongoing events found.  Please try a different view or time period or look in the Ongoing events list.</xsl:variable> 
    133134  <xsl:variable name="bwStr-LsVw-Add">add...</xsl:variable> 
    134135  <xsl:variable name="bwStr-LsVw-AllDay">All Day</xsl:variable> 

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

    r2518 r2533  
    170170            </div> 
    171171 
    172             <!-- ONGOING EVENTS and DEADLINES, if enabled --> 
    173             <xsl:if test="$ongoingEvents = 'true' or $deadlines = 'true'"> 
     172            <!-- ONGOING EVENTS if enabled --> 
     173            <xsl:if test="$ongoingEvents = 'true'"> 
    174174              <div class="right_column" id="right_column"> 
    175175                <xsl:if test="$ongoingEvents = 'true'"> 
    176176                  <xsl:call-template name="ongoingEventList" /> 
    177177                </xsl:if> 
     178                <!-- 
    178179                <xsl:if test="$deadlines = 'true'"> 
    179180                  <xsl:call-template name="deadlines" /> 
    180181                </xsl:if> 
     182                --> 
    181183              </div> 
    182184            </xsl:if> 

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

    r2526 r2533  
    1010    <ul class="eventList"> 
    1111      <xsl:choose> 
     12        <!-- Pick out the tasks --> 
    1213        <xsl:when test="/bedework/eventscalendar//event[entityType = 2]"> 
    1314          <xsl:for-each select="/bedework/eventscalendar/year/month/week/day/event[entityType = 2]"> 

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

    r2530 r2533  
    1818            <td class="eventFilterInfo" colspan="3"> 
    1919              <xsl:copy-of select="$bwStr-LsVw-DispEventsForCal"/> 
     20              <xsl:text> </xsl:text> 
    2021              <span class="displayFilterName"> 
    2122                <xsl:call-template name="substring-afterLastInstanceOf"> 
    …… 
    3132            <td class="eventFilterInfo" colspan="3"> 
    3233              <xsl:copy-of select="$bwStr-LsVw-DispEventsForView"/> 
     34              <xsl:text> </xsl:text> 
    3335              <span class="displayFilterName"> 
    3436                <xsl:value-of select="/bedework/selectionState/view/name"/> 
    …… 
    4850        </xsl:when> 
    4951        <xsl:when test="$ongoingEventsEnabled = 'true' 
     52               and ($ongoingEventsShowForCollection = 'true' and not(/bedework/selectionState/selectionType = 'collections')) 
    5053               and not(/bedework/eventscalendar/year/month/week/day/event[not(categories/category/value = $ongoingEventsCatName)])"> 
    5154            <tr> 
    5255              <td class="noEventsCell"> 
    53                 <xsl:copy-of select="$bwStr-LsVw-NoEventsToDisplay"/> 
     56                <xsl:copy-of select="$bwStr-LsVw-NoEventsToDisplayWithOngoing"/> 
    5457              </td> 
    5558            </tr> 
    …… 
    5760        <xsl:otherwise> 
    5861          <xsl:choose> 
    59             <xsl:when test="$ongoingEventsEnabled = 'true'"> 
     62            <xsl:when test="$ongoingEventsEnabled = 'true' 
     63                   and ($ongoingEventsShowForCollection = 'true' and not(/bedework/selectionState/selectionType = 'collections'))"> 
    6064              <xsl:apply-templates select="/bedework/eventscalendar/year/month/week/day[event[not(categories/category/value = $ongoingEventsCatName)]]" mode="dayInList"/> 
    6165            </xsl:when> 
    …… 
    7983     </tr> 
    8084      <xsl:choose> 
    81        <xsl:when test="$ongoingEventsEnabled = 'true'"> 
     85       <xsl:when test="$ongoingEventsEnabled = 'true' 
     86                  and ($ongoingEventsShowForCollection = 'true' and not(/bedework/selectionState/selectionType = 'collections'))"> 
    8287         <xsl:apply-templates select="event[not(categories/category/value = $ongoingEventsCatName)]]" mode="eventInList"/> 
    8388       </xsl:when> 

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

    r2528 r2533  
    1313       in the administrative web client (default view, default viewPeriod, etc) --> 
    1414 
    15   <!-- FAVICON --> 
    16   <!-- address bar icon --> 
    17   <xsl:variable name="favicon"><xsl:value-of select="$resourcesRoot"/>/images/bedework.ico</xsl:variable> 
     15  <!-- FAVICON --> 
     16  <!-- address bar icon --> 
     17  <xsl:variable name="favicon"><xsl:value-of select="$resourcesRoot"/>/images/bedework.ico</xsl:variable> 
    1818 
    19   <!-- FEATURED EVENTS --> 
    20   <!-- display the featured event images? --> 
    21   <xsl:variable name="featuredEventsEnabled">true</xsl:variable> 
    22   <xsl:variable name="featuredEventsAlwaysOn">false</xsl:variable> 
    23   <xsl:variable name="featuredEventsForDay">true</xsl:variable> 
    24   <xsl:variable name="featuredEventsForWeek">true</xsl:variable> 
    25   <xsl:variable name="featuredEventsForMonth">false</xsl:variable> 
    26   <xsl:variable name="featuredEventsForYear">false</xsl:variable> 
    27   <xsl:variable name="featuredEventsForEventDisplay">false</xsl:variable> 
    28   <xsl:variable name="featuredEventsForCalList">false</xsl:variable> 
     19  <!-- FEATURED EVENTS --> 
     20  <!-- display the featured event images? --> 
     21  <xsl:variable name="featuredEventsEnabled">true</xsl:variable> 
     22  <xsl:variable name="featuredEventsAlwaysOn">false</xsl:variable> 
     23  <xsl:variable name="featuredEventsForDay">true</xsl:variable> 
     24  <xsl:variable name="featuredEventsForWeek">true</xsl:variable> 
     25  <xsl:variable name="featuredEventsForMonth">false</xsl:variable> 
     26  <xsl:variable name="featuredEventsForYear">false</xsl:variable> 
     27  <xsl:variable name="featuredEventsForEventDisplay">false</xsl:variable> 
     28  <xsl:variable name="featuredEventsForCalList">false</xsl:variable> 
    2929 
    3030 
    31    <!-- ONGOING EVENTS --> 
    32    <!-- use the ongoing events sidebar? --> 
    33    <!-- if ongoing events sidebar is enabled, 
    34     you must set one or both of UseCategory 
    35     or UseDayRange (coming later) for ongoing events to appear. --> 
    36    <xsl:variable name="ongoingEventsEnabled">true</xsl:variable> 
     31  <!-- ONGOING EVENTS --> 
     32  <!-- use the ongoing events sidebar? --> 
     33  <!-- if ongoing events sidebar is enabled, 
     34   you must set UseCategory for ongoing events to appear. --> 
     35  <xsl:variable name="ongoingEventsEnabled">true</xsl:variable> 
    3736 
    38   <!-- use the specified category to mark an event as ongoing --> 
    39   <xsl:variable name="ongoingEventsUseCategory">true</xsl:variable> 
    40   <xsl:variable name="ongoingEventsCatName">sys/Ongoing</xsl:variable> 
     37  <!-- use the specified category to mark an event as ongoing --> 
     38  <xsl:variable name="ongoingEventsUseCategory">true</xsl:variable> 
     39  <xsl:variable name="ongoingEventsCatName">sys/Ongoing</xsl:variable> 
    4140 
    42   <!-- always display sidebar, even if no events are ongoing? --> 
    43   <xsl:variable name="ongoingEventsAlwaysDisplayed">true</xsl:variable> 
     41  <!-- always display sidebar, even if no events are ongoing? --> 
     42  <xsl:variable name="ongoingEventsAlwaysDisplayed">true</xsl:variable> 
    4443 
     44  <!-- reveal ongoing events in the main event list 
     45       when a collection (e.g calendar "Exhibits") is directly selected? --> 
     46  <xsl:variable name="ongoingEventsShowForCollection">true</xsl:variable> 
    4547 
    46    <!-- DEADLINES/TASKS --> 
    47    <!-- use the deadlines sidebar? --> 
    48    <!-- if deadlines sidebar is enabled, deadlines will appear 
    49         in the sidebar under ongoing events --> 
    50    <xsl:variable name="deadlinesEnabled">true</xsl:variable> 
    51  
    52    <!-- use the specified category to mark an event as deadline --> 
    53    <!-- we will likely switch to using tasks in the future for this --> 
    54    <xsl:variable name="ongoingEventsUseCategory">true</xsl:variable> 
    55    <xsl:variable name="ongoingEventsCatName">sys/Deadline</xsl:variable> 
    56  
    57    <!-- always display sidebar, even if no deadlines are present? --> 
    58    <xsl:variable name="deadlinesAlwaysDisplayed">true</xsl:variable> 
    59  
    60  
    61   <!-- VIEW HIERARCHY --> 
    62   <!-- force like-named views into a heirarchy? --> 
    63   <!-- If enabled, views that follow a naming 
    64        convention will appear as children of 
    65        another view in the Calendar Views menu. 
    66        E.g. views named "Arts" and "Arts_Dance Performance" will 
    67        be assembled in a tree structure with "Arts" as the 
    68        parent, and "Dance Performance" as its child 
    69        ("Arts_" will be stripped for display).  --> 
    70   <xsl:variable name="childViewsEnabled">true</xsl:variable> 
    7148 
    7249  <!-- JAVASCRIPT CONSTANTS --> 
    …… 
    7653  </xsl:template> 
    7754 
     55 
     56 
     57 
     58  <!-- NOT YET ENABLED --> 
     59  <!-- the following features did not make the 3.6 release, and are here 
     60       for reference --> 
     61 
     62   <!-- DEADLINES/TASKS --> 
     63   <!-- use the deadlines sidebar? --> 
     64   <!-- if deadlines sidebar is enabled, deadlines will appear 
     65        in the sidebar under ongoing events.  Deadlines will 
     66        be presented as tasks and will be treated as such in 
     67        calendar clients. --> 
     68   <!-- <xsl:variable name="deadlinesEnabled">false</xsl:variable> --> 
     69 
     70   <!-- always display sidebar, even if no deadlines are present? --> 
     71   <!-- <xsl:variable name="deadlinesAlwaysDisplayed">true</xsl:variable> --> 
     72 
     73 
     74  <!-- VIEW HIERARCHY --> 
     75  <!-- force views into a heirarchy? --> 
     76  <!-- <xsl:variable name="childViewsEnabled">true</xsl:variable> --> 
     77 
     78  <!-- FOR ONGOING EVENTS --> 
     79  <!-- pull events longer than day range into ongoing list? --> 
     80  <!-- <xsl:variable name="ongoingEventsUseDayRange">false</xsl:variable> --> 
     81  <!-- <xsl:variable name="ongoingEventsDayRange">12</xsl:variable> --> 
     82 
    7883</xsl:stylesheet> 

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

    r2518 r2533  
    2424 
    2525  <!-- look for existence of deadlines --> 
     26  <!-- 
    2627  <xsl:variable name="deadlines"> 
    2728    <xsl:choose> 
    …… 
    3839    </xsl:choose> 
    3940  </xsl:variable> 
     41  --> 
    4042 
    4143</xsl:stylesheet>