Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1348)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1349)
@@ -4317,8 +4317,8 @@
 
     <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/>
-    <p>The following view will be removed. <em>Be forewarned: removing views from a
-    production system can cause the public interface to throw errors while the
-    cache is updated.  To avoid this, plan on restarting the server when removing
-    views from a production system.</em>
+    <p>The following view will be removed. <em>Be forewarned: if caching is 
+    enabled, removing views from a
+    production system can cause the public interface to throw errors until the
+    cache is flushed (a few minutes).</em>
     </p> 
     
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1313)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1349)
@@ -13,4 +13,6 @@
 
               DEMONSTRATION CALENDAR STYLESHEET
+              
+                  MainCampus Calendar Suite
 
      This stylesheet is devoid of school branding.  It is a good
@@ -720,7 +722,10 @@
         <th class="icalIcon" rowspan="2">
           <div id="eventIcons">
-            <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/>
-            add to my calendar</a>
+            <xsl:if test="recurrenceId = ''">
+              <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
+              <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
+                <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/>
+              add to my calendar</a>
+            </xsl:if>
             <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
@@ -953,5 +958,14 @@
                   </xsl:choose>
                 </xsl:variable>
-                <td class="{$descriptionClass}">
+                <!-- Subscription styles.
+                     These are set in the add/modify subscription forms in the admin client;
+                     if present, these override the background-color set by eventClass. The
+                     subscription styles should not be used for cancelled events (tentative is ok). -->
+                <xsl:variable name="subscriptionClass">
+                  <xsl:if test="status != 'CANCELLED' and
+                                subscription/subStyle != '' and
+                                subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if>
+                </xsl:variable>
+                <td class="{$descriptionClass} {$subscriptionClass}">
                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if>
                   <xsl:choose>
@@ -991,7 +1005,10 @@
                 </td>
                 <td class="icons">
-                  <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/>
-                  </a>
+                  <xsl:if test="recurrenceId = ''">
+                    <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
+                    <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
+                      <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/>
+                    </a>
+                  </xsl:if>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
                   <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
Index: trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (revision 1313)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (revision 1349)
@@ -13,4 +13,6 @@
 
         DEMONSTRATION "DEPARTMENTAL" CALENDAR STYLESHEET
+        
+                  SoEDepartmental Calendar Suite
 
      This stylesheet is for the "soe" (School of Engineering)
@@ -722,7 +724,10 @@
         <th class="icalIcon" rowspan="2">
           <div id="eventIcons">
-            <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/>
-            add to my calendar</a>
+            <xsl:if test="recurrenceId = ''">
+              <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
+              <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
+                <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/>
+              add to my calendar</a>
+            </xsl:if>
             <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
@@ -955,5 +960,14 @@
                   </xsl:choose>
                 </xsl:variable>
-                <td class="{$descriptionClass}">
+                <!-- Subscription styles.
+                     These are set in the add/modify subscription forms in the admin client;
+                     if present, these override the background-color set by eventClass. The
+                     subscription styles should not be used for cancelled events (tentative is ok). -->
+                <xsl:variable name="subscriptionClass">
+                  <xsl:if test="status != 'CANCELLED' and
+                                subscription/subStyle != '' and
+                                subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if>
+                </xsl:variable>
+                <td class="{$descriptionClass} {$subscriptionClass}">
                   <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if>
                   <xsl:choose>
@@ -993,7 +1007,10 @@
                 </td>
                 <td class="icons">
-                  <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/>
-                  </a>
+                  <xsl:if test="recurrenceId = ''">
+                    <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
+                    <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
+                      <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/>
+                    </a>
+                  </xsl:if>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
                   <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">