Changeset 1905

Show
Ignore:
Timestamp:
07/15/08 11:03:42
Author:
douglm
Message:

Output more calendar properties in jsp.

Use canAlias property to simplify some xslt tests and to show new aliased calendars in calendar display.


Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1904 r1905  
    545545    <!-- normal calendars --> 
    546546    <ul class="calendarTree"> 
    547       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &lt; 2]" mode="myCalendars"/> 
     547      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[canAlias = 'true']" mode="myCalendars"/> 
    548548    </ul> 
    549549    <!-- special calendars: inbox, outbox, and trash --> 
    …… 
    42104210 
    42114211  <xsl:template match="calendar" mode="mySpecialCalendars"> 
    4212     <!-- calTypes: Trash = 2, Deleted = 3, Busy = 4, Inbox = 5, Outbox = 6  --> 
     4212    <!-- calTypes: Trash = 2, Deleted = 3, Busy = 4, 
     4213                   Inbox = 5, Outbox = 6 
     4214                   Alias = 7, eternal subscription = 8 --> 
    42134215    <xsl:variable name="id" select="id"/> 
    42144216    <li> 
    …… 
    49294931          <h3>My calendars</h3> 
    49304932          <ul class="calendarTree"> 
    4931             <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[calType &lt; 2]" mode="subscribe"/> 
     4933            <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[canAlias='true']" mode="subscribe"/> 
    49324934          </ul> 
    49334935          <h3>Public calendars</h3> 
    49344936          <ul class="calendarTree"> 
    4935             <xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar[calType &lt; 2]" mode="subscribe"/> 
     4937            <xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar[canAlias='true']" mode="subscribe"/> 
    49364938          </ul> 
    49374939        </td>