[Bedework-commit] r546 - in trunk/calendar3/deployment: webpublic/webapp/resources/demoskins/default/default webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2006-06-07 14:09:04 -0400 (Wed, 07 Jun 2006)
New Revision: 546

Modified:
   trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
stylings for tentative events in personal client

Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css	2006-06-07 17:40:00 UTC (rev 545)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css	2006-06-07 18:09:04 UTC (rev 546)
@@ -25,6 +25,7 @@
 }
 h2.bwStatusTentative {
   background: #eee url('../../images/tentativeLines.gif') top;
+  color: black;
 }
 /* Header IDs and classes */
 #errors {

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css	2006-06-07 17:40:00 UTC (rev 545)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css	2006-06-07 18:09:04 UTC (rev 546)
@@ -12,8 +12,6 @@
   font-size: 1.3em;
   border-bottom: 1px solid #ccc;
   /*border-top: 1px solid #ccc;*/
-  background-color: #eee;
-  color: black;
 }
 h2 a:link,
 h2 a:active,
@@ -23,6 +21,18 @@
   background-color: inherit;
   text-decoration: none;
 }
+h2.bwStatusConfirmed {
+  background-color: #eee;
+  color: black;
+}
+h2.bwStatusCancelled {
+  background-color: #eee;
+  color: black;
+}
+h2.bwStatusTentative {
+  background: #eee url('../../resources/tentativeLines.gif') top;
+  color: black;
+}
 h3 {
   margin: 0em;
   padding: 1em 0.2em 0em 0.2em;
@@ -635,6 +645,17 @@
   background-color: #ccc;
   color: black;
 }
+#monthCalendarTable a.eventTentative:link,
+#monthCalendarTable a.eventTentative:visited,
+#monthCalendarTable a.eventTentative:active  {
+  display: block;
+  padding: 0.1em 0.2em 0.1em 0.2em;
+  text-decoration: none;
+  border-bottom: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+  background: #eee url('../../resources/tentativeLines.gif') top;
+  color: black;
+}
 #monthCalendarTable a.holiday:link,
 #monthCalendarTable a.holiday:visited,
 #monthCalendarTable a.holiday:active  {
@@ -649,6 +670,7 @@
 #monthCalendarTable a.eventLinkA:hover,
 #monthCalendarTable a.eventLinkB:hover,
 #monthCalendarTable a.eventCancelled:hover,
+#monthCalendarTable a.eventTentative:hover,
 #monthCalendarTable a.holiday:hover   {
   display: block;
   padding: 0.1em 0.2em 0.1em 0.2em;
@@ -841,10 +863,14 @@
   color: black;
   width: 100%;
 }
-#listTable td.cancelled {
+#listTable td.bwStatusCancelled {
   background-color: #ddd;
   color: black;
 }
+#listTable td.bwStatusTentative {
+  background: white url('../../resources/tentativeLines.gif') top;
+  color: black;
+}
 #listTable td.description a {
   display: block;
   background-color: transparent;

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-06-07 17:40:00 UTC (rev 545)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-06-07 18:09:04 UTC (rev 546)
@@ -8,9 +8,9 @@
   doctype-system="http://www.w3.org/TR/html4/loose.dtd"
   standalone="yes"
 />
-   <!-- ======================================== -->
-  <!--  Rensselaer PERSONAL CALENDAR STYLESHEET  -->
   <!-- ========================================= -->
+  <!--       PERSONAL CALENDAR STYLESHEET        -->
+  <!-- ========================================= -->
 
   <!-- DEFINE INCLUDES -->
   <xsl:include href="errors.xsl"/>
@@ -776,7 +776,8 @@
                 </xsl:choose>
                 <xsl:variable name="descriptionClass">
                   <xsl:choose>
-                    <xsl:when test="status='CANCELLED'">description cancelled</xsl:when>
+                    <xsl:when test="status='CANCELLED'">description bwStatusCancelled</xsl:when>
+                    <xsl:when test="status='TENTATIVE'">description bwStatusTentative</xsl:when>
                     <xsl:otherwise>description</xsl:otherwise>
                   </xsl:choose>
                 </xsl:variable>
@@ -946,6 +947,7 @@
       <xsl:choose>
         <!-- Special styles for the month grid -->
         <xsl:when test="status='CANCELLED'">eventCancelled</xsl:when>
+        <xsl:when test="status='TENTATIVE'">eventTentative</xsl:when>
         <xsl:when test="calendar/name='Holidays'">holiday</xsl:when>
         <!-- Alternating colors for all standard events -->
         <xsl:when test="position() mod 2 = 1">eventLinkA</xsl:when>
@@ -1078,7 +1080,14 @@
     <xsl:variable name="calPath" select="calendar/encodedPath"/>
     <xsl:variable name="guid" select="guid"/>
     <xsl:variable name="recurrenceId" select="recurrenceId"/>
-    <h2>
+    <xsl:variable name="statusClass">
+      <xsl:choose>
+        <xsl:when test="status='CANCELLED'">bwStatusCancelled</xsl:when>
+        <xsl:when test="status='TENTATIVE'">bwStatusTentative</xsl:when>
+        <xsl:otherwise>bwStatusConfirmed</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <h2 class="{$statusClass}">
       <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
       <xsl:choose>
         <xsl:when test="link != ''">