[Bedework-commit] r554 - in trunk/calendar3:
deployment/webuser/webapp/resources/demoskins/default/default
deployment/webuser/webapp/resources/demoskins/resources
skins/webpublic/rensselaer/default/default
webcommon/src/org/bedework/webcommon/subs
svnadmin at bedework.org
svnadmin at bedework.org
Thu Jun 8 15:12:04 EDT 2006
Author: johnsa
Date: 2006-06-08 15:12:03 -0400 (Thu, 08 Jun 2006)
New Revision: 554
Added:
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
trunk/calendar3/skins/webpublic/rensselaer/default/default/common.css
Modified:
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/addEvent-forGrid-icon.gif
trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java
Log:
user client can now set subscription colors
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-08 17:49:52 UTC (rev 553)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-06-08 19:12:03 UTC (rev 554)
@@ -656,28 +656,10 @@
background: #eee url('../../resources/tentativeLines.gif') top;
color: black;
}
-#monthCalendarTable a.holiday:link,
-#monthCalendarTable a.holiday:visited,
-#monthCalendarTable a.holiday:active {
- display: block;
- padding: 0.1em 0.2em 0.1em 0.2em;
- text-decoration: none;
- background-color: #fff;
+#monthCalendarTable a:hover {
color: black;
- /*border-top: 1px solid black;
- border-bottom: 1px solid black;*/
+ background-color: #ffa !important; /* must be important to override subscription colors */
}
-#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;
- text-decoration: none;
- color: black;
- background-color: #ffa;
-}
#monthCalendarTable a.dayLink {
text-decoration: none;
color: black;
@@ -686,8 +668,8 @@
}
#monthCalendarTable a:hover.dayLink {
text-decoration: none;
- color: #eee;
- background-color: black;
+ color: #eee !important; /* must be important to override a:hover selector above */
+ background-color: black !important; /* must be important to override a:hover selector above */
}
#monthCalendarTable a:hover {
/* required for eventTip to hover correctly;
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-08 17:49:52 UTC (rev 553)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-08 19:12:03 UTC (rev 554)
@@ -236,6 +236,7 @@
<title>Bedework: Personal Calendar Client</title>
<meta name="robots" content="noindex,nofollow"/>
<link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
+ <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/>
<link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" />
<link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" />
<xsl:if test="/bedework/page='addEvent' or
@@ -881,7 +882,7 @@
<td>
<xsl:variable name="dayDate" select="date"/>
<a href="{$initEvent}?startdate={$dayDate}" class="gridAdd" title="add event">
- <img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="10" height="10" border="0" alt="add event"/>
+ <img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="9" height="10" border="0" alt="add event"/>
</a>
<a href="{$setViewPeriod}?viewType=dayView&date={$dayDate}" class="dayLink" title="go to day">
<xsl:value-of select="value"/>
@@ -948,14 +949,26 @@
<!-- 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 -->
+ <!-- Otherwise: Alternating colors for all standard events -->
<xsl:when test="position() mod 2 = 1">eventLinkA</xsl:when>
<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
+ override the background-color set by eventClass. User styles should
+ not be used for cancelled events (tentative is ok). -->
+ <xsl:variable name="subColor">
+ <xsl:choose>
+ <xsl:when test="status != 'CANCELLED' and
+ subscription/style != '' and
+ subscription/style != 'default'"><xsl:value-of select="subscription/style"/></xsl:when>
+ <xsl:otherwise></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<li>
- <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" class="{$eventClass}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" class="{$eventClass} {$subColor}">
<xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
<xsl:value-of select="summary"/>
<xsl:variable name="eventTipClass">
@@ -2995,7 +3008,15 @@
<tr>
<td class="fieldname">Style:</td>
<td>
- <input type="text" value="" name="style" size="60"/>
+ <select name="style">
+ <option value="default">default</option>
+ <xsl:for-each select="document('subColors.xml')/subscriptionColors/color">
+ <xsl:variable name="subColor" select="."/>
+ <option value="{$subColor}" class="{$subColor}">
+ <xsl:value-of select="."/>
+ </option>
+ </xsl:for-each>
+ </select>
</td>
</tr>
<!--<tr>
@@ -3028,15 +3049,15 @@
<td class="fieldname">Name:</td>
<td>
<xsl:variable name="subName" select="name"/>
- <input type="text" value="{$subName}" name="subscription.name" size="60"/>
+ <input type="text" value="{$subName}" name="name" size="60"/>
</td>
</tr>
<xsl:if test="internal='false'">
<tr>
<td class="fieldname">Uri:</td>
<td>
- <xsl:variable name="subUri" select="uri"/>
- <input type="text" value="{$subUri}" name="subscription.uri" size="60"/>
+ <xsl:variable name="calPath" select="uri"/>
+ <input type="text" value="{$calPath}" name="calPath" size="60"/>
</td>
</tr>
</xsl:if>
@@ -3050,22 +3071,29 @@
<tr>
<td class="fieldname">Affects Free/Busy:</td>
<td>
- <input type="radio" value="true" name="subscription.affectsFreeBusy" checked="checked"/> yes
- <input type="radio" value="false" name="subscription.affectsFreeBusy"/> no
+ <input type="radio" value="true" name="subscription.affectsFreeBusy"/> yes
+ <input type="radio" value="false" name="subscription.affectsFreeBusy" checked="checked"/> no
</td>
</tr>
<tr>
<td class="fieldname">Style:</td>
<td>
- <xsl:variable name="subStyle" select="style"/>
- <input type="text" value="{$subStyle}" name="subscription.style" size="60"/>
+ <select name="subscription.style">
+ <option value="default">default</option>
+ <xsl:for-each select="document('subColors.xml')/subscriptionColors/color">
+ <xsl:variable name="subColor" select="."/>
+ <option value="{$subColor}" class="{$subColor}">
+ <xsl:value-of select="."/>
+ </option>
+ </xsl:for-each>
+ </select>
</td>
</tr>
<!--<tr>
<td class="fieldname">Unremovable:</td>
<td>
- <input type="radio" value="true" name="unremoveable" size="60"/> true
- <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false
+ <input type="radio" value="true" name="subscription.unremoveable" size="60"/> true
+ <input type="radio" value="false" name="subscription.unremoveable" size="60" checked="checked"/> false
</td>
</tr>-->
</table>
@@ -3146,7 +3174,24 @@
<td class="fieldname">Style:</td>
<td>
<xsl:variable name="subStyle" select="style"/>
- <input type="text" value="{$subStyle}" name="subscription.style" size="60"/>
+ <select name="subscription.style">
+ <option value="default">default</option>
+ <xsl:for-each select="document('subColors.xml')/subscriptionColors/color">
+ <xsl:variable name="subColor" select="."/>
+ <xsl:choose>
+ <xsl:when test="$subStyle = $subColor">
+ <option value="{$subColor}" class="{$subColor}" selected="selected">
+ <xsl:value-of select="."/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="{$subColor}" class="{$subColor}">
+ <xsl:value-of select="."/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
</td>
</tr>
<!--<tr>
Added: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css (rev 0)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css 2006-06-08 19:12:03 UTC (rev 554)
@@ -0,0 +1,323 @@
+/* subscription colors for user client.
+ background-color must be "important" to override more
+ specific selectors in the default.css stylesheet */
+.FFFFFF {
+ background-color: #FFFFFF !important;
+ color: black;
+}
+.F8F8FF {
+ background-color: #F8F8FF !important;
+ color: black;
+}
+.FFFAF0 {
+ background-color: #FFFAF0 !important;
+ color: black;
+}
+.FFF5EE {
+ background-color: #FFF5EE !important;
+ color: black;
+}
+.EEE5DE {
+ background-color: #EEE5DE !important;
+ color: black;
+}
+.FFFFF0 {
+ background-color: #FFFFF0 !important;
+ color: black;
+}
+.FAF0E6 {
+ background-color: #FAF0E6 !important;
+ color: black;
+}
+.EEEEE0 {
+ background-color: #EEEEE0 !important;
+ color: black;
+}
+.FFFFE0 {
+ background-color: #FFFFE0 !important;
+ color: black;
+}
+.EEEED1 {
+ background-color: #EEEED1 !important;
+ color: black;
+}
+.CDCDB4 {
+ background-color: #CDCDB4 !important;
+ color: black;
+}
+.FFFACD {
+ background-color: #FFFACD !important;
+ color: black;
+}
+.EEE9BF {
+ background-color: #EEE9BF !important;
+ color: black;
+}
+.CDC9A5{
+ background-color: #CDC9A5 !important;
+ color: black;
+}
+.FFF68F {
+ background-color: #FFF68F !important;
+ color: black;
+}
+.EEE685 {
+ background-color: #EEE685 !important;
+ color: black;
+}
+.CDC673 {
+ background-color: #CDC673 !important;
+ color: black;
+}
+.FFEC8B {
+ background-color: #FFEC8B !important;
+ color: black;
+}
+.EEDC82 {
+ background-color: #EEDC82 !important;
+ color: black;
+}
+.CDBE70 {
+ background-color: #CDBE70 !important;
+ color: black;
+}
+.FFF8DC {
+ background-color: #FFF8DC !important;
+ color: black;
+}
+.EEE8CD {
+ background-color: #EEE8CD !important;
+ color: black;
+}
+.CDC8B1 {
+ background-color: #CDC8B1 !important;
+ color: black;
+}
+.FDF5E6 {
+ background-color: #FDF5E6 !important;
+ color: black;
+}
+.FFEFDB {
+ background-color: #FFEFDB !important;
+ color: black;
+}
+.EEDFCC {
+ background-color: #EEDFCC !important;
+ color: black;
+}
+.FAEBD7 {
+ background-color: #FAEBD7 !important;
+ color: black;
+}
+.FFEFD5 {
+ background-color: #FFEFD5 !important;
+ color: black;
+}
+.FFEBCD {
+ background-color: #FFEBCD !important;
+ color: black;
+}
+.FFDAB9 {
+ background-color: #FFDAB9 !important;
+ color: black;
+}
+.EECBAD {
+ background-color: #EECBAD !important;
+ color: black;
+}
+.CDAF95 {
+ background-color: #CDAF95 !important;
+ color: black;
+}
+.FFE7BA {
+ background-color: #FFE7BA !important;
+ color: black;
+}
+.EED8AE {
+ background-color: #EED8AE !important;
+ color: black;
+}
+.CDBA96 {
+ background-color: #CDBA96 !important;
+ color: black;
+}
+.FFE4B5 {
+ background-color: #FFE4B5 !important;
+ color: black;
+}
+.FFDEAD {
+ background-color: #FFDEAD !important;
+ color: black;
+}
+.EECFA1 {
+ background-color: #EECFA1 !important;
+ color: black;
+}
+.FFE4C4 {
+ background-color: #FFE4C4 !important;
+ color: black;
+}
+.EED5B7 {
+ background-color: #EED5B7 !important;
+ color: black;
+}
+.CDB79E {
+ background-color: #CDB79E !important;
+ color: black;
+}
+.FFD39B {
+ background-color: #FFD39B !important;
+ color: black;
+}
+.EEC591 {
+ background-color: #EEC591 !important;
+ color: black;
+}
+.CDAA7D {
+ background-color: #CDAA7D !important;
+ color: black;
+}
+.FFA07A {
+ background-color: #FFA07A !important;
+ color: black;
+}
+.EE9572 {
+ background-color: #EE9572 !important;
+ color: black;
+}
+.CD8162 {
+ background-color: #CD8162 !important;
+ color: black;
+}
+.FF8C69 {
+ background-color: #FF8C69 !important;
+ color: black;
+}
+.EE8262 {
+ background-color: #EE8262 !important;
+ color: black;
+}
+.CD7054 {
+ background-color: #CD7054 !important;
+ color: black;
+}
+.FFA54F {
+ background-color: #FFA54F !important;
+ color: black;
+}
+.EE9A49 {
+ background-color: #EE9A49 !important;
+ color: black;
+}
+.CD853F {
+ background-color: #CD853F !important;
+ color: black;
+}
+.FFE4E1 {
+ background-color: #FFE4E1 !important;
+ color: black;
+}
+.EED5D2 {
+ background-color: #EED5D2 !important;
+ color: black;
+}
+.CDB7B5 {
+ background-color: #CDB7B5 !important;
+ color: black;
+}
+.FFC1C1 {
+ background-color: #FFC1C1 !important;
+ color: black;
+}
+.EEB4B4 {
+ background-color: #EEB4B4 !important;
+ color: black;
+}
+.CD9B9B {
+ background-color: #CD9B9B !important;
+ color: black;
+}
+.FFB5C5 {
+ background-color: #FFB5C5 !important;
+ color: black;
+}
+.EEA9B8 {
+ background-color: #EEA9B8 !important;
+ color: black;
+}
+.CD919E {
+ background-color: #CD919E !important;
+ color: black;
+}
+.FFAEB9 {
+ background-color: #FFAEB9 !important;
+ color: black;
+}
+.EEA2AD {
+ background-color: #EEA2AD !important;
+ color: black;
+}
+.CD8C95 {
+ background-color: #CD8C95 !important;
+ color: black;
+}
+.FFF0F5 {
+ background-color: #FFF0F5 !important;
+ color: black;
+}
+.EEE0E5 {
+ background-color: #EEE0E5 !important;
+ color: black;
+}
+.CDC1C5 {
+ background-color: #CDC1C5 !important;
+ color: black;
+}
+.FFE1FF {
+ background-color: #FFE1FF !important;
+ color: black;
+}
+.EED2EE {
+ background-color: #EED2EE !important;
+ color: black;
+}
+.CDB5CD {
+ background-color: #CDB5CD !important;
+ color: black;
+}
+.FFBBFF {
+ background-color: #FFBBFF !important;
+ color: black;
+}
+.EEAEEE {
+ background-color: #EEAEEE !important;
+ color: black;
+}
+.CD96CD {
+ background-color: #CD96CD !important;
+ color: black;
+}
+.F0FFF0 {
+ background-color: #F0FFF0 !important;
+ color: black;
+}
+.E0EEE0 {
+ background-color: #E0EEE0 !important;
+ color: black;
+}
+.C1CDC1 {
+ background-color: #C1CDC1 !important;
+ color: black;
+}
+.F0FFFF {
+ background-color: #F0FFFF !important;
+ color: black;
+}
+.F0F8FF {
+ background-color: #F0F8FF !important;
+ color: black;
+}
+.E6E6FA {
+ background-color: #E6E6FA !important;
+ color: black;
+}
Property changes on: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.css
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml (rev 0)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml 2006-06-08 19:12:03 UTC (rev 554)
@@ -0,0 +1,82 @@
+<subscriptionColors>
+ <color>FFFFFF</color>
+ <color>F8F8FF</color>
+ <color>FFFAF0</color>
+ <color>FFF5EE</color>
+ <color>EEE5DE</color>
+ <color>FFFFF0</color>
+ <color>FAF0E6</color>
+ <color>EEEEE0</color>
+ <color>FFFFE0</color>
+ <color>EEEED1</color>
+ <color>CDCDB4</color>
+ <color>FFFACD</color>
+ <color>EEE9BF</color>
+ <color>CDC9A5</color>
+ <color>FFF68F</color>
+ <color>EEE685</color>
+ <color>CDC673</color>
+ <color>FFEC8B</color>
+ <color>EEDC82</color>
+ <color>CDBE70</color>
+ <color>FFF8DC</color>
+ <color>EEE8CD</color>
+ <color>CDC8B1</color>
+ <color>FDF5E6</color>
+ <color>FFEFDB</color>
+ <color>EEDFCC</color>
+ <color>FAEBD7</color>
+ <color>FFEFD5</color>
+ <color>FFEBCD</color>
+ <color>FFDAB9</color>
+ <color>EECBAD</color>
+ <color>CDAF95</color>
+ <color>FFE7BA</color>
+ <color>EED8AE</color>
+ <color>CDBA96</color>
+ <color>FFE4B5</color>
+ <color>FFDEAD</color>
+ <color>EECFA1</color>
+ <color>FFE4C4</color>
+ <color>EED5B7</color>
+ <color>CDB79E</color>
+ <color>FFD39B</color>
+ <color>EEC591</color>
+ <color>CDAA7D</color>
+ <color>FFA07A</color>
+ <color>EE9572</color>
+ <color>CD8162</color>
+ <color>FF8C69</color>
+ <color>EE8262</color>
+ <color>CD7054</color>
+ <color>FFA54F</color>
+ <color>EE9A49</color>
+ <color>CD853F</color>
+ <color>FFE4E1</color>
+ <color>EED5D2</color>
+ <color>CDB7B5</color>
+ <color>FFC1C1</color>
+ <color>EEB4B4</color>
+ <color>CD9B9B</color>
+ <color>FFB5C5</color>
+ <color>EEA9B8</color>
+ <color>CD919E</color>
+ <color>FFAEB9</color>
+ <color>EEA2AD</color>
+ <color>CD8C95</color>
+ <color>FFF0F5</color>
+ <color>EEE0E5</color>
+ <color>CDC1C5</color>
+ <color>FFE1FF</color>
+ <color>EED2EE</color>
+ <color>CDB5CD</color>
+ <color>FFBBFF</color>
+ <color>EEAEEE</color>
+ <color>CD96CD</color>
+ <color>F0FFF0</color>
+ <color>E0EEE0</color>
+ <color>C1CDC1</color>
+ <color>F0FFFF</color>
+ <color>F0F8FF</color>
+ <color>E6E6FA</color>
+</subscriptionColors>
Property changes on: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/addEvent-forGrid-icon.gif
===================================================================
(Binary files differ)
Added: trunk/calendar3/skins/webpublic/rensselaer/default/default/common.css
===================================================================
--- trunk/calendar3/skins/webpublic/rensselaer/default/default/common.css (rev 0)
+++ trunk/calendar3/skins/webpublic/rensselaer/default/default/common.css 2006-06-08 19:12:03 UTC (rev 554)
@@ -0,0 +1,49 @@
+#errors {
+ margin: 0;
+ padding: 1em;
+ background-color: #333;
+ color: #ff9;
+ font-weight: bold;
+}
+#tabsTable .centerCell {
+ text-align: left;
+ background : url(../../images/demo/std-tab-space.gif);
+ font-size: 0.8em;
+ white-space: nowrap;
+ width: 100%;
+ padding: 0 1em;
+}
+#calendarOfEventsTitle {
+ font-family: Arial, sans-serif;
+ font-size: 8pt;
+ font-weight: bold;
+ letter-spacing: 3px;
+ background-color: #ddd;
+ color: #555;
+ text-align: center;
+ border-top: 1px solid black;
+ border-right: 1px solid black;
+ border-bottom: 2px solid black;
+ border-left: 1px solid black;
+}
+#stats {
+ font-size: 0.9em;
+ margin: 0px;
+ padding: 1em;
+ border-bottom: 2px solid #aaa;
+ border-left: 2px solid #aaa;
+ border-right: 2px solid #aaa;
+}
+#statsTable {
+ margin: 1em 0 0 4em;
+ width: 300px;
+}
+#statsTable th {
+ padding: 0.5em;
+ background-color: #eee;
+ color: black;
+}
+#statsTable td.label {
+ text-align: right;
+ padding-right: 2em;
+}
Property changes on: trunk/calendar3/skins/webpublic/rensselaer/default/default/common.css
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java
===================================================================
--- trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java 2006-06-08 17:49:52 UTC (rev 553)
+++ trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java 2006-06-08 19:12:03 UTC (rev 554)
@@ -154,11 +154,6 @@
affectsFreeBusy, false);
}
- String style = getReqPar(request, "style");
- if (style != null) {
- sub.setStyle(style);
- }
-
form.setSubscription(sub);
if (getReqPar(request, "addSubscription") != null) {
More information about the Bedework-commit
mailing list