[Bedework-commit] bedework r1975 - trunk/deployment/webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-11-19 23:49:15 -0500 (Wed, 19 Nov 2008)
New Revision: 1975

Modified:
   trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
   trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
user client: beginning to address calendar aliases

Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css	2008-11-19 21:55:16 UTC (rev 1974)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css	2008-11-20 04:49:15 UTC (rev 1975)
@@ -1543,8 +1543,8 @@
   list-style-image: url(../../resources/glassFill-icon-view.gif);
   font-weight: bold;
 }
-#bedework  li.subscription {
-  list-style-image: url(../../resources/subIcon.gif);
+#bedework  li.alias {
+  list-style-image: url(../../resources/calIconAlias-sm.gif);
   font-style: italic;
   margin-left: 0;
   padding-left: 0;

Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2008-11-19 21:55:16 UTC (rev 1974)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2008-11-20 04:49:15 UTC (rev 1975)
@@ -584,7 +584,7 @@
     </h3>
     <!-- normal calendars -->
     <ul class="calendarTree">
-      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/>
+      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[calType != 5 and calType != 6 and calType != 2 and calType != 3]" mode="myCalendars"/>
     </ul>
     <!-- special calendars: inbox, outbox, and trash -->
     <ul class="calendarTree">
@@ -4273,15 +4273,31 @@
     </table>
   </xsl:template>
 
+  <!--
+    Calendar templates depend heavily on calendar types:
+
+    calTypes: 0 - Folder
+              1 - Calendar
+              2 - Trash
+              3 - Deleted
+              4 - Busy
+              5 - Inbox
+              6 - Outbox
+              7 - Alias
+              8 - External subscription
+              9 - Resource collection
+  -->
+
   <xsl:template match="calendar" mode="myCalendars">
+    <!-- this template receives calType 0,1,4,7,8,9  -->
     <xsl:variable name="id" select="id"/>
     <li>
       <xsl:attribute name="class">
         <xsl:choose>
           <xsl:when test="/bedework/selectionState/selectionType = 'calendar'
-                          and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when>
-          <xsl:when test="name='Trash'">trash</xsl:when>
-          <xsl:when test="calendarCollection='false'">folder</xsl:when>
+                          and path = /bedework/selectionState/calendar/path">selected</xsl:when>
+          <xsl:when test="calType = 0">folder</xsl:when>
+          <xsl:when test="calType = 7">alias</xsl:when>
           <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -4298,9 +4314,7 @@
   </xsl:template>
 
   <xsl:template match="calendar" mode="mySpecialCalendars">
-    <!-- calTypes: Trash = 2, Deleted = 3, Busy = 4,
-                   Inbox = 5, Outbox = 6
-                   Alias = 7, eternal subscription = 8 -->
+    <!-- this template receives calType 2,3,5,6  -->
     <xsl:variable name="id" select="id"/>
     <li>
       <xsl:attribute name="class">