[Bedework-commit] r545 - in trunk/calendar3/deployment:
webpublic/webapp/resources/demoskins/default/default
webpublic/webapp/resources/demoskins/images
webuser/webapp/resources/demoskins/default/default
webuser/webapp/resources/demoskins/resources
svnadmin at bedework.org
svnadmin at bedework.org
Wed Jun 7 13:40:01 EDT 2006
Author: johnsa
Date: 2006-06-07 13:40:00 -0400 (Wed, 07 Jun 2006)
New Revision: 545
Added:
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/images/tentativeLines.gif
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/tentativeLines.gif
Modified:
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.css
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl
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 public client
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -46,9 +46,6 @@
color: #333;
text-decoration: none;
}
-#titleBar {
- display: none;
-}
#curDateRangeTable {
width: 100%;
height: 26px;
@@ -471,6 +468,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: #f0eee5 url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#monthCalendarTable a.holiday:link,
#monthCalendarTable a.holiday:visited,
#monthCalendarTable a.holiday:active {
@@ -485,6 +493,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;
@@ -522,8 +531,6 @@
color: black;
padding: 4px;
border: 1px solid #333;
- /*opacity: .80;
- filter: alpha(opacity=80);*/
}
#monthCalendarTable a:hover span.eventTipReverse {
display: block;
@@ -535,8 +542,6 @@
color: black;
padding: 4px;
border: 1px solid #333;
- /*opacity: .80;
- filter: alpha(opacity=80);*/
}
#monthCalendarTable a:hover span.eventTipStatus {
display: block;
@@ -688,6 +693,20 @@
color: black;
width: 100%;
}
+#listTable td.description {
+ text-align: left;
+ background-color: white;
+ color: black;
+ width: 100%;
+}
+#listTable td.bwStatusCancelled {
+ background-color: #ddd;
+ color: black;
+}
+#listTable td.bwStatusTentative {
+ background: white url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#listTable td.description a {
display: block;
background-color: transparent;
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 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -6,8 +6,6 @@
border-bottom: 1px solid #ccc;
border-left: 2px solid #aaa;
border-right: 2px solid #aaa;
- background-color: #eee;
- color: black;
}
h2 a:link,
h2 a:active,
@@ -17,6 +15,17 @@
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('../../images/tentativeLines.gif') top;
+}
/* Header IDs and classes */
#errors {
margin: 0;
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl 2006-06-07 17:40:00 UTC (rev 545)
@@ -63,7 +63,6 @@
<xsl:variable name="prevdate" select="/bedework/previousdate"/>
<xsl:variable name="nextdate" select="/bedework/nextdate"/>
<xsl:variable name="curdate" select="/bedework/currentdate/date"/>
- <xsl:variable name="skin">default</xsl:variable>
<!-- MAIN TEMPLATE -->
@@ -505,7 +504,14 @@
<!--==== SINGLE EVENT ====-->
<xsl:template match="event">
- <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 != ''">
@@ -757,7 +763,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>
@@ -889,6 +896,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>
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -466,6 +466,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: #f0eee5 url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#monthCalendarTable a.holiday:link,
#monthCalendarTable a.holiday:visited,
#monthCalendarTable a.holiday:active {
@@ -480,6 +491,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;
@@ -679,14 +691,18 @@
}
#listTable td.description {
text-align: left;
- background-color: #fff;
+ background-color: white;
color: black;
width: 100%;
}
-#listTable td.cancelled {
+#listTable td.bwStatusCancelled {
background-color: #ddd;
color: black;
}
+#listTable td.bwStatusTentative {
+ background: white url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#listTable td.description a {
display: block;
background-color: transparent;
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -466,6 +466,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: #f0eee5 url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#monthCalendarTable a.holiday:link,
#monthCalendarTable a.holiday:visited,
#monthCalendarTable a.holiday:active {
@@ -480,6 +491,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;
@@ -679,14 +691,18 @@
}
#listTable td.description {
text-align: left;
- background-color: #fff;
+ background-color: white;
color: black;
width: 100%;
}
-#listTable td.cancelled {
+#listTable td.bwStatusCancelled {
background-color: #ddd;
color: black;
}
+#listTable td.bwStatusTentative {
+ background: white url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#listTable td.description a {
display: block;
background-color: transparent;
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.css 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -468,6 +468,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: #f0eee5 url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#monthCalendarTable a.holiday:link,
#monthCalendarTable a.holiday:visited,
#monthCalendarTable a.holiday:active {
@@ -482,6 +493,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;
@@ -685,10 +697,14 @@
color: black;
width: 100%;
}
-#listTable td.cancelled {
+#listTable td.bwStatusCancelled {
background-color: #ddd;
color: black;
}
+#listTable td.bwStatusTentative {
+ background: white url('../../images/tentativeLines.gif') top;
+ color: black;
+}
#listTable td.description a {
display: block;
background-color: transparent;
@@ -818,8 +834,6 @@
border-bottom: 1px solid #ccc;
border-left: 2px solid #aaa;
border-right: 2px solid #aaa;
- background-color: #eee;
- color: black;
}
h2 a:link,
h2 a:active,
@@ -829,6 +843,17 @@
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('../../images/tentativeLines.gif') top;
+}
/* Header IDs and classes */
#errors {
margin: 0;
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl 2006-06-07 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl 2006-06-07 17:40:00 UTC (rev 545)
@@ -509,7 +509,14 @@
<!--==== SINGLE EVENT ====-->
<xsl:template match="event">
- <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 != ''">
@@ -761,7 +768,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>
@@ -893,6 +901,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>
Added: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/images/tentativeLines.gif
===================================================================
(Binary files differ)
Property changes on: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/images/tentativeLines.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-06-07 17:40:00 UTC (rev 545)
@@ -359,8 +359,8 @@
font-size: 0.8em;
margin: 0em;
padding: 0.3em 0 0.3em 1em;
- border-left : 1px solid #333;
- border-right : 1px solid #333;
+ border-left : 2px solid #333;
+ border-right : 2px solid #333;
border-bottom: 1px solid Gray;
color: black;
background: #d8e118 url(../../resources/glassFill-message.gif) repeat-x bottom;
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 15:46:00 UTC (rev 544)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-07 17:40:00 UTC (rev 545)
@@ -21,7 +21,7 @@
set to the application root, but for the personal calendar
this should be changed to point to a
web server over https to avoid mixed content errors, e.g.,
- <xsl:variable name="resourcesRoot" select="'https://mywebserver.edu/myresourcesdir'"/>
+ <xsl:variable name="resourcesRoot">https://mywebserver.edu/myresourcesdir</xsl:variable>
-->
<xsl:variable name="resourcesRoot" select="/bedework/approot"/>
Added: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/tentativeLines.gif
===================================================================
(Binary files differ)
Property changes on: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/tentativeLines.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Bedework-commit
mailing list