[Bedework-commit] r433 - in trunk/calendar3:
deployment/webuser/webapp/resources/demoskins/default/default
webclient/war/docs/calendar webclient/war/docs/event
svnadmin at bedework.org
svnadmin at bedework.org
Mon May 1 16:26:28 EDT 2006
Author: johnsa
Date: 2006-05-01 16:26:27 -0400 (Mon, 01 May 2006)
New Revision: 433
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/webclient/war/docs/calendar/displayCalendarCommon.jsp
trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp
trunk/calendar3/webclient/war/docs/event/addEventForm.jsp
trunk/calendar3/webclient/war/docs/event/editEvent.jsp
trunk/calendar3/webclient/war/docs/event/emitEvent.jsp
Log:
all references to calId removed and replaced with calPath in the personal stylesheets. Need to update admin client as well.
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-05-01 20:26:27 UTC (rev 433)
@@ -171,6 +171,7 @@
border-bottom: 2px solid #aaa;
border-top: 24px solid #333;
vertical-align: top;
+ white-space: nowrap;
margin: 0;
padding: 0;
}
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-05-01 20:26:27 UTC (rev 433)
@@ -225,7 +225,10 @@
<link rel="stylesheet" href="{$resourcesRoot}/default/default/default.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 /bedework/page='editEvent' or /bedework/page='selectCalForEvent'">
+ <xsl:if test="/bedework/page='addEvent' or
+ /bedework/page='editEvent' or
+ /bedework/page='selectCalForEvent' or
+ /bedework/page='upload'">
<script type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script>
<script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script>
<link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
@@ -697,7 +700,7 @@
<xsl:for-each select="event">
<xsl:variable name="id" select="id"/>
<xsl:variable name="subscriptionId" select="subscription/id"/>
- <xsl:variable name="calendarId" select="calendar/id"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="guid" select="guid"/>
<xsl:variable name="recurrenceId" select="recurrenceId"/>
<tr>
@@ -724,7 +727,7 @@
</xsl:when>
<xsl:otherwise>
<td class="{$dateRangeStyle} right">
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">
<xsl:choose>
<xsl:when test="start/allday = 'true' and
parent::day/shortdate = start/shortdate">
@@ -741,10 +744,10 @@
</a>
</td>
<td class="{$dateRangeStyle} center">
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">-</a>
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">-</a>
</td>
<td class="{$dateRangeStyle} left">
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">
<xsl:choose>
<xsl:when test="end/allday = 'true' and
parent::day/shortdate = end/shortdate">
@@ -771,7 +774,7 @@
<td class="{$descriptionClass}">
<xsl:choose>
<xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">
<strong><xsl:value-of select="summary"/>: </strong>
<xsl:value-of select="description"/> 
<em>
@@ -793,7 +796,7 @@
</xsl:if>
</xsl:when>
<xsl:otherwise>
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">
<xsl:value-of select="summary"/>
<xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
</a>
@@ -805,7 +808,7 @@
</td>
<td class="smallIcon">
<xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
- <a href="{$export}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+ <a href="{$export}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&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>
</td>
@@ -819,28 +822,28 @@
<xsl:template name="eventLinks">
<xsl:variable name="subscriptionId" select="subscription/id"/>
- <xsl:variable name="calendarId" select="calendar/id"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="guid" select="guid"/>
<xsl:variable name="recurrenceId" select="recurrenceId"/>
<xsl:choose>
<xsl:when test="isAnnotation">
<xsl:choose>
<xsl:when test="recurring=true">
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&confirmationid={$confId}">Remove All</a>
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&confirmationid={$confId}">Remove All</a>
</xsl:when>
<xsl:otherwise>
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Remove</a>
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Remove</a>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:when test="calendar/owner = /bedework/userid">
- <a href="{$editEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}">Edit</a> |
+ <a href="{$editEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">Edit</a> |
<xsl:choose>
<xsl:when test="recurring=true">
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Delete All</a>
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Delete All</a>
</xsl:when>
<xsl:otherwise>
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Delete</a>
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">Delete</a>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -924,7 +927,7 @@
<xsl:template match="event" mode="calendarLayout">
<xsl:param name="dayPos"/>
<xsl:variable name="subscriptionId" select="subscription/id"/>
- <xsl:variable name="calendarId" select="calendar/id"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="guid" select="guid"/>
<xsl:variable name="recurrenceId" select="recurrenceId"/>
<xsl:variable name="eventClass">
@@ -938,7 +941,7 @@
</xsl:choose>
</xsl:variable>
<li>
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}" class="{$eventClass}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}" class="{$eventClass}">
<xsl:value-of select="summary"/>
<xsl:variable name="eventTipClass">
<xsl:choose>
@@ -1056,7 +1059,7 @@
<!--==== SINGLE EVENT ====-->
<xsl:template match="event">
<xsl:variable name="subscriptionId" select="subscription/id"/>
- <xsl:variable name="calendarId" select="calendar/id"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="guid" select="guid"/>
<xsl:variable name="recurrenceId" select="recurrenceId"/>
<h2>
@@ -1077,36 +1080,36 @@
<th colspan="3" class="commonHeader">
<div id="eventActions">
<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
- <a href="{$export}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+ <a href="{$export}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
Download
</a> |
<xsl:choose>
<xsl:when test="isAnnotation">
<xsl:choose>
<xsl:when test="recurring=true">
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&confirmationid={$confId}">
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&confirmationid={$confId}">
Remove All (recurring)
</a>
</xsl:when>
<xsl:otherwise>
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
Remove
</a>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:when test="calendar/owner = /bedework/userid">
- <a href="{$editEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
+ <a href="{$editEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
Edit
</a> |
<xsl:choose>
<xsl:when test="recurring=true">
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&confirmationid={$confId}">
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&confirmationid={$confId}">
Delete All (recurring)
</a>
</xsl:when>
<xsl:otherwise>
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
Delete
</a>
</xsl:otherwise>
@@ -1162,7 +1165,7 @@
</td>
<th class="icon" rowspan="2">
<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
- <a href="{$export}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+ <a href="{$export}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&nocache=no&skinName=ical&contentType=text/calendar&contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
<img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
</a><!-- <br />
[<a href="">help</a>] -->
@@ -1287,7 +1290,7 @@
<tr>
<td class="fieldname">Calendar:</td>
<td class="fieldval">
- <xsl:variable name="calUrl" select="calendar/path"/>
+ <xsl:variable name="calUrl" select="calendar/encodedPath"/>
<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
<a href="{$setSelection}?calUrl={$calUrl}">
<xsl:choose>
@@ -1332,7 +1335,7 @@
Calendar:
</td>
<td class="fieldval">
- <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/>
+ <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/encodedPath"/>
<input type="hidden" name="calPath" value="{$calPath}"/>
<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
<span id="bwEventCalDisplay">
@@ -1673,7 +1676,7 @@
<!--==== EDIT EVENT ====-->
<xsl:template match="formElements" mode="editEvent">
<xsl:variable name="subscriptionId" select="subscriptionId"/>
- <xsl:variable name="calendarId" select="calendarId"/>
+ <xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="guid" select="guid"/>
<xsl:variable name="recurrenceId" select="recurrenceId"/>
<!-- The name "eventForm" is referenced by several javascript functions. Do not
@@ -1687,10 +1690,10 @@
<tr>
<th colspan="2" class="commonHeader">
<div id="eventActions">
- <a href="{$eventView}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
+ <a href="{$eventView}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
View
</a> |
- <a href="{$delEvent}?subid={$subscriptionId}&calid={$calendarId}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
+ <a href="{$delEvent}?subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}&confirmationid={$confId}">
Delete
</a>
</div>
@@ -1711,7 +1714,7 @@
Calendar:
</td>
<td class="fieldval">
- <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/>
+ <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/encodedPath"/>
<input type="hidden" name="calPath" value="{$calPath}"/>
<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
<span id="bwEventCalDisplay">
@@ -2006,7 +2009,7 @@
</xsl:if>
</table>
<form name="eventShareForm" action="{$event-setAccess}" id="shareForm">
- <input type="hidden" name="calId" value="{$calendarId}"/>
+ <input type="hidden" name="calPath" value="{$calPath}"/>
<input type="hidden" name="guid" value="{$guid}"/>
<input type="hidden" name="recurid" value="{$recurrenceId}"/>
<p>
@@ -2018,7 +2021,7 @@
<p>
Access rights:<br/>
<input type="radio" value="r" name="how" checked="checked"/> read<br/>
- <input type="radio" value="w" name="how"/> write<br/>
+ <input type="radio" value="Rc" name="how"/> write<br/>
<input type="radio" value="f" name="how"/> free/busy only<br/>
<input type="radio" value="d" name="how"/> default (reset access)
</p>
@@ -2217,7 +2220,7 @@
<xsl:variable name="itemClass">
<xsl:choose>
<xsl:when test="/bedework/selectionState/selectionType = 'calendar'
- and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when>
+ and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when>
<xsl:when test="name='Trash'">trash</xsl:when>
<xsl:when test="calendarCollection='false'">folder</xsl:when>
<xsl:otherwise>calendar</xsl:otherwise>
@@ -2579,7 +2582,7 @@
<p>
Access rights:<br/>
<input type="radio" value="r" name="how" checked="checked"/> read<br/>
- <input type="radio" value="w" name="how"/> write<br/>
+ <input type="radio" value="Rc" name="how"/> write<br/>
<input type="radio" value="f" name="how"/> free/busy only<br/>
<input type="radio" value="d" name="how"/> default (reset access)
</p>
@@ -3126,6 +3129,27 @@
</td>
</tr>
<tr>
+ <td class="fieldname">
+ Into calendar:
+ </td>
+ <td align="left">
+ <input type="hidden" name="calPath" value=""/>
+ <span id="bwEventCalDisplay">
+ <em>default calendar</em>
+ </span>
+ <a href="javascript:launchSimpleWindow('{$event-selectCalForEvent}')" class="small">[change]</a>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Affects Free/busy:
+ </td>
+ <td align="left">
+ <input type="radio" value="true" name="affectsFreeBusy"/> yes
+ <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no
+ </td>
+ </tr>
+ <tr>
<td> </td>
<td>
<input name="submit" type="submit" value="Continue"/> 
Modified: trunk/calendar3/webclient/war/docs/calendar/displayCalendarCommon.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/calendar/displayCalendarCommon.jsp 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/webclient/war/docs/calendar/displayCalendarCommon.jsp 2006-05-01 20:26:27 UTC (rev 433)
@@ -7,6 +7,7 @@
<id><bean:write name="curcal" property="id" /></id>
<bw:emitText name="curcal" property="name" />
<bw:emitText name="curcal" property="path" />
+ <bw:emitText name="curcal" property="encodedPath" />
<bw:emitText name="curcal" property="description" tagName="desc" />
<calendarCollection><bean:write name="curcal" property="calendarCollection" /></calendarCollection>
<bw:emitText name="curcal" property="mailListId" />
Modified: trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp 2006-05-01 20:26:27 UTC (rev 433)
@@ -6,6 +6,7 @@
<id><bean:write name="calendar" property="id" /></id>
<bw:emitText name="calendar" property="name" />
<bw:emitText name="calendar" property="path" />
+ <bw:emitText name="calendar" property="encodedPath" />
<bw:emitText name="calendar" property="description" tagName="desc" />
<calendarCollection><bean:write name="calendar" property="calendarCollection" /></calendarCollection>
<bw:emitText name="calendar" property="mailListId" />
Modified: trunk/calendar3/webclient/war/docs/event/addEventForm.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/event/addEventForm.jsp 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/webclient/war/docs/event/addEventForm.jsp 2006-05-01 20:26:27 UTC (rev 433)
@@ -15,6 +15,7 @@
<calendar>
<name><bean:write name="calForm" property="newEvent.calendar.name"/></name>
<path><bean:write name="calForm" property="newEvent.calendar.path"/></path>
+ <encodedPath><bean:write name="calForm" property="newEvent.calendar.encodedPath" /></encodedPath>
</calendar>
<allDay><html:checkbox property="eventStartDate.dateOnly"/></allDay>
<start>
Modified: trunk/calendar3/webclient/war/docs/event/editEvent.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/event/editEvent.jsp 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/webclient/war/docs/event/editEvent.jsp 2006-05-01 20:26:27 UTC (rev 433)
@@ -24,6 +24,7 @@
<calendar>
<name><bean:write name="calForm" property="editEvent.calendar.name"/></name>
<path><bean:write name="calForm" property="editEvent.calendar.path"/></path>
+ <encodedPath><bean:write name="calForm" property="editEvent.calendar.encodedPath" /></encodedPath>
</calendar>
<allDay><html:checkbox property="eventStartDate.dateOnly"/></allDay>
<start>
Modified: trunk/calendar3/webclient/war/docs/event/emitEvent.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/event/emitEvent.jsp 2006-05-01 19:19:52 UTC (rev 432)
+++ trunk/calendar3/webclient/war/docs/event/emitEvent.jsp 2006-05-01 20:26:27 UTC (rev 433)
@@ -60,6 +60,8 @@
Value: string - name of the calendar --%>
<bw:emitText name="calendar" property="path"/><%--
Value: path to the calendar --%>
+ <bw:emitText name="calendar" property="encodedPath" /><%--
+ Value: encoded path to the calendar --%>
<id><bean:write name="calendar" property="id"/></id><%--
Value: integer - calendar id --%>
<bw:emitText name="calendar" property="owner.account" tagName="owner" /><%--
More information about the Bedework-commit
mailing list