[Bedework-commit] r351 - in
trunk/calendar3/deployment/webuser/webapp/resources/demoskins:
default/default resources
svnadmin at bedework.org
svnadmin at bedework.org
Sat Apr 8 09:27:22 EDT 2006
Author: johnsa
Date: 2006-04-08 09:27:20 -0400 (Sat, 08 Apr 2006)
New Revision: 351
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/dynCalendarWidget.css
Log:
added functionality to calendar selection in personal client; some minor color chages, too.
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-08 12:52:38 UTC (rev 350)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-08 13:27:20 UTC (rev 351)
@@ -199,6 +199,15 @@
color: black;
background-color: #333;
}
+#bodyBlock td#sideBar a:link,
+#bodyBlock td#sideBara:active,
+#bodyBlock td#sideBar a:visited {
+ text-decoration: none;
+}
+#bodyBlock td#sideBar a:hover {
+ color: black;
+ background-color: #ff3;
+}
#sideBarOpenCloseIcon {
float: left;
margin: 3px 0;
@@ -212,6 +221,7 @@
}
#myViews li.selected {
list-style-image: url(../../resources/glassFill-icon-view.gif);
+ font-weight: bold;
}
#bodyBlock td#bodyContent {
border-right: 2px solid #333;
@@ -888,7 +898,6 @@
}
.calendarTree li {
padding-top: 0.25em;
- /*font-weight: bold;*/
}
.calendarTree li.folder {
list-style-image: url(../../resources/catIcon.gif);
@@ -899,6 +908,10 @@
.calendarTree li.trash {
list-style-image: url(../../resources/trashIcon.gif);
}
+.calendarTree li.selected {
+ list-style-image: url(../../resources/glassFill-icon-view.gif);
+ font-weight: bold;
+}
.calendarTree a:link,
.calendarTree a:active,
.calendarTree a:visited {
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-08 12:52:38 UTC (rev 350)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-08 13:27:20 UTC (rev 351)
@@ -266,17 +266,25 @@
<img alt="manage views" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> views
</h3>
<ul id="myViews">
- <xsl:for-each select="/bedework/views/view">
- <xsl:variable name="viewName" select="name"/>
- <xsl:choose>
- <xsl:when test="name=/bedework/selectionState/view/name">
- <li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
- </xsl:when>
- <xsl:otherwise>
- <li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
+ <xsl:choose>
+ <xsl:when test="/bedework/views/view">
+ <xsl:for-each select="/bedework/views/view">
+ <xsl:variable name="viewName" select="name"/>
+ <xsl:choose>
+ <xsl:when test="/bedework/selectionState/selectionType = 'view'
+ and name=/bedework/selectionState/view/name">
+ <li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+ </xsl:when>
+ <xsl:otherwise>
+ <li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <li class="none">no subscriptions</li>
+ </xsl:otherwise>
+ </xsl:choose>
</ul>
<h3><img alt="manage calendars" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> calendars</h3>
@@ -505,11 +513,21 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0" id="utilBarTable">
<tr>
<td class="leftCell">
- <xsl:variable name="date" select="/bedework/firstday/date"/>
- <a href="{$initEvent}?date={$date}" title="add event">
- <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/>
- add event
- </a>
+ <xsl:choose>
+ <xsl:when test="/bedework/periodname = 'day'">
+ <xsl:variable name="date" select="/bedework/firstday/date"/>
+ <a href="{$initEvent}?date={$date}" title="add event">
+ <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/>
+ add event
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{$initEvent}" title="add event">
+ <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/>
+ add event
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
<a href="{$initUpload}" title="upload event">
<img src="{$resourcesRoot}/resources/std-icalUpload-icon-small.gif" width="12" height="16" border="0" alt="upload event"/>
upload
@@ -1853,15 +1871,18 @@
<xsl:variable name="id" select="id"/>
<xsl:variable name="itemClass">
<xsl:choose>
+ <xsl:when test="/bedework/selectionState/selectionType = 'calendar'
+ and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when>
<xsl:when test="name='Trash'">trash</xsl:when>
<xsl:when test="calendarCollection='false'">folder</xsl:when>
<xsl:otherwise>calendar</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<li class="{$itemClass}">
- <!--<a href="{$subscriptions-initAdd}&calId={$id}">-->
+ <xsl:variable name="url" select="path"/>
+ <a href="{$setSelection}?calUrl={$url}">
<xsl:value-of select="name"/>
- <!--</a>-->
+ </a>
<xsl:if test="calendar">
<ul>
<xsl:apply-templates select="calendar" mode="myCalendars"/>
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.css 2006-04-08 12:52:38 UTC (rev 350)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.css 2006-04-08 13:27:20 UTC (rev 351)
@@ -14,20 +14,16 @@
border: 2px solid #ddd;
}
.dynCalendar_header{
- background-color: #00a;
+ background-color: #233979;
color: white;
- font-size: 14px;
+ font-size: 12px;
font-weight: bold;
height: 15px;
}
.dynCalendar_header a {
- background-color: #00a;
- color: white;
+ background-color: inherit;
+ color: #eee;
}
-.dynCalendar_header a {
- background-color: #00a;
- color: white;
-}
.dynCalendar_dayname {
background-color: #eee;
color: black;
More information about the Bedework-commit
mailing list