[Bedework-commit] bedework r1909 - in
trunk/deployment/webuser/webapp/resources/demoskins:
default/default resources
svnadmin at bedework.org
svnadmin at bedework.org
Wed Jul 30 16:50:53 EDT 2008
Author: johnsa
Date: 2008-07-30 16:50:52 -0400 (Wed, 30 Jul 2008)
New Revision: 1909
Removed:
trunk/deployment/webuser/webapp/resources/demoskins/default/default/olive.css
Modified:
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js
Log:
user client: start at changing the subscription model in the UI
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2008-07-20 02:53:03 UTC (rev 1908)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2008-07-30 20:50:52 UTC (rev 1909)
@@ -1,3 +1,8 @@
+body {
+ color: black;
+ background-color: white;
+}
+
#bedework {
/* this is the main wrapper div used to encapsulate all Bedework CSS; we
will prepend each selector below with this ID - this helps encapsulate
@@ -234,6 +239,11 @@
background: transparent;
text-decoration: none;
}
+#bedework #bodyBlock td#sideBar h3 a.calManageLink {
+ padding-right: 4px;
+ margin-right: 4px;
+ border-right: 1px solid #aaa;
+}
#bedework #bodyBlock td#sideBarClosed {
width: 1px;
border-left: 1px solid #333;
@@ -1502,7 +1512,7 @@
width: 300px;
}
#bedework #subsTable td.cals {
- width: 200px;
+ white-space: nowrap;
}
#bedework .calendarTree ul {
padding-left: 10px;
@@ -1572,6 +1582,14 @@
#bedework #submitTable td {
white-space: nowrap;
}
+#bedework #subsMenu li {
+ padding-bottom: 0.5em;
+}
+#bedework #content {
+ /* for genric content - no tables */
+ margin: 0;
+ padding: 1em;
+}
#bedework .note {
margin: 0;
padding: 0 0 1em 0;
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-07-20 02:53:03 UTC (rev 1908)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-07-30 20:50:52 UTC (rev 1909)
@@ -104,6 +104,8 @@
<xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/>
<xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/>
<xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/>
+ <xsl:variable name="calendar-initAddExternal" select="/bedework/urlPrefixes/calendar/initAddExternal/a/@href"/>
+ <xsl:variable name="calendar-initAddAlias" select="/bedework/urlPrefixes/calendar/initAddAlias/a/@href"/>
<xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/>
<xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/>
<xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/>
@@ -113,10 +115,9 @@
<xsl:variable name="calendar-emptyTrash" select="/bedework/urlPrefixes/calendar/emptyTrash/a/@href"/>
<xsl:variable name="calendar-listForExport" select="/bedework/urlPrefixes/calendar/listForExport/a/@href"/>
<!-- subscriptions -->
+ <xsl:variable name="subscriptions-showSubsMenu" select="/bedework/urlPrefixes/subscriptions/showSubsMenu/a/@href"/>
<xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/>
<xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/>
- <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/>
- <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/>
<xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/>
<xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/>
<xsl:variable name="subscriptions-inaccessible" select="/bedework/urlPrefixes/subscriptions/inaccessible/a/@href"/>
@@ -260,11 +261,16 @@
<xsl:when test="/bedework/page='deleteLocationConfirm'">
<xsl:call-template name="deleteLocationConfirm"/>
</xsl:when>
+ <xsl:when test="/bedework/page='subsMenu'">
+ <xsl:call-template name="subsMenu"/>
+ </xsl:when>
<xsl:when test="/bedework/page='subscriptions' or
- /bedework/page='modSubscription' or
- /bedework/page='addSubByUri'">
+ /bedework/page='modSubscription'">
<xsl:apply-templates select="/bedework/subscriptions"/>
</xsl:when>
+ <xsl:when test="/bedework/page='addAlias'">
+ <xsl:call-template name="addAlias"/>
+ </xsl:when>
<xsl:when test="/bedework/page='subInaccessible'">
<xsl:call-template name="subInaccessible"/>
</xsl:when>
@@ -537,14 +543,17 @@
</ul>
<h3>
- <a href="{$calendar-fetch}" title="manage calendars">
+ <a href="{$subscriptions-showSubsMenu}" title="subscribe to calendars or iCal feeds">
+ subscribe
+ </a>
+ <a href="{$calendar-fetch}" title="manage calendars" class="calManageLink">
manage
</a>
calendars
</h3>
<!-- normal calendars -->
<ul class="calendarTree">
- <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[canAlias = 'true']" mode="myCalendars"/>
+ <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/>
</ul>
<!-- special calendars: inbox, outbox, and trash -->
<ul class="calendarTree">
@@ -554,6 +563,7 @@
<xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType = 3]" mode="mySpecialCalendars"/> <!-- deleted -->
</ul>
+ <!--
<h3>
<a href="{$subscriptions-fetch}" title="manage subscriptions">
manage
@@ -570,7 +580,7 @@
<li class="none">no subscriptions</li>
</xsl:otherwise>
</xsl:choose>
- </ul>
+ </ul>-->
<h3>options</h3>
<ul id="sideBarMenu">
@@ -4202,7 +4212,7 @@
</a>
<xsl:if test="calendar">
<ul>
- <xsl:apply-templates select="calendar" mode="myCalendars"/>
+ <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars"/>
</ul>
</xsl:if>
</li>
@@ -4643,9 +4653,8 @@
<li>Folders may only contain calendars and subfolders.</li>
<li>Calendars may only contain events (and other calendar items).</li>
<li>
- If a calendar is empty, it may be converted to a folder and vice
- versa. If a calendar or folder are not empty, it may not be
- converted.
+ An empty calendar may be converted to a folder and vice
+ versa.
</li>
</ul>
</li>
@@ -4917,41 +4926,109 @@
</xsl:template>
<!--+++++++++++++++ Subscriptions ++++++++++++++++++++-->
+ <xsl:template name="subsMenu">
+ <h2>Add Subscriptions</h2>
+ <div id="content">
+ <h4>Subscribe to:</h4>
+ <ul id="subsMenu">
+ <li>
+ <a href="{$subscriptions-fetch}" title="manage subscriptions">
+ a public calendar (in this system)
+ </a>
+ </li>
+ <li>
+ <a href="{$calendar-initAddAlias}&calPath=/user/johnsa">
+ a user calendar (in this system)
+ </a>
+ </li>
+ <li>
+ an external iCal feed (e.g. Google, Eventful, etc)
+ </li>
+ </ul>
+ </div>
+ </xsl:template>
+
<xsl:template match="subscriptions">
- <h2>Manage Subscriptions</h2>
+ <h2>Subscribe to a Public Calendar</h2>
<table id="subsTable">
<tr>
<td class="cals">
- <p class="smaller">
- Select a calendar below to add a <em><strong>new</strong></em>
- internal subscription. <!-- or
- <a href="{$subscriptions-initAdd}&calUri=please enter a calendar uri">
- subscribe to an external calendar</a>.-->
- </p>
- <h3>My calendars</h3>
- <ul class="calendarTree">
- <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[canAlias='true']" mode="subscribe"/>
- </ul>
<h3>Public calendars</h3>
<ul class="calendarTree">
<xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar[canAlias='true']" mode="subscribe"/>
</ul>
</td>
<td class="subs">
- <xsl:choose>
- <xsl:when test="/bedework/page='subscriptions'">
- <xsl:call-template name="subscriptionList"/>
- </xsl:when>
- <xsl:when test="/bedework/page='addSubByUri'">
- <xsl:call-template name="addSubByUri"/>
- </xsl:when>
- <xsl:when test="/bedework/creating='true'">
- <xsl:apply-templates select="subscription" mode="addSystemSubscription"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="subscription" mode="modSubscription"/>
- </xsl:otherwise>
- </xsl:choose>
+ <h3>Add a public subscription</h3>
+ <p>
+ Select a calendar to the left to add a new internal public subscription.
+ </p>
+ <h3>Add a public subscription</h3>
+ <p class="note">*the subsciption name must be unique</p>
+ <form name="subscribeForm" action="{$calendar-update}" onsubmit="return setSubscriptionUri(this,'bwcal://')" method="post">
+ <input type="hidden" value="" name="aliasUri"/>
+ <table class="common" cellspacing="0">
+ <tr>
+ <td class="fieldname">Name:</td>
+ <td>
+ <xsl:variable name="subName" select="name"/>
+ <input type="text" value="{$subName}" name="calendar.name" size="60"/>
+ </td>
+ </tr>
+ <!--<xsl:if test="internal='false'">
+ <tr>
+ <td class="fieldname">Uri:</td>
+ <td>
+ <xsl:variable name="calPath" select="uri"/>
+ <input type="text" value="{$calPath}" name="aliasUri" size="60"/>
+ </td>
+ </tr>
+ </xsl:if>
+ <tr>
+ <td class="fieldname">Display:</td>
+ <td>
+ <input type="radio" value="true" name="subscription.display" checked="checked"/> yes
+ <input type="radio" value="false" name="subscription.display"/> no
+ </td>
+ </tr>-->
+ <tr>
+ <td class="fieldname">Affects Free/Busy:</td>
+ <td>
+ <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>
+ <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="@name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </td>
+ </tr>
+ <!--<tr>
+ <td class="fieldname">Unremovable:</td>
+ <td>
+ <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>
+ <table border="0" id="submitTable">
+ <tr>
+ <td>
+ <input type="submit" name="addSubscription" value="Add Subscription"/>
+ <input type="submit" name="cancelled" value="cancel"/>
+ </td>
+ </tr>
+ </table>
+ </form>
</td>
</tr>
</table>
@@ -4979,173 +5056,107 @@
</li>
</xsl:template>
- <!-- add a subscription to a user calendar by user and path; this is actually
- a subscription to an arbitrary URI (which we can expose later) -->
- <xsl:template name="addSubByUri">
- <h3>Add Subscription to User Calendar</h3>
- <p class="note">*the subsciption name must be unique</p>
- <form name="subscribeForm" action="{$subscriptions-initAdd}" onsubmit="return setSubscriptionUri(this,'bwcal:///user/')" method="post">
- <table class="common" cellspacing="0">
- <tr>
- <td class="fieldname">Name:</td>
- <td>
- <input type="text" value="" name="name" size="60"/>
- </td>
- </tr>
- <!-- the following would be for an arbitrary URI. We'll add this later.
- <tr>
- <td class="fieldname">Uri:</td>
- <td>
- <input type="text" value="" name="calUri" size="60"/>
- </td>
- </tr>-->
- <tr>
- <td class="fieldname">User ID:</td>
- <td>
- <input type="hidden" value="" name="calUri"/>
- <input type="text" value="" name="userId" size="20"/>
- <span class="note">ex: janedoe</span>
- </td>
- </tr>
- <tr>
- <td class="fieldname">Calendar path:</td>
- <td>
- <input type="text" value="" name="userPath" size="20"/>
- <span class="note">
- (optional) ex: calendar<br/>
- to subscribe to bwcal:///user/janedoe/someFolder/someCalendar, enter "someFolder/someCalendar"
- </span>
- </td>
- </tr>
- <!--<tr>
- <td class="fieldname">Display:</td>
- <td>
- <input type="radio" value="true" name="display" checked="checked"/> yes
- <input type="radio" value="false" name="display"/> no
- </td>
- </tr>-->
- <tr>
- <td class="fieldname">Affects Free/Busy:</td>
- <td>
- <input type="radio" value="true" name="affectsFreeBusy"/> yes
- <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no
- </td>
- </tr>
- <tr>
- <td class="fieldname">Style:</td>
- <td>
- <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="@name"/>
- </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
- </td>
- </tr>-->
- </table>
- <table border="0" id="submitTable">
- <tr>
- <td>
- <input type="submit" name="addSubscription" value="Add Subscription"/>
- <input type="submit" name="cancelled" value="cancel"/>
- </td>
- </tr>
- </table>
- </form>
-
- <ul class="note" style="margin-left: 2em;">
- <li>The <strong>Name</strong> is anything you want to call your subscription.</li>
- <li>
- The <strong>Path</strong> is the name of the folder and/or calendar within
- the remote user's calendar tree. For example, to subscribe to
- bwcal:///user/johnsa/someFolder/someCalendar, enter "someFolder/someCalendar"
- </li>
- <li>
- You must be granted at least read access to the other user's calendar
- to subscribe to it.
- </li>
- </ul>
- </xsl:template>
-
- <!-- add a subscription to a public calendar within the system -->
- <xsl:template match="subscription" mode="addSystemSubscription">
- <h3>Add New Subscription</h3>
- <p class="note">*the subsciption name must be unique</p>
- <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post">
- <table class="common" cellspacing="0">
- <tr>
- <td class="fieldname">Name:</td>
- <td>
- <xsl:variable name="subName" select="name"/>
- <input type="text" value="{$subName}" name="subscription.name" size="60"/>
- </td>
- </tr>
- <xsl:if test="internal='false'">
+ <!-- add a subscription to a user calendar by user and path -->
+ <xsl:template name="addAlias">
+ <h2>Subscribe to User Calendar</h2>
+ <div id="content">
+ <p class="note">*the subsciption name must be unique</p>
+ <form name="subscribeForm" action="{$calendar-update}" onsubmit="return setSubscriptionUri(this,'bwcal:///user/')" method="post">
+ <table class="common" cellspacing="0">
<tr>
+ <td class="fieldname">Name:</td>
+ <td>
+ <input type="text" value="" name="calendar.name" size="60"/>
+ </td>
+ </tr>
+ <!-- the following would be for an arbitrary URI. We'll add this later.
+ <tr>
<td class="fieldname">Uri:</td>
<td>
- <xsl:variable name="calPath" select="uri"/>
- <input type="text" value="{$calPath}" name="calPath" size="60"/>
+ <input type="text" value="" name="aliasUri" size="60"/>
</td>
+ </tr>-->
+ <tr>
+ <td class="fieldname">User ID:</td>
+ <td>
+ <input type="hidden" value="" name="aliasUri"/>
+ <input type="text" value="" name="userId" size="20"/>
+ <span class="note"> ex: janedoe</span>
+ </td>
</tr>
- </xsl:if>
- <!--<tr>
- <td class="fieldname">Display:</td>
- <td>
- <input type="radio" value="true" name="subscription.display" checked="checked"/> yes
- <input type="radio" value="false" name="subscription.display"/> no
- </td>
- </tr>-->
- <tr>
- <td class="fieldname">Affects Free/Busy:</td>
- <td>
- <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>
- <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="@name"/>
- </option>
- </xsl:for-each>
- </select>
- </td>
- </tr>
- <!--<tr>
- <td class="fieldname">Unremovable:</td>
- <td>
- <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>
- <table border="0" id="submitTable">
- <tr>
- <td>
- <input type="submit" name="addSubscription" value="Add Subscription"/>
- <input type="submit" name="cancelled" value="cancel"/>
- </td>
- </tr>
- </table>
- </form>
+ <tr>
+ <td class="fieldname">Calendar path:</td>
+ <td>
+ <input type="text" value="" name="userPath" size="20"/>
+ <span class="note"> ex: calendar</span>
+ </td>
+ </tr>
+ <!--<tr>
+ <td class="fieldname">Display:</td>
+ <td>
+ <input type="radio" value="true" name="display" checked="checked"/> yes
+ <input type="radio" value="false" name="display"/> no
+ </td>
+ </tr>-->
+ <tr>
+ <td class="fieldname">Affects Free/Busy:</td>
+ <td>
+ <input type="radio" value="true" name="affectsFreeBusy"/> yes
+ <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">Style:</td>
+ <td>
+ <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="@name"/>
+ </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
+ </td>
+ </tr>-->
+ </table>
+ <table border="0" id="submitTable">
+ <tr>
+ <td>
+ <input type="submit" name="addSubscription" value="Add Subscription"/>
+ <input type="submit" name="cancelled" value="cancel"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <ul class="note" style="margin-left: 2em;">
+ <li>The <strong>Name</strong> is anything you want to call your subscription.</li>
+ <li>The <strong>User ID</strong> is the user id that owns the calendar</li>
+ <li>
+ The <strong>Path</strong> is the name of the folder and/or calendar within
+ the remote user's calendar tree. For example, to subscribe to
+ janedoe/someFolder/someCalendar, enter "someFolder/someCalendar". To subscribe to janedoe's root folder, leave this field blank.
+ </li>
+ <li>
+ You must be granted at least read access to the other user's calendar
+ to subscribe to it.
+ </li>
+ <li>
+ You can add subscriptions to your own calendars to help group and organize collections you may wish to share.
+ </li>
+ </ul>
+ </div>
</xsl:template>
+<!-- DEPRECTATED -->
<xsl:template match="subscription" mode="modSubscription">
<h3>Modify Subscription</h3>
<form name="subscribeForm" action="{$subscriptions-subscribe}" method="post">
@@ -5268,6 +5279,7 @@
</form>
</xsl:template>
+<!-- DEPRECTATED -->
<xsl:template name="subscriptionList">
<h3>Current subscriptions</h3>
<table class="common" cellspacing="0">
@@ -5324,9 +5336,9 @@
</tr>
</xsl:for-each>
</table>
- <h4><a href="{$subscriptions-addSubByUri}">Subscribe to another user's calendar</a></h4>
</xsl:template>
+<!-- DEPRECTATED -->
<xsl:template match="subscription" mode="mySubscriptions">
<li>
<xsl:attribute name="class">
@@ -5358,6 +5370,7 @@
</li>
</xsl:template>
+<!-- DEPRECTATED -->
<xsl:template name="subInaccessible">
<h2 class="bwStatusConfirmed">Inaccessible</h2>
<div class="noEventsCell">
Deleted: trunk/deployment/webuser/webapp/resources/demoskins/default/default/olive.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/olive.css 2008-07-20 02:53:03 UTC (rev 1908)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/olive.css 2008-07-30 20:50:52 UTC (rev 1909)
@@ -1,972 +0,0 @@
-body {
- font-family : Arial, Helvetica, sans-serif;
- font-size: 100%; /* to make IE behave */
- background-color : white;
- color : black;
- padding: 0.75em 1em 0em 1em;
-}
-/* Generic selectors*/
-h2 {
- margin: 0em;
- padding: 0.2em 0.2em 0.2em 0.5em;
- font-size: 1.3em;
- background-color: #ccc;
- color: black;
-}
-h2 a:link,
-h2 a:active,
-h2 a:visited,
-h2 a:hover {
- color: black;
- background-color: inherit;
- text-decoration: none;
-}
-h3 {
- margin: 0em;
- padding: 1em 0.2em 0em 0.2em;
- font-size: 1.1em;
-}
-h4 {
- margin: 0em;
- padding: 1em 0.2em 0em 0.2em;
- font-size: 1em;
-}
-/* Header IDs and classes */
-#logoTable {
- padding: 0em;
- margin: 0em;
-}
-#logoTable #logoCell {
- white-space: nowrap;
- font-weight: bold;
- font-size: 2em;
-}
-#logoTable img {
- display: inline;
- padding: 0 0 1px 5px;
-}
-#logoTable #schoolLinksCell {
- vertical-align: bottom;
- text-align: right;
- font-size: 0.8em;
- white-space : nowrap;
- padding: 0 2px 2px 0;
-}
-#logoTable #schoolLinksCell h2 {
- margin: 0 0 2px 0;
- padding: 0;
- font-size: 2em;
- color: #444;
- background-color: transparent;
-}
-#logoTable #schoolLinksCell a:link,
-#logoTable #schoolLinksCell a:visited,
-#logoTable #schoolLinksCell a:active {
- background-color: transparent;
- color: #999;
- text-decoration: none;
-}
-#logoTable #schoolLinksCell a:hover {
- background-color: #eee;
- color: #333;
- text-decoration: none;
-}
-#curDateRangeTable {
- width: 100%;
- background: #663;
- /*background: url(../../resources/glassFill-01.gif) #336;*/
- color : #eee;
- margin: 0em;
- font-weight : bold;
- text-align : center;
- vertical-align: middle;
- white-space: nowrap;
- border-top: 1px solid #333;
- border-left: 1px solid #777;
- border-right: 1px solid #777;
-}
-#curDateRangeTable td {
- padding-top: 3px;
- padding-bottom: 1px;
- padding-left: 0.5em;
- padding-right: 0.5em;
-}
-#curDateRangeTable td.sideBarOpenCloseIcon {
- width: 200px;
-}
-#curDateRangeTable td.date {
- font-weight : bold;
- text-align : center;
- white-space: nowrap;
-}
-#curDateRangeTable td.rssPrint {
- width: 200px;
- font-weight : bold;
- text-align : right;
- white-space: nowrap;
-}
-#curDateRangeTable td.rssPrint img {
- position: relative;
- top: 3px;
-}
-#curDateRangeTable td.rssPrint a:link,
-#curDateRangeTable td.rssPrint a:active,
-#curDateRangeTable td.rssPrint a:visited {
- font-size: 10px;
- color: #eee;
- background-color: transparent;
- font-family: Arial, Helvetica, sans-serif;
- padding: 0;
- text-decoration: none;
- margin-right: 0.5em;
- position: relative;
- top: -3px;
-}
-#curDateRangeTable td.rssPrint a:hover {
- color: #663;
- background-color: #fff;
-}
-#curDateRangeTable td.rssPrint a.rss:link,
-#curDateRangeTable td.rssPrint a.rss:active,
-#curDateRangeTable td.rssPrint a.rss:visited {
- font-size: 10px;
- font-weight: bold;
- color: #444;
- background-color: #ddd;
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- padding: 0px 1px 0px 1px;
- text-decoration: none;
- margin-right: 0.5em;
- margin-left: 2px;
- position: relative;
- top: -3px;
- border: solid 1px #666;
-}
-#curDateRangeTable td.rssPrint a.rss:hover {
- color: #900;
- background-color: #fff;
-}
-#bodyBlock {
- width: 100%;
- margin: 0;
- padding: 0;
-}
-#bodyBlock td {
- margin: 0;
- padding: 0;
-}
-#bodyBlock td#sideBar {
- width: 200px;
- font-size: 0.8em;
- border-left: 2px solid #333;
- border-right: 3px groove #ddd;
- border-bottom: 2px solid #aaa;
- border-top: 1px solid #333;
- vertical-align: top;
- padding: 0;
-}
-#bodyBlock td#sideBar h3 {
- color: #eee;
- background-color: #333;
- font-weight: normal;
- margin: 0;
- padding: 2px 4px;
-}
-#bodyBlock td#sideBarClosed {
- width: 1px;
- border-left: 2px solid #333;
- border-right: 3px groove #ddd;
- border-bottom: 2px solid #aaa;
- padding: 0;
- color: black;
- background-color: #ddd;
-}
-#sideBarOpenCloseIcon {
- float: left;
- margin: 3px 0;
- vertical-align: middle;
-}
-#bodyBlock td#sideBar #sideBarMenu li {
- padding-bottom: 0.5em;
-}
-#bodyBlock td#bodyContent {
- border-right: 2px solid #333;
- border-bottom: 2px solid #aaa;
- border-left: 1px solid #333;
- vertical-align: top;
- padding: 0;
-}
-#utilBarTable {
- margin: 0;
- padding: 0;
- background-color : #eee;
- color: black;
- font-size: 0.9em;
-}
-#utilBarTable .leftCell {
- margin: 0;
- padding: 0;
- padding: 0.2em 0 0.2em 1em;
- white-space: nowrap;
-}
-#utilBarTable .leftCell .link {
- font-size: 0.8em;
- padding-left: 1em;
- color: #999;
- background-color: transparent;
-}
-#utilBarTable .leftCell a {
- color: #999;
- background-color: transparent;
-}
-#utilBarTable .rightCell {
- margin: 0;
- padding: 0.1em 0.2em 0 0;
- text-align: right;
- white-space: nowrap;
-}
-#utilBarTable form {
- margin: 0px 0px 1px 0px;
- padding: 0em;
-}
-#tabsTable {
- margin: 0em;
- padding: 4px 0px 0px 0px;
- text-align: center;
- vertical-align: bottom;
- background-color: #333;
- color: #eee;
- font-size: 0.8em;
-}
-#tabsTable td {
- white-space: nowrap;
-}
-/* #tabsTable .centerCell {
- text-align: left;
- background : url(../../resources/std-tab-space.gif);
- padding-left: 0.5em;
-}*/
-#tabsTable a {
- background-color: inherit;
- color: #ccc;
-}
-#tabsTable .rightCell {
- width: 100%;
- background : url(../../resources/std-tab-space.gif);
- padding: 0 0.5em;
- text-align: right;
-}
-#tabsTable .logout {
- padding-left: 0.5em;
- font-size: 0.8em;
-}
-#navigationBarTable {
- font-size: 0.8em;
- margin: 0em;
- padding: 0em;
- vertical-align: top;
- border-bottom: 1px solid Gray;
-}
-#navigationBarTable a {
- text-decoration: none;
- white-space: nowrap;
-}
-#navigationBarTable td {
- vertical-align: top;
-}
-#navigationBarTable form {
- display: inline;
- margin-bottom: 0em;
-}
-#navigationBarTable table {
- display: inline;
- margin-bottom: 0em;
-}
-#navigationBarTable td.todayButton {
- padding: 1em 1em 0em 1em;
-}
-#navigationBarTable td.gotoForm {
- padding: 1em 0em 0em 1em;
-}
-#navigationBarTable td.leftCell {
- text-align: left;
- white-space: nowrap;
- padding-left: 0.5em;
- font-size: 1.3em;
- font-weight: bold;
- padding: 0.75em 0em 0.75em 1em;
- width: 100%;
- vertical-align: middle;
-}
-#navigationBarTable td.leftCell .prevImg {
- margin: 0;
- vertical-align: middle;
-}
-#navigationBarTable td.leftCell .nextImg {
- margin-left: 0.2em;
- margin-right: 0.5em;
- vertical-align: middle;
-}
-#navigationBarTable td.rightCell {
- text-align: right;
- padding: 1em 0.5em 0em 0em;
-}
-#navigationBarTable td.rightCell select {
- padding-right: 0em;
- margin: 0em;
- width: 10em;
-}
-#navigationBarTable .calLinks {
- white-space: nowrap;
-}
-#messages,
-#errors {
- font-size: 0.8em;
- margin: 0em;
- padding: 0.2em 0 0.2em 1em;
- border-left : 2px solid #333;
- border-right : 2px solid #333;
- border-bottom: 1px solid Gray;
-}
-#messages p,
-#errors p {
- margin: 0;
- padding: 2px 0;
-}
-#messages {
- color: black;
- background-color: #ffa;
-}
-#errors {
- color: black;
- background-color: #ffa;
-}
-#standardForm {
- margin: 0;
- padding: 0;
-}
-
-/* table below is used for almost all forms */
-#commonTable {
- width: 100%;
- font-size: 0.9em;
- margin: 0px;
- padding: 0px;
-}
-#commonTable th.commonHeader {
- background-color: #666;
- color: #eee;
- padding: 0.2em 0.5em;
- text-align: left;
- font-weight: normal;
-}
-#commonTable th.commonHeader a:link,
-#commonTable th.commonHeader a:active,
-#commonTable th.commonHeader a:visited {
- background-color: inherit;
- color: #eee;
- padding: 0.2em;
- text-align: left;
-}
-#commonTable th.commonHeader a:hover {
- background-color: inherit;
- color: #ff9;
- padding: 0.2em;
- text-align: left;
-}
-#commonTable td.fieldval {
- margin: 0em;
- vertical-align: top;
- padding: 0.5em 0.5em 0.2em 1em;
-}
-#commonTable td.fieldname {
- width: 80px;
- margin: 0em;
- vertical-align: top;
- padding: 0.5em 0.5em 0.2em 0.5em;
- color: black;
- background-color: #eee;
- white-space: nowrap;
-}
-#commonTable th {
- text-align: left;
- vertical-align: top;
- padding: 0.5em;
- background-color: #ddd;
- color: black;
- white-space: nowrap;
-}
-#commonTable th.icon {
- margin: 0em;
- vertical-align: middle;
- padding: 0.5em 1em 0.2em 0;
- font-size: 0.7em;
- background-color: #fff;
- color: black;
-}
-#commonTable td.eventLinks {
- background-color: #ddd;
- color: #eee;
- padding: 6px 0;
- text-align: center;
-}
-#commonTable #eventActions {
- float: right;
- clear: none;
-}
-#commonTable td.allField {
- white-space: nowrap;
- text-align: right;
- font-style: italic;
- background-color : white;
- color: black;
- padding: 0.2em;
-}
-#commonTable .dateFields {
- display: inline;
-}
-#commonTable .timeFields {
- display: inline;
- margin-left: 1em;
-}
-#commonTable .dateStartEndBox {
- border: 1px solid #ccb;
- margin: 4px;
- padding: 4px;
-}
-#commonTable .dateStartEndBox strong {
- display: block;
-}
-#commonTable .startDateLabel {
- margin-left: 26px;
-}
-#commonTable div.durationBox {
- border: 1px solid #ccb;
- display: inline;
- margin: 4px;
- padding: 4px;
-}
-#commonTable .durationSpacerText {
- font-weight: bold;
- margin: 0 1em;
-}
-#clock {
- position: relative;
-}
-.shown {
- display: inline;
-}
-.invisible {
- display: none;
-}
-.hidden {
- visibility: hidden;
-}
-.padMe {
- padding: 1em 0 !important;
-}
-form#subscriptions {
- margin: 0;
- padding: 0;
-}
-#dayCalendarTable {
- width: 100%;
- font-size: 0.9em;
- margin: 0px;
- padding: 0px;
- border-top: 1px solid #666;
-}
-#dayCalendarTable td {
- padding: 0.4em;
- margin: 0em;
-}
-#dayCalendarTable .dateRange {
- text-align: left;
- background-color: #f0eee5;
- color: black;
- white-space: nowrap;
-}
-#dayCalendarTable .description {
- text-align: left;
- background-color: #fff;
- color: black;
- width: 100%;
-}
-#dayCalendarTable .more {
- text-align: center;
- background-color: #eee;
- color: black;
- font-size: 0.8em;
-}
-#weekCalendarTable {
- width: 100%;
- font-size: 0.9em;
- margin: 0px;
- padding: 0px;
- border-top: 1px solid #666;
-}
-#weekCalendarTable td {
- padding: 0.4em;
- margin: 0em;
-}
-#weekCalendarTable .dateRange {
- text-align: left;
- background-color: #e2decc;
- color: black;
- white-space: nowrap;
-}
-#weekCalendarTable .description {
- text-align: left;
- background-color: #fff;
- color: black;
- width: 100%;
-}
-#weekCalendarTable .more {
- text-align: center;
- background-color: #eee;
- color: black;
- font-size: 0.8em;
-}
-#monthCalendarTable {
- width: 100%;
- font-size: 0.8em;
- margin: 0px;
- padding: 0px;
- border-top: 1px solid #666;
-}
-#monthCalendarTable th.dayHeading {
- width: 14%;
- text-align: center;
- vertical-align: middle;
- background-color: #663;
- color: #eee;
- border: 1px solid black;
-}
-#monthCalendarTable td {
- width: 14%;
- height: 60px;
- vertical-align: top;
- text-align: left;
- padding: 0em;
- border: 1px solid #aaa;
- background-color: white;
- color: black;
-}
-#monthCalendarTable td.filler {
- border: none;
- background-color: #eee;
- color: black;
-}
-#monthCalendarTable ul {
- font-size: 0.8em;
- list-style : none;
- margin: 0em;
- padding: 0.3em 0em 0em 0em;
-}
-#monthCalendarTable ul li {
- margin: 0em;
- padding: 0em;
- display: inline;
-}
-#monthCalendarTable a.eventLinkA:link,
-#monthCalendarTable a.eventLinkA:visited,
-#monthCalendarTable a.eventLinkA:active {
- display: block;
- padding: 0.1em 0.2em 0.1em 0.2em;
- text-decoration: none;
- background-color: #d1cbb3;
- color: black;
-}
-#monthCalendarTable a.eventLinkB:link,
-#monthCalendarTable a.eventLinkB:visited,
-#monthCalendarTable a.eventLinkB:active {
- display: block;
- padding: 0.1em 0.2em 0.1em 0.2em;
- text-decoration: none;
- background-color: #f0eee5;
- color: black;
-}
-#monthCalendarTable a.eventCancelled:link,
-#monthCalendarTable a.eventCancelled:visited,
-#monthCalendarTable a.eventCancelled:active {
- display: block;
- padding: 0.1em 0.2em 0.1em 0.2em;
- text-decoration: none;
- background-color: #ccc;
- 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;
- color: black;
- /*border-top: 1px solid black;
- border-bottom: 1px solid black;*/
-}
-#monthCalendarTable a.eventLinkA:hover,
-#monthCalendarTable a.eventLinkB:hover,
-#monthCalendarTable a.eventCancelled:hover,
-#monthCalendarTable a.holiday:hover {
- display: block;
- padding: 0.1em 0.2em 0.1em 0.2em;
- text-decoration: none;
- color: black;
- background-color: #ffe;
-}
-#monthCalendarTable a.dayLink {
- text-decoration: none;
- color: black;
- background-color: transparent;
-}
-#monthCalendarTable a:hover.dayLink {
- text-decoration: none;
- color: #eee;
- background-color: black;
-}
-#monthCalendarTable a:hover {
- /* required for eventTip to hover correctly;
- apply only to the hover pseudo class, or
- the other anchors nearby will cover the eventTip in IE */
- position: relative;
-}
-#monthCalendarTable a span.eventTip,
-#monthCalendarTable a span.eventTipReverse {
- display: none;
-}
-#monthCalendarTable a:hover span.eventTip {
- display: block;
- position: absolute;
- width: 20em;
- top: 1em;
- left: 12em;
- background-color: #ffe;
- color: black;
- padding: 4px;
- border: 1px solid #333;
-}
-#monthCalendarTable a:hover span.eventTipReverse {
- display: block;
- position: absolute;
- width: 20em;
- top: 1em;
- left: -21em;
- background-color: #ffe;
- color: black;
- padding: 4px;
- border: 1px solid #333;
-}
-a.gridAdd {
- display: block;
- float: right;
- font-size: 0.8em;
- text-decoration: none;
- margin-right: 2px;
-}
-#yearCalendarTable {
- width: 100%;
- font-size: 0.9em;
- margin: 0px;
- padding: 0em;
- border-top: 1px solid #666;
-}
-#yearCalendarTable td {
- padding: 1em 0em 0em 0em;
- margin: 0em;
- vertical-align: top;
- text-align: center;
- width: 33%;
-}
-#yearCalendarTable table.yearViewMonthTable {
- margin: 0em 1em 0.5em 1em;
- border: 1px solid #666;
-}
-#yearCalendarTable table.yearViewMonthTable td {
- text-align: center;
- padding: 0.2em;
- width: 12.5%;
-}
-#yearCalendarTable table.yearViewMonthTable th {
- font-weight: bold;
- background-color: #f5f5f5;
- color: black;
- padding: 0.2em;
-}
-#yearCalendarTable table.yearViewMonthTable td.monthName {
- font-weight: bold;
- text-align: center;
- background-color: #d1cbb3;
- color: #eee;
- white-space: nowrap;
- border-bottom: 1px solid #999;
-}
-#yearCalendarTable table.yearViewMonthTable td.weekCell {
- font-weight: bold;
- font-size: 0.8em;
- background-color: #f5f5f5;
- color: black;
-}
-#yearCalendarTable table.yearViewMonthTable td a {
- text-decoration: none;
- background-color: inherit;
- border: 1px solid #dlcbb3;
- color: black;
-}
-#yearCalendarTable table.yearViewMonthTable td.weekCell a {
- text-decoration: none;
- background-color: inherit;
- border: 1px solid #f5f5f5;
- color: black;
-}
-#yearCalendarTable table.yearViewMonthTable td.monthName a {
- text-decoration: none;
- background-color: inherit;
- color: black;
-}
-#yearCalendarTable table.yearViewMonthTable td a:hover {
- text-decoration: none;
- background-color: #FFC;
- color: black;
- border: 1px solid black;
-}
-#listTable {
- width: 100%;
- font-size: 0.9em;
- margin: 0px;
- padding: 0px;
- border-top: 1px solid #666;
-}
-#listTable td {
- padding: 0.5em;
- margin: 0em;
- border-bottom: 1px solid #bbb;
-}
-#listTable td a {
- background-color: transparent;
- color: black;
- text-decoration: none;
-}
-#listTable td.dateRangeCrossDay {
- font-size: 0.9em;
- text-transform: lowercase;
- background-color: #ddd;
- color: black;
- white-space: nowrap;
-}
-#listTable td.dateRangeEarlyMorning {
- font-size: 0.9em;
- text-transform: lowercase;
- background-color: #cbd1de;
- color: black;
- white-space: nowrap;
-}
-#listTable td.dateRangeMorning {
- font-size: 0.9em;
- text-transform: lowercase;
- background-color: #f0eee5;
- color: black;
- white-space: nowrap;
-}
-#listTable td.dateRangeAfternoon {
- font-size: 0.9em;
- text-transform: lowercase;
- background-color: #e2decc;
- color: black;
- white-space: nowrap;
-}
-#listTable td.dateRangeEvening {
- font-size: 0.9em;
- text-transform: lowercase;
- background-color: #d1cbb3;
- color: black;
- white-space: nowrap;
-}
-#listTable span.littleArrow {
- font-size: 1.4em;
-}
-#listTable td.description {
- text-align: left;
- background-color: #fff;
- color: black;
- width: 100%;
-}
-#listTable td.cancelled {
- background-color: #ddd;
- color: black;
-}
-#listTable td.description a {
- display: block;
- background-color: transparent;
- color: black;
- text-decoration: none;
-}
-#listTable td.description a.moreLink {
- display: inline;
- background-color: transparent;
- color: #663;
- text-decoration: underline;
-}
-#listTable td.description:hover {
- background-color: #eee;
- color: black;
- text-decoration: none;
-}
-#listTable td.dateRow {
- text-align: left;
- background-color: #888;
- color: #eee;
- font-size: 0.8em;
- padding: 0.2em 0.5em 0.2em 0.5em;
- margin: 0em;
-}
-#listTable td.dateRow a {
- display: block;
- color: #fff;
- background-color: transparent;
- font-weight: bold;
- text-decoration : none;
-}
-#listTable td.eventLinks {
- color: black;
- background-color: #f0eee5;
- white-space : nowrap;
- font-size : 0.7em;
-}
-#listTable td.eventLinks a {
- text-decoration: underline;
-}
-#listTable td.eventLinks a:hover {
- color: #eee;
- background-color: #333;
- text-decoration: none;
-}
-#listTable td.smallIcon {
- color: black;
- background-color: #ddd;
-}
-.noEventsCell {
- padding: 1em;
-}
-/* Calendars and Subscriptions */
-#calendarTable td,
-#subsTable td {
- padding: 0 0.5em;
- vertical-align: top;
-}
-#calendarTable td.cals,
-#subsTable td.cals {
- border-right: 1px solid #aaa;
- font-size: 0.9em;
- width: 200px;
-}
-#calendarTable td.cals {
- width: 300px;
-}
-#subsTable td.cals {
- width: 200px;
-}
-.calendarTree ul {
- padding-left: 10px;
- margin-left: 10px;
-}
-.calendarTree li {
- padding-top: 0.25em;
- /*font-weight: bold;*/
-}
-.calendarTree li.folder {
- list-style-image: url(../../resources/catIcon.gif);
-}
-.calendarTree li.calendar {
- list-style-image: url(../../resources/calIcon-sm.gif);
-}
-.calendarTree a:link,
-.calendarTree a:active,
-.calendarTree a:visited {
- text-decoration: none;
-}
-.calendarTree a:hover {
- color: black;
- background-color: #ff3;
-}
-#submitTable {
- width: 98%; /* less than 100% helps avoid IE weirdness */
- margin-top: 1em;
-}
-p.note {
- margin: 0;
- padding: 0 0 1em 0;
- font-size: 0.8em;
- font-style: italic;
-}
-/* Footer */
-#footer {
- font-size: 0.7em;
- text-align : center;
- margin-top: 0em;
- padding: 1em;
- color: #333;
- background-color: #eee;
- border-bottom: 2px solid #333;
- border-left: 2px solid #333;
- border-right: 2px solid #333;
- white-space: nowrap;
-}
-#footer a {
- color: #333;
- background-color: transparent;
- text-decoration: underline;
-}
-#skinSelectorTable {
- width: 100%;
- padding-top: 0.5em;
- font-size: 0.7em;
- color: #333;
- background-color: inherit;
-}
-#skinSelectorTable td {
- vertical-align: top;
-}
-#skinSelectorTable td.rightCell {
- text-align: right;
-}
-#skinSelectorTable td.leftCell {
- text-align: left;
- color: #999;
- background-color: inherit;
-}
-#skinSelectorTable td.leftCell a {
- color: #999;
- background-color: inherit;
-}
-#skinSelectorTable td.rightCell form {
- display: inline;
- margin: 0em;
- padding: 0em;
-}
-#skinSelectorTable td.rightCell select {
- font-size: 0.9em;
- color: #333;
- background-color: #eee;
-}
-/* LINKS */
-a:link, a:active {
- color: #552;
- background-color: transparent;
-}
-a:visited {
- color: #600;
- background-color: transparent;
-}
-a:hover {
- color: red;
- background-color: transparent;
-}
-span.time {
- text-transform : lowercase;
-}
-#featureHighlight {
- color: #dd0;
- font-style: italic;
-}
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml 2008-07-20 02:53:03 UTC (rev 1908)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/subColors.xml 2008-07-30 20:50:52 UTC (rev 1909)
@@ -25,43 +25,60 @@
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">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>
+ <color name="white" rgb="ffffff" rgb="">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">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>
+ <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">bwyellow</color> -->
- <color name="salmon">bwsalmon</color>
+ <color name="yellow" rgb="fffa81">bwyellow</color> -->
+ <color name="salmon" rgb="fdcaa2">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>
+ <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">bwmdyellow</color> -->
- <color name="md salmon">bwmdsalmon</color>
+ <color name="md yellow" rgb="ffed62">bwmdyellow</color> -->
+ <color name="md salmon" rgb="fca985">bwmdsalmon</color>
</subscriptionColors>
Modified: trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js 2008-07-20 02:53:03 UTC (rev 1908)
+++ trunk/deployment/webuser/webapp/resources/demoskins/resources/bedework.js 2008-07-30 20:50:52 UTC (rev 1909)
@@ -183,7 +183,7 @@
fullUri += "/" + formObj.userPath.value;
}
}
- formObj.calUri.value = fullUri;
+ formObj.aliasUri.value = fullUri;
return true;
} else {
alert("The subscription form is not available.");
More information about the Bedework-commit
mailing list