[Bedework-commit] bedework r2103 - in trunk/deployment:
resources/xsl/default/default
webadmin/webapp/resources/default/default
webpublic/webapp/resources/demoskins/MainCampus/default/default
webuser/webapp/resources/demoskins/default/default
svnadmin at bedework.org
svnadmin at bedework.org
Tue Mar 10 02:28:57 EDT 2009
Author: johnsa
Date: 2009-03-10 02:28:49 -0400 (Tue, 10 Mar 2009)
New Revision: 2103
Added:
trunk/deployment/resources/xsl/default/default/subColors.css
trunk/deployment/resources/xsl/default/default/subColors.xml
Removed:
trunk/deployment/webadmin/webapp/resources/default/default/subColors.css
trunk/deployment/webadmin/webapp/resources/default/default/subColors.xml
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.css
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.xml
trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css
trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
Modified:
trunk/deployment/webadmin/webapp/resources/default/default/default.css
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
web clients: some work on calendar colors
Added: trunk/deployment/resources/xsl/default/default/subColors.css
===================================================================
--- trunk/deployment/resources/xsl/default/default/subColors.css (rev 0)
+++ trunk/deployment/resources/xsl/default/default/subColors.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -0,0 +1,184 @@
+/* Subscription colors for web clients.
+ These colors correspond to subColors.xml, which is used
+ to create the web forms. Background-color must be
+ "important" to override more specific selectors in
+ the default.css stylesheet. */
+
+ /* **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. */
+
+
+.bwwhite {
+ background-color: #ffffff !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltpink {
+ background-color: #fddeee !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltpurple {
+ background-color: #ddd4e8 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltsteelblue {
+ background-color: #bfd5e8 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltblue {
+ background-color: #ccecef !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltaquamarine {
+ background-color: #b3e2dd !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltaquamarine {
+ background-color: #cfeccf !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltgreen {
+ background-color: #e0f3b0 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltyellow {
+ background-color: #ffffb0 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwltsalmon {
+ background-color: #feebc9 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+/* medium pastels */
+.bwgray {
+ background-color: #eeeeee !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwpink {
+ background-color: #fbb6d1 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwpurple {
+ background-color: #c1b3d7 !important;
+ color: black;
+ border-bottom: 1px solid #999 !important;
+}
+.bwsteelblue {
+ background-color: #94a8d0 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwblue {
+ background-color: #9acedf !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwaquamarine {
+ background-color: #86cfbe !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwseagreen {
+ background-color: #b5e1ae !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwgreen {
+ background-color: #bfe476 !important;
+ color: black;
+ border-bottom: 1px solid #999 !important;
+}
+.bwyellow {
+ background-color: #fffa81 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwsalmon {
+ background-color: #fdcaa2 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+/* dark pastels */
+.bwmdgray {
+ background-color: #dddddd !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdpink {
+ background-color: #f98cb6 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdpurple {
+ background-color: #a589c1 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdsteelblue {
+ background-color: #7589bf !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdblue {
+ background-color: #6fb7d6 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdaquamarine {
+ background-color: #48b5a3 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdseagreen {
+ background-color: #91d290 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdgreen {
+ background-color: #85ca5d !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdyellow {
+ background-color: #ffed62 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
+.bwmdsalmon {
+ background-color: #fca985 !important;
+ color: black;
+ border-bottom: 1px solid #999;
+}
Added: trunk/deployment/resources/xsl/default/default/subColors.xml
===================================================================
--- trunk/deployment/resources/xsl/default/default/subColors.xml (rev 0)
+++ trunk/deployment/resources/xsl/default/default/subColors.xml 2009-03-10 06:28:49 UTC (rev 2103)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Bedework Calendar subscription colors -->
+
+ <!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
+<!--
+
+ Bedework Calendar Colors
+
+ Parameters
+ name = value suitable for displaying in a UI
+ classname = value suitable for using as a css class
+
+ Value
+ The value is the rrggbb value of the color
+
+ -->
+
+<subscriptionColors>
+ <!-- light pastels -->
+ <color name="white" classname="bwwhite">#ffffff</color>
+ <color name="lt pink" classname="bwltpink">#fddeee</color>
+ <color name="lt purple" classname="bwltpurple">#ddd4e8</color>
+ <color name="lt steelblue" classname="bwltsteelblue">#bfd5e8</color>
+ <color name="lt blue" classname="bwltblue">#ccecef</color>
+ <color name="lt aquamarine" classname="bwltaquamarine">#b3e2dd</color>
+ <color name="lt seagreen" classname="bwltaquamarine">#cfeccf</color>
+ <color name="lt green" classname="bwltgreen">#e0f3b0</color>
+ <color name="lt yellow" classname="bwltyellow">#ffffb0</color>
+ <color name="lt salmon" classname="bwltsalmon">#feebc9</color>
+
+ <!-- medium pastels -->
+ <color name="gray" classname="bwgray">#eeeeee</color>
+ <color name="pink" classname="bwpink">#fbb6d1</color>
+ <color name="purple" classname="bwpurple">#c1b3d7</color>
+ <color name="steelblue" classname="bwsteelblue">#94a8d0</color>
+ <color name="blue" classname="bwblue">#9acedf</color>
+ <color name="aquamarine" classname="bwaquamarine">#86cfbe</color>
+ <color name="seagreen" classname="bwseagreen">#b5e1ae</color>
+ <color name="green" classname="bwgreen">#bfe476</color>
+ <color name="yellow" classname="bwyellow">#fffa81</color>
+ <color name="salmon" classname="bwsalmon">#fdcaa2</color>
+
+ <!-- dark pastels -->
+ <color name="md gray" classname="bwmdgray">#dddddd</color>
+ <color name="md pink" classname="bwmdpink">#f98cb6</color>
+ <color name="md purple" classname="bwmdpurple">#a589c1</color>
+ <color name="md steelblue" classname="bwmdsteelblue">#7589bf</color>
+ <color name="md blue" classname="bwmdblue">#6fb7d6</color>
+ <color name="md aquamarine" classname="bwmdaquamarine">#48b5a3</color>
+ <color name="md seagreen" classname="bwmdseagreen">#91d290</color>
+ <color name="md green" classname="bwmdgreen">#85ca5d</color>
+ <color name="md yellow" classname="bwmdyellow">#ffed62</color>
+ <color name="md salmon" classname="bwmdsalmon">#fca985</color>
+</subscriptionColors>
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -939,8 +939,11 @@
font-size: 0.9em;
padding: 2em;
}
+#content h4.calendarTreeTitle {
+ margin-bottom: -1em;
+}
ul.calendarTree {
- margin-top: 0;
+ margin-top: 1em;
white-space: nowrap;
}
.calendarTree ul {
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2009-03-10 06:28:49 UTC (rev 2103)
@@ -3308,7 +3308,7 @@
<input type="text" size="15" name="calPath"/>
<input type="submit" value="go"/>
</form>
- <h4>Public Tree</h4>
+ <h4 class="calendarTreeTitle">Public Tree</h4>
<ul class="calendarTree">
<xsl:choose>
<xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'">
Deleted: trunk/deployment/webadmin/webapp/resources/default/default/subColors.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/subColors.css 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webadmin/webapp/resources/default/default/subColors.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,184 +0,0 @@
-/* Subscription colors for web clients.
- These colors correspond to subColors.xml, which is used
- to create the web forms. Background-color must be
- "important" to override more specific selectors in
- the default.css stylesheet. */
-
- /* **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. */
-
-
-.bwwhite {
- background-color: #ffffff !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpink {
- background-color: #fddeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpurple {
- background-color: #ddd4e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsteelblue {
- background-color: #bfd5e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltblue {
- background-color: #ccecef !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #b3e2dd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #cfeccf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltgreen {
- background-color: #e0f3b0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltyellow {
- background-color: #ffffb0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsalmon {
- background-color: #feebc9 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* medium pastels */
-.bwgray {
- background-color: #eeeeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpink {
- background-color: #fbb6d1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpurple {
- background-color: #c1b3d7 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwsteelblue {
- background-color: #94a8d0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwblue {
- background-color: #9acedf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwaquamarine {
- background-color: #86cfbe !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwseagreen {
- background-color: #b5e1ae !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwgreen {
- background-color: #bfe476 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwyellow {
- background-color: #fffa81 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwsalmon {
- background-color: #fdcaa2 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* dark pastels */
-.bwmdgray {
- background-color: #dddddd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpink {
- background-color: #f98cb6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpurple {
- background-color: #a589c1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsteelblue {
- background-color: #7589bf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdblue {
- background-color: #6fb7d6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdaquamarine {
- background-color: #48b5a3 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdseagreen {
- background-color: #91d290 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdgreen {
- background-color: #85ca5d !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdyellow {
- background-color: #ffed62 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsalmon {
- background-color: #fca985 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
Deleted: trunk/deployment/webadmin/webapp/resources/default/default/subColors.xml
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/subColors.xml 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webadmin/webapp/resources/default/default/subColors.xml 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bedework Calendar subscription colors -->
-
-<!-- **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. -->
-
-<subscriptionColors>
- <!-- light pastels -->
- <color name="white">bwwhite</color>
- <color name="lt pink">bwltpink</color>
- <color name="lt purple">bwltpurple</color>
- <color name="lt steelblue">bwltsteelblue</color>
- <color name="lt blue">bwltblue</color>
- <color name="lt aquamarine">bwltaquamarine</color>
- <color name="lt seagreen">bwltaquamarine</color>
- <color name="lt green">bwltgreen</color>
- <color name="lt yellow">bwltyellow</color>
- <color name="lt salmon">bwltsalmon</color>
-
- <!-- medium pastels -->
- <color name="gray">bwgray</color>
- <color name="pink">bwpink</color>
- <color name="purple">bwpurple</color>
- <color name="steelblue">bwsteelblue</color>
- <color name="blue">bwblue</color>
- <color name="aquamarine">bwaquamarine</color>
- <color name="seagreen">bwseagreen</color>
- <color name="green">bwgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="yellow">bwyellow</color> -->
- <color name="salmon">bwsalmon</color>
-
- <!-- dark pastels -->
- <color name="md gray">bwmdgray</color>
- <color name="md pink">bwmdpink</color>
- <color name="md purple">bwmdpurple</color>
- <color name="md steelblue">bwmdsteelblue</color>
- <color name="md blue">bwmdblue</color>
- <color name="md aquamarine">bwmdaquamarine</color>
- <color name="md seagreen">bwmdseagreen</color>
- <color name="md green">bwmdgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="md yellow">bwmdyellow</color> -->
- <color name="md salmon">bwmdsalmon</color>
-</subscriptionColors>
Deleted: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.css 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,184 +0,0 @@
-/* Subscription colors for web clients.
- These colors correspond to subColors.xml, which is used
- to create the web forms. Background-color must be
- "important" to override more specific selectors in
- the default.css stylesheet. */
-
- /* **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. */
-
-
-.bwwhite {
- background-color: #ffffff !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpink {
- background-color: #fddeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpurple {
- background-color: #ddd4e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsteelblue {
- background-color: #bfd5e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltblue {
- background-color: #ccecef !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #b3e2dd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #cfeccf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltgreen {
- background-color: #e0f3b0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltyellow {
- background-color: #ffffb0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsalmon {
- background-color: #feebc9 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* medium pastels */
-.bwgray {
- background-color: #eeeeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpink {
- background-color: #fbb6d1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpurple {
- background-color: #c1b3d7 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwsteelblue {
- background-color: #94a8d0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwblue {
- background-color: #9acedf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwaquamarine {
- background-color: #86cfbe !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwseagreen {
- background-color: #b5e1ae !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwgreen {
- background-color: #bfe476 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwyellow {
- background-color: #fffa81 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwsalmon {
- background-color: #fdcaa2 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* dark pastels */
-.bwmdgray {
- background-color: #dddddd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpink {
- background-color: #f98cb6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpurple {
- background-color: #a589c1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsteelblue {
- background-color: #7589bf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdblue {
- background-color: #6fb7d6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdaquamarine {
- background-color: #48b5a3 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdseagreen {
- background-color: #91d290 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdgreen {
- background-color: #85ca5d !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdyellow {
- background-color: #ffed62 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsalmon {
- background-color: #fca985 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
Deleted: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.xml
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.xml 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/subColors.xml 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bedework Calendar subscription colors -->
-
-<!-- **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. -->
-
-<subscriptionColors>
- <!-- light pastels -->
- <color name="white">bwwhite</color>
- <color name="lt pink">bwltpink</color>
- <color name="lt purple">bwltpurple</color>
- <color name="lt steelblue">bwltsteelblue</color>
- <color name="lt blue">bwltblue</color>
- <color name="lt aquamarine">bwltaquamarine</color>
- <color name="lt seagreen">bwltaquamarine</color>
- <color name="lt green">bwltgreen</color>
- <color name="lt yellow">bwltyellow</color>
- <color name="lt salmon">bwltsalmon</color>
-
- <!-- medium pastels -->
- <color name="gray">bwgray</color>
- <color name="pink">bwpink</color>
- <color name="purple">bwpurple</color>
- <color name="steelblue">bwsteelblue</color>
- <color name="blue">bwblue</color>
- <color name="aquamarine">bwaquamarine</color>
- <color name="seagreen">bwseagreen</color>
- <color name="green">bwgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="yellow">bwyellow</color> -->
- <color name="salmon">bwsalmon</color>
-
- <!-- dark pastels -->
- <color name="md gray">bwmdgray</color>
- <color name="md pink">bwmdpink</color>
- <color name="md purple">bwmdpurple</color>
- <color name="md steelblue">bwmdsteelblue</color>
- <color name="md blue">bwmdblue</color>
- <color name="md aquamarine">bwmdaquamarine</color>
- <color name="md seagreen">bwmdseagreen</color>
- <color name="md green">bwmdgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="md yellow">bwmdyellow</color> -->
- <color name="md salmon">bwmdsalmon</color>
-</subscriptionColors>
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1622,11 +1622,11 @@
font-weight: bold;
font-size: 0.9em;
}
-#bedework img.subStyle {
+#bedework img.bwCalendarColor {
float: right;
clear: right;
padding: 0;
- margin: 0 10px 0 2px;
+ margin: 5px 10px 0 2px;
width: 0.8em;
height: 0.5em;
border: 1px solid #666 !important;
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2009-03-10 06:28:49 UTC (rev 2103)
@@ -237,6 +237,10 @@
<!-- show an event -->
<xsl:apply-templates select="/bedework/event"/>
</xsl:when>
+ <xsl:when test="/bedework/page='eventList'">
+ <!-- show a list of discrete events in a time period -->
+ <xsl:apply-templates select="/bedework/events" mode="eventList"/>
+ </xsl:when>
<xsl:when test="/bedework/page='addEvent'">
<xsl:apply-templates select="/bedework/formElements" mode="addEvent"/>
</xsl:when>
@@ -922,7 +926,7 @@
<!-- toggle list / calendar view -->
<xsl:choose>
- <xsl:when test="/bedework/periodname='Day'">
+ <xsl:when test="/bedework/periodname='Day' or /bedework/page='eventList'">
<img src="{$resourcesRoot}/resources/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
</xsl:when>
<xsl:when test="/bedework/periodname='Year'">
@@ -960,37 +964,51 @@
<!-- summary / detailed mode toggle -->
<xsl:choose>
- <xsl:when test="/bedework/periodname='Year' or
+ <xsl:when test="/bedework/page = 'eventList'">
+ <xsl:choose>
+ <xsl:when test="/bedework/appvar[key='listEventsSummaryMode']/value='details'">
+ <a href="{$listEvents}&setappvar=listEventsSummaryMode(summary)" title="toggle summary/detailed view">
+ <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{$listEvents}&setappvar=listEventsSummaryMode(details)" title="toggle summary/detailed view">
+ <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="/bedework/periodname='Year' or
(/bedework/periodname='Month' and
(/bedework/appvar[key='monthViewMode']/value='cal' or
not(/bedework/appvar[key='monthViewMode']))) or
(/bedework/periodname='Week' and
(/bedework/appvar[key='weekViewMode']/value='cal' or
not(/bedework/appvar[key='weekViewMode'])))">
- <xsl:choose>
- <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
- <img src="{$resourcesRoot}/resources/std-button-summary-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
- </xsl:when>
- <xsl:otherwise>
- <img src="{$resourcesRoot}/resources/std-button-details-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
- <a href="{$setup}&setappvar=summaryMode(summary)" title="toggle summary/detailed view">
- <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <a href="{$setup}&setappvar=summaryMode(details)" title="toggle summary/detailed view">
- <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
+ <img src="{$resourcesRoot}/resources/std-button-summary-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <img src="{$resourcesRoot}/resources/std-button-details-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
+ <a href="{$setup}&setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+ <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{$setup}&setappvar=summaryMode(details)" title="toggle summary/detailed view">
+ <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<!-- refresh button -->
<a href="{$setup}"><img src="{$resourcesRoot}/resources/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a>
@@ -1286,6 +1304,115 @@
</xsl:if>
</xsl:template>
+ <!--==== LIST EVENTS - for listing discrete events ====-->
+ <xsl:template match="events" mode="eventList">
+ <h2 class="bwStatusConfirmed">
+ Next 7 Days
+ <!-- xsl:choose>
+ <xsl:when test="/bedework/now/longdate = /bedework/events/event[position()=last()]/start/longdate"><xsl:value-of select="/bedework/now/longdate"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="/bedework/now/longdate"/> - <xsl:value-of select="/bedework/events/event[position()=last()]/start/longdate"/></xsl:otherwise>
+ </xsl:choose-->
+ </h2>
+
+ <div id="listEvents">
+ <ul>
+ <xsl:choose>
+ <xsl:when test="not(event)">
+ <li>No events to display.</li>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="event">
+ <xsl:variable name="id" select="id"/>
+ <xsl:variable name="subscriptionId" select="subscription/id"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
+ <xsl:variable name="guid" select="guid"/>
+ <xsl:variable name="recurrenceId" select="recurrenceId"/>
+ <li>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="status='CANCELLED'">bwStatusCancelled</xsl:when>
+ <xsl:when test="status='TENTATIVE'">bwStatusTentative</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+
+ <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if>
+ <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if>
+
+ <a class="title" href="{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">
+ <xsl:value-of select="summary"/>
+ </a><xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
+ <xsl:if test="/bedework/appvar[key='listEventsSummaryMode']/value='details'">
+ <xsl:if test="location/subaddress != ''">
+ , <xsl:value-of select="location/subaddress"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:text> </xsl:text>
+ <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
+ <a href="{$export}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+ <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
+ </a>
+
+ <br/>
+
+ <xsl:value-of select="substring(start/dayname,1,3)"/>,
+ <xsl:value-of select="start/longdate"/>
+ <xsl:text> </xsl:text>
+ <xsl:if test="start/allday != 'true'">
+ <xsl:value-of select="start/time"/>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="start/shortdate != end/shortdate">
+ -
+ <xsl:value-of select="substring(end/dayname,1,3)"/>,
+ <xsl:value-of select="end/longdate"/>
+ <xsl:text> </xsl:text>
+ <xsl:if test="start/allday != 'true'">
+ <xsl:value-of select="end/time"/>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="start/time != end/time">
+ -
+ <xsl:value-of select="end/time"/>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:if test="/bedework/appvar[key='listEventsSummaryMode']/value='details'">
+ <br/>
+ <xsl:value-of select="description"/>
+ <xsl:if test="link != ''">
+ <br/>
+ <xsl:variable name="link" select="link"/>
+ <a href="{$link}" class="moreLink"><xsl:value-of select="link"/></a>
+ </xsl:if>
+ <xsl:if test="categories/category">
+ <br/>
+ Categories:
+ <xsl:for-each select="categories/category">
+ <xsl:value-of select="word"/><xsl:if test="position() != last()">, </xsl:if>
+ </xsl:for-each>
+ </xsl:if>
+ <br/>
+ <em>
+ <xsl:if test="cost!=''">
+ <xsl:value-of select="cost"/>. 
+ </xsl:if>
+ <xsl:if test="contact/name!='none'">
+ Contact: <xsl:value-of select="contact/name"/>
+ </xsl:if>
+ </em>
+ </xsl:if>
+
+ </li>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
+ </xsl:template>
+
<!--==== WEEK CALENDAR VIEW ====-->
<xsl:template name="weekView">
<table id="monthCalendarTable" border="0" cellpadding="0" cellspacing="0">
@@ -1408,19 +1535,15 @@
<xsl:otherwise>eventLinkB</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <!-- User defined subscription styles.
- These are set in the add/modify subscription forms which
- rely (in this stylesheet) on subColors.css; if present, these
+ <!-- Calendar colors are set in the add/modify calendar forms which, if present,
override the background-color set by eventClass. User 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>
<li>
<a href="{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"
- class="{$eventRootClass} {$eventClass} {$subscriptionClass}">
+ class="{$eventRootClass} {$eventClass}">
+ <xsl:if test="status != 'CANCELLED' and calendar/color != ''">
+ <xsl:attribute name="style">background-color: <xsl:value-of select="calendar/color"/>; color: black;</xsl:attribute>
+ </xsl:if>
<xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
<xsl:choose>
<xsl:when test="start/shortdate != ../shortdate">
@@ -4414,6 +4537,11 @@
<xsl:otherwise>calendar</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
+ <xsl:if test="color != '' and color != 'null'">
+ <!-- the spacer gif approach allows us to avoid some IE misbehavior -->
+ <xsl:variable name="color" select="color"/>
+ <img src="{$resourcesRoot}/resources/spacer.gif" width="6" height="6" alt="calendar color" class="bwCalendarColor" style="background-color: {$color}; color:black;"/>
+ </xsl:if>
<xsl:variable name="calPath" select="encodedPath"/>
<a href="{$setSelection}&calUrl={$calPath}">
<xsl:value-of select="name"/>
@@ -4719,16 +4847,17 @@
<tr>
<th>Color:</th>
<td>
- <select name="calendar.color">
+ <input type="text" name="calendar.color" value="" size="40"/>
+ <!-- select name="calendar.color">
<option value="">default</option>
- <xsl:for-each select="document('subColors.xml')/subscriptionColors/color">
- <xsl:variable name="subColor" select="@rgb"/>
- <xsl:variable name="subColorClass" select="."/>
- <option value="{$subColor}" class="{$subColorClass}">
+ <xsl:for-each select="document('../../../bedework-common/default/default/subColors.xml')/subscriptionColors/color">
+ <xsl:variable name="subColor" select="."/>
+ <xsl:variable name="subColorClass" select="@classname"/>
+ <option value="{$subColor}" style="background-color:{$subColor};color:black;">
<xsl:value-of select="@name"/>
</option>
</xsl:for-each>
- </select>
+ </select-->
</td>
</tr>
<tr>
@@ -4924,8 +5053,9 @@
<tr>
<th>Color:</th>
<td>
- <input type="text" name="calendar.color" value="" size="40">
+ <input type="text" name="calendar.color" size="7">
<xsl:attribute name="value"><xsl:value-of select="color"/></xsl:attribute>
+ <xsl:attribute name="style">background-color: <xsl:value-of select="color"/>;color: black;</xsl:attribute>
</input>
</td>
</tr>
Deleted: trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,184 +0,0 @@
-/* Subscription colors for web clients.
- These colors correspond to subColors.xml, which is used
- to create the web forms. Background-color must be
- "important" to override more specific selectors in
- the default.css stylesheet. */
-
- /* **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. */
-
-
-.bwwhite {
- background-color: #ffffff !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpink {
- background-color: #fddeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltpurple {
- background-color: #ddd4e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsteelblue {
- background-color: #bfd5e8 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltblue {
- background-color: #ccecef !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #b3e2dd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltaquamarine {
- background-color: #cfeccf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltgreen {
- background-color: #e0f3b0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltyellow {
- background-color: #ffffb0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwltsalmon {
- background-color: #feebc9 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* medium pastels */
-.bwgray {
- background-color: #eeeeee !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpink {
- background-color: #fbb6d1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwpurple {
- background-color: #c1b3d7 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwsteelblue {
- background-color: #94a8d0 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwblue {
- background-color: #9acedf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwaquamarine {
- background-color: #86cfbe !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwseagreen {
- background-color: #b5e1ae !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwgreen {
- background-color: #bfe476 !important;
- color: black;
- border-bottom: 1px solid #999 !important;
-}
-.bwyellow {
- background-color: #fffa81 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwsalmon {
- background-color: #fdcaa2 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-/* dark pastels */
-.bwmdgray {
- background-color: #dddddd !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpink {
- background-color: #f98cb6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdpurple {
- background-color: #a589c1 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsteelblue {
- background-color: #7589bf !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdblue {
- background-color: #6fb7d6 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdaquamarine {
- background-color: #48b5a3 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdseagreen {
- background-color: #91d290 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdgreen {
- background-color: #85ca5d !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdyellow {
- background-color: #ffed62 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
-.bwmdsalmon {
- background-color: #fca985 !important;
- color: black;
- border-bottom: 1px solid #999;
-}
Deleted: trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml 2009-03-06 21:28:31 UTC (rev 2102)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml 2009-03-10 06:28:49 UTC (rev 2103)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bedework Calendar subscription colors -->
-
- <!-- **********************************************************************
- Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
- The above copyright notice and this permission notice appear in all
- copies and supporting documentation;
-
- The name, identifiers, and trademarks of Rensselaer Polytechnic
- Institute are not used in advertising or publicity without the
- express prior written permission of Rensselaer Polytechnic Institute;
-
- DISCLAIMER: The software is distributed" AS IS" without any express or
- implied warranty, including but not limited to, any implied warranties
- of merchantability or fitness for a particular purpose or any warrant)'
- of non-infringement of any current or pending patent rights. The authors
- of the software make no representations about the suitability of this
- software for any particular purpose. The entire risk as to the quality
- and performance of the software is with the user. Should the software
- prove defective, the user assumes the cost of all necessary servicing,
- repair or correction. In particular, neither Rensselaer Polytechnic
- Institute, nor the authors of the software are liable for any indirect,
- special, consequential, or incidental damages related to the software,
- to the maximum extent the law permits. -->
-
-<!--
-
- Bedework Subscription Colors
-
- Parameters
- name = value suitable for displaying in a UI
- rgb = rgb value for embedding in objects, e.g. calendars
-
- Value
- The value is a class name reprsented in subColors.css.
- Future versions of Bedework will imbed rgb values as properties of
- calendars, and will use these values directly.
- The class names are kept for Bedework 3.4.1.1 backwards compatibility.
-
- -->
-
-<subscriptionColors>
- <!-- light pastels -->
- <color name="white" rgb="ffffff">bwwhite</color>
- <color name="lt pink" rgb="fddeee">bwltpink</color>
- <color name="lt purple" rgb="ddd4e8">bwltpurple</color>
- <color name="lt steelblue" rgb="bfd5e8">bwltsteelblue</color>
- <color name="lt blue" rgb="ccecef">bwltblue</color>
- <color name="lt aquamarine" rgb="b3e2dd">bwltaquamarine</color>
- <color name="lt seagreen" rgb="cfeccf">bwltaquamarine</color>
- <color name="lt green" rgb="e0f3b0">bwltgreen</color>
- <color name="lt yellow" rgb="ffffb0">bwltyellow</color>
- <color name="lt salmon" rgb="feebc9">bwltsalmon</color>
-
- <!-- medium pastels -->
- <color name="gray" rgb="eeeeee">bwgray</color>
- <color name="pink" rgb="fbb6d1">bwpink</color>
- <color name="purple" rgb="c1b3d7">bwpurple</color>
- <color name="steelblue" rgb="94a8d0">bwsteelblue</color>
- <color name="blue" rgb="9acedf">bwblue</color>
- <color name="aquamarine" rgb="86cfbe">bwaquamarine</color>
- <color name="seagreen" rgb="b5e1ae">bwseagreen</color>
- <color name="green" rgb="bfe476">bwgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="yellow" rgb="fffa81">bwyellow</color> -->
- <color name="salmon" rgb="fdcaa2">bwsalmon</color>
-
- <!-- dark pastels -->
- <color name="md gray" rgb="dddddd">bwmdgray</color>
- <color name="md pink" rgb="f98cb6">bwmdpink</color>
- <color name="md purple" rgb="a589c1">bwmdpurple</color>
- <color name="md steelblue" rgb="7589bf">bwmdsteelblue</color>
- <color name="md blue" rgb="6fb7d6">bwmdblue</color>
- <color name="md aquamarine" rgb="48b5a3">bwmdaquamarine</color>
- <color name="md seagreen" rgb="91d290">bwmdseagreen</color>
- <color name="md green" rgb="85ca5d">bwmdgreen</color>
- <!-- don't allow bright yellow - reserve for a hover color
- <color name="md yellow" rgb="ffed62">bwmdyellow</color> -->
- <color name="md salmon" rgb="fca985">bwmdsalmon</color>
-</subscriptionColors>
More information about the Bedework-commit
mailing list