Changeset 1975

Show
Ignore:
Timestamp:
11/19/08 23:49:15
Author:
johnsa
Message:

user client: beginning to address calendar aliases

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1971 r1975  
    15441544  font-weight: bold; 
    15451545} 
    1546 #bedework  li.subscription { 
    1547   list-style-image: url(../../resources/subIcon.gif); 
     1546#bedework  li.alias { 
     1547  list-style-image: url(../../resources/calIconAlias-sm.gif); 
    15481548  font-style: italic; 
    15491549  margin-left: 0; 

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

    r1973 r1975  
    585585    <!-- normal calendars --> 
    586586    <ul class="calendarTree"> 
    587       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/> 
     587      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[calType != 5 and calType != 6 and calType != 2 and calType != 3]" mode="myCalendars"/> 
    588588    </ul> 
    589589    <!-- special calendars: inbox, outbox, and trash --> 
    …… 
    42744274  </xsl:template> 
    42754275 
     4276  <!-- 
     4277    Calendar templates depend heavily on calendar types: 
     4278 
     4279    calTypes: 0 - Folder 
     4280              1 - Calendar 
     4281              2 - Trash 
     4282              3 - Deleted 
     4283              4 - Busy 
     4284              5 - Inbox 
     4285              6 - Outbox 
     4286              7 - Alias 
     4287              8 - External subscription 
     4288              9 - Resource collection 
     4289  --> 
     4290 
    42764291  <xsl:template match="calendar" mode="myCalendars"> 
     4292    <!-- this template receives calType 0,1,4,7,8,9  --> 
    42774293    <xsl:variable name="id" select="id"/> 
    42784294    <li> 
    …… 
    42804296        <xsl:choose> 
    42814297          <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    4282                           and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    4283           <xsl:when test="name='Trash'">trash</xsl:when> 
    4284           <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     4298                          and path = /bedework/selectionState/calendar/path">selected</xsl:when> 
     4299          <xsl:when test="calType = 0">folder</xsl:when> 
     4300          <xsl:when test="calType = 7">alias</xsl:when> 
    42854301          <xsl:otherwise>calendar</xsl:otherwise> 
    42864302        </xsl:choose> 
    …… 
    42994315 
    43004316  <xsl:template match="calendar" mode="mySpecialCalendars"> 
    4301     <!-- calTypes: Trash = 2, Deleted = 3, Busy = 4, 
    4302                    Inbox = 5, Outbox = 6 
    4303                    Alias = 7, eternal subscription = 8 --> 
     4317    <!-- this template receives calType 2,3,5,6  --> 
    43044318    <xsl:variable name="id" select="id"/> 
    43054319    <li>