[Bedework-commit] r447 - in trunk/calendar3:
deployment/webuser/webapp/resources/demoskins/default/default
webclient/war/WEB-INF webclient/war/docs
webclient/war/docs/calendar webclient/war/docs/prefs
svnadmin at bedework.org
svnadmin at bedework.org
Thu May 4 13:23:02 EDT 2006
Author: johnsa
Date: 2006-05-04 13:23:01 -0400 (Thu, 04 May 2006)
New Revision: 447
Modified:
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
trunk/calendar3/webclient/war/docs/calendar/calendarDescriptions.jsp
trunk/calendar3/webclient/war/docs/header.jsp
trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp
Log:
Overhaul of struts-config to add documentation and to make the file easier to read.
Addition of basic user preferences form. More to come on this.
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-04 14:26:02 UTC (rev 446)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-05-04 17:23:01 UTC (rev 447)
@@ -77,6 +77,9 @@
<xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/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"/>
+ <!-- preferences -->
+ <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/>
+ <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/>
<!-- URL of the web application - includes web context
<xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> -->
@@ -172,6 +175,10 @@
<xsl:call-template name="utilBar"/>
<xsl:apply-templates select="/bedework/freebusy"/>
</xsl:when>
+ <xsl:when test="/bedework/page='modPrefs'">
+ <!-- show an arbitrary page -->
+ <xsl:apply-templates select="/bedework/prefs"/>
+ </xsl:when>
<xsl:when test="/bedework/page='other'">
<!-- show an arbitrary page -->
<xsl:call-template name="selectPage"/>
@@ -350,7 +357,7 @@
<h3>options</h3>
<ul id="sideBarMenu">
<li><a href="{$manageLocations}">Manage Locations</a></li>
- <li>Preferences</li>
+ <li><a href="{$prefs-fetchForUpdate}">Preferences</a></li>
</ul>
</xsl:template>
@@ -3372,6 +3379,119 @@
</form>
</xsl:template>
+ <!--==== PREFERENCES ====-->
+ <xsl:template match="prefs">
+ <h2>Manage Preferences</h2>
+ <form name="userPrefsForm" method="post" action="{$prefs-update}">
+ <table class="common">
+ <tr>
+ <td class="fieldname">
+ User:
+ </td>
+ <td>
+ <xsl:value-of select="/bedework/prefs/user"/>
+ <xsl:variable name="user" select="/bedework/prefs/user"/>
+ <input type="hidden" name="user" value="{$user}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Email:
+ </td>
+ <td>
+ <xsl:variable name="email" select="/bedework/prefs/email"/>
+ <input type="text" name="email" value="{$email}" size="40"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Preferred view:
+ </td>
+ <td>
+ <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/>
+ <input type="text" name="preferredView" value="{$preferredView}" size="40"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Preferred view period:
+ </td>
+ <td>
+ <xsl:variable name="preferredViewPeriod" select="/bedework/prefs/preferredViewPeriod"/>
+ <select name="viewPeriod">
+ <!-- picking the selected item could be done with javascript. for
+ now, this will do. -->
+ <xsl:choose>
+ <xsl:when test="$preferredViewPeriod = 'dayView'">
+ <option value="dayView" selected="selected">day</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="dayView">day</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$preferredViewPeriod = 'todayView'">
+ <option value="todayView" selected="selected">today</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="todayView">today</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$preferredViewPeriod = 'weekView'">
+ <option value="weekView" selected="selected">week</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="weekView">week</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$preferredViewPeriod = 'monthView'">
+ <option value="monthView" selected="selected">month</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="monthView">month</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$preferredViewPeriod = 'yearView'">
+ <option value="yearView" selected="selected">year</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="yearView">year</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Skin name:
+ </td>
+ <td>
+ <xsl:variable name="skinName" select="/bedework/prefs/skinName"/>
+ <input type="text" name="skin" value="{$skinName}" size="40"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldname">
+ Skin style:
+ </td>
+ <td>
+ <xsl:variable name="skinStyle" select="/bedework/prefs/skinStyle"/>
+ <input type="text" name="skinStyle" value="{$skinStyle}" size="40"/>
+ </td>
+ </tr>
+ </table>
+ <br />
+
+ <input type="submit" name="modPrefs" value="Update"/>
+ <input type="reset" value="Reset"/>
+ <input type="submit" name="cancelled" value="Cancel"/>
+ </form>
+ </xsl:template>
+
+
<!--==== SIDE CALENDAR MENU ====-->
<xsl:template match="calendar" mode="sideList">
<xsl:variable name="calPath" select="encodedPath"/>
Modified: trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/calendar3/webclient/war/WEB-INF/struts-config.xml 2006-05-04 14:26:02 UTC (rev 446)
+++ trunk/calendar3/webclient/war/WEB-INF/struts-config.xml 2006-05-04 17:23:01 UTC (rev 447)
@@ -1,13 +1,38 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
<!-- ====================================================================
- This is a the Struts configuration for the uwcal client.
+ This is a the Struts configuration for the Bedework web client.
====================================================================== -->
+ <!--
+ The action-mappings below are divided into "normal" actions (suffixed
+ with ".do") and render actions (suffixed with ".rdo"). All normal actions
+ (which are typically used to change the application's state) redirect
+ to a render action that returns a jsp page for display. Render actions
+ do not change state.
+
+ The action-mappings are grouped together by function; all render
+ actions use the type="org.bedework.webclient.BwRenderAction" class.
+ The division between normal and render actions is required, among other
+ things, to allow Bedework to run in a portal. All render actions
+ are marked with the comment "renderUrl" so that they may be
+ mechanically picked out of this file and built up for portal configuration.
+ By convention, most render actions are named "show[Name]".
+
+ Note that nearly all global forwards map to a render action that produce
+ a jsp page for display.
+
+ All action URLs used in any client are produced in header.jsp to take
+ advantage of appropriate encoding or extensions required by the container
+ and/or portal. These "urlPrefixes" are then pulled into the xslt
+ for use in constructing links into the application. Look at the top of
+ header.jsp and the default.xsl files within any client for examples. Use
+ the url-prefix variables in the xslt rather than calling these paths directly.
+ -->
+
<struts-config>
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
@@ -27,11 +52,14 @@
<forward name="initUpload" path="/initUpload.rdo"/>
<forward name="showMsgErr" path="/showMsgErr.rdo"/>
- <!-- Forward for a new session from some bookmarked link? -->
+ <!-- Forward for a new session from some bookmarked link; used by
+ org.bedework.webclient.BwRenderAction when a refresh is needed -->
<forward name="gotomain" path="/docs/main.jsp" />
+ <!-- set up state and get going. -->
<forward name="initial" path="/setup.do"/>
+ <!-- global redirects used by many actions -->
<forward name="doNothing" path="/showMain.rdo" redirect="true" />
<forward name="error" path="/showMain.rdo" redirect="true" />
<forward name="success" path="/showMain.rdo" redirect="true" />
@@ -41,222 +69,212 @@
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
- <!-- ===============================================================
- Render actions - these should be referenced by the rdo suffix to
- invoke the xslt filter
- =============================================================== -->
+ <!-- ===============================================================
+ Fundamental Actions
+ =============================================================== -->
- <!--
- <action path="/showMain"
- name="calForm"
- scope="session"
- validate="false"
- include="/docs/main.jsp"/>
--->
- <action path="/showMain"
- type="org.bedework.webclient.BwRenderAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/docs/main.jsp"/>
- </action>
+ <!-- ........... PUBLIC and PERSONAL clients ...... -->
- <action path="/showPublicCals"
+ <!-- renderUrl -->
+ <action path="/initialise"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/calendar/calendarList.jsp" />
+ <forward name="success" path="/docs/main.jsp" />
+ <forward name="loggedOut" path="/docs/login/logout.html" />
</action>
- <action path="/showCals"
+ <!-- renderUrl -->
+ <action path="/showMain"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/calendar/emitCalendars.jsp" />
+ <forward name="success" path="/docs/main.jsp"/>
</action>
- <action path="/showEventMore"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/setup"
+ type="org.bedework.webclient.BwAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/event/eventMore.jsp" />
+ <forward name="loggedOut" path="/docs/login/logout.html" />
</action>
- <action path="/showAddEvent"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/setSelection"
+ type="org.bedework.webcommon.misc.SetSelectionAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/event/addEvent.jsp" />
+ <forward name="notFound" path="/showMain.rdo" redirect="true" />
+ <forward name="noViewDef" path="/showMain.rdo" redirect="true" />
</action>
- <action path="/showEditEvent"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/setViewPeriod"
+ type="org.bedework.webclient.BwGoToAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/event/editEvent.jsp" />
</action>
- <action path="/event/showAddEventRef"
+ <!-- renderUrl -->
+ <action path="/showMsgErr"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/event/addEventRef.jsp" />
+ <forward name="success" path="/docs/showMsgErr.jsp"/>
</action>
- <action path="/event/showCalsForEvent"
- type="org.bedework.webclient.BwRenderAction"
+ <!-- renderUrl -->
+ <action path="/showPage"
+ type="org.bedework.webclient.BwAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/event/selectCalForEvent.jsp"/>
+ <forward name="success" path="/docs/showPage.jsp" />
</action>
- <action path="/showExportData"
- type="org.bedework.webclient.BwRenderAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/docs/exportData.jsp" />
- </action>
+ <!-- ===============================================================
+ Events
+ =============================================================== -->
- <action path="/showManageLocations"
+ <!-- ........... PUBLIC and PERSONAL clients ...... -->
+
+ <!-- renderUrl -->
+ <action path="/showEventMore"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/location/manageLocations.jsp" />
+ <forward name="success" path="/docs/event/eventMore.jsp" />
</action>
- <action path="/showEditLocation"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/eventView"
+ type="org.bedework.webclient.BwEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/location/editLocation.jsp" />
+ <forward name="success" path="/showEventMore.rdo" redirect="true" />
</action>
- <action path="/showEmailOptions"
+ <!-- ........... PERSONAL client only ...... -->
+
+ <!-- === Adding Events === -->
+ <!-- renderUrl -->
+ <action path="/showAddEvent"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/emailOptions.jsp" />
+ <forward name="success" path="/docs/event/addEvent.jsp" />
</action>
- <action path="/showAlarmOptions"
- type="org.bedework.webclient.BwRenderAction"
+ <!-- The following 2 actions are used for adding events from an "add event" page
+ (a la Demo, Rensselaer); on error, we return to the
+ addEvent.jsp page. -->
+ <action path="/initEvent"
+ type="org.bedework.webclient.BwInitEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/alarmOptions.jsp" />
+ <forward name="success" path="/showAddEvent.rdo" redirect="true" />
</action>
- <action path="/initUpload"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/addEventUsingPage"
+ type="org.bedework.webclient.BwAddEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/upload.jsp" />
+ <forward name="error" path="/showAddEvent.rdo" redirect="true" />
+ <forward name="doNothing" path="/showAddEvent.rdo" redirect="true" />
</action>
- <action path="/initialise"
- type="org.bedework.webclient.BwRenderAction"
+ <!-- The following action is used for adding events from a form on the main
+ personal calandar page (a la Washington); on error or success, we return to the
+ main.jsp page. -->
+ <action path="/addEvent"
+ type="org.bedework.webclient.BwAddEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/main.jsp" />
- <forward name="loggedOut" path="/docs/login/logout.html" />
</action>
- <action path="/showMsgErr"
+ <!-- === Modifying Events === -->
+ <!-- renderUrl -->
+ <action path="/showEditEvent"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/showMsgErr.jsp"/>
+ <forward name="success" path="/docs/event/editEvent.jsp" />
</action>
- <!-- ===============================================================
- These actions do not render - these should be referenced by the do
- suffix and should redirect to a render action.
- =============================================================== -->
-
- <action path="/setup"
- type="org.bedework.webclient.BwAction"
+ <action path="/editEvent"
+ type="org.bedework.webclient.BwEditEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="loggedOut" path="/docs/login/logout.html" />
+ <forward name="edit" path="/showEditEvent.rdo" redirect="true" />
</action>
- <action path="/setSelection"
- type="org.bedework.webcommon.misc.SetSelectionAction"
+ <action path="/event/setAccess"
+ type="org.bedework.webcommon.access.AccessAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/showMain.rdo" redirect="true" />
- <forward name="noViewDef" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/showEditEvent.rdo" redirect="true" />
+ <forward name="error" path="/showEditEvent.rdo" redirect="true" />
+ <forward name="notFound" path="/showEditEvent.rdo" redirect="true" />
+ <forward name="doNothing" path="/showEditEvent.rdo" redirect="true" />
</action>
- <action path="/setViewPeriod"
- type="org.bedework.webclient.BwGoToAction"
+ <!-- === Selecting calendars while adding and modifying Events === -->
+ <!-- renderUrl -->
+ <action path="/event/showCalsForEvent"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
+ <forward name="success" path="/docs/event/selectCalForEvent.jsp"/>
</action>
- <action path="/eventView"
- type="org.bedework.webclient.BwEventAction"
+ <action path="/event/selectCalForEvent"
+ type="org.bedework.webclient.BwAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/showEventMore.rdo" redirect="true" />
+ <forward name="success" path="/event/showCalsForEvent.rdo" redirect="true" />
</action>
- <!-- The following action is used for adding events from a form on the main
- personal calandar page (a la Washington); on error or success, we return to the
- main.jsp page. -->
- <action path="/addEvent"
- type="org.bedework.webclient.BwAddEventAction"
+ <!-- === Adding Event References === -->
+ <!-- renderUrl -->
+ <action path="/event/showAddEventRef"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
+ <forward name="success" path="/docs/event/addEventRef.jsp" />
</action>
- <!-- The following 2 actions are used for adding events from an "add event" page
- (a la Demo, Rensselaer); on error, we return to the
- addEvent.jsp page. -->
- <action path="/initEvent"
- type="org.bedework.webclient.BwInitEventAction"
+ <action path="/addEventRef"
+ type="org.bedework.webclient.BwEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/showAddEvent.rdo" redirect="true" />
+ <forward name="success" path="/event/showAddEventRef.rdo" redirect="true" />
</action>
- <action path="/addEventUsingPage"
- type="org.bedework.webclient.BwAddEventAction"
+ <action path="/event/addEventRefComplete"
+ type="org.bedework.webclient.BwAddEventRefAction"
name="calForm"
scope="session"
validate="false">
- <forward name="error" path="/showAddEvent.rdo" redirect="true" />
- <forward name="doNothing" path="/showAddEvent.rdo" redirect="true" />
+ <forward name="duplicate" path="/showMain.rdo" redirect="true" />
</action>
- <action path="/editEvent"
- type="org.bedework.webclient.BwEditEventAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="edit" path="/showEditEvent.rdo" redirect="true" />
- </action>
-
+ <!-- === Deleting Events === -->
<action path="/delEvent"
type="org.bedework.webclient.BwDelEventAction"
name="calForm"
@@ -264,39 +282,38 @@
validate="false">
</action>
- <action path="/addEventRef"
- type="org.bedework.webclient.BwEventAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/event/showAddEventRef.rdo" redirect="true" />
- </action>
+ <!-- ===============================================================
+ Export (download) and Import
+ =============================================================== -->
- <action path="/event/addEventRefComplete"
- type="org.bedework.webclient.BwAddEventRefAction"
+ <!-- ........... PUBLIC and PERSONAL clients ...... -->
+
+ <!-- renderUrl -->
+ <action path="/showExportData"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="duplicate" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/docs/exportData.jsp" />
</action>
- <action path="/event/selectCalForEvent"
- type="org.bedework.webclient.BwAction"
+ <action path="/export"
+ type="org.bedework.webcommon.misc.ExportAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/event/showCalsForEvent.rdo" redirect="true" />
+ <forward name="success" path="/showExportData.rdo" redirect="true" />
</action>
- <action path="/event/setAccess"
- type="org.bedework.webcommon.access.AccessAction"
+ <!-- ........... PERSONAL client only ...... -->
+
+ <!-- renderUrl -->
+ <action path="/initUpload"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/showEditEvent.rdo" redirect="true" />
- <forward name="error" path="/showEditEvent.rdo" redirect="true" />
- <forward name="notFound" path="/showEditEvent.rdo" redirect="true" />
- <forward name="doNothing" path="/showEditEvent.rdo" redirect="true" />
+ <forward name="success" path="/docs/upload.jsp" />
</action>
<action path="/upload"
@@ -307,20 +324,28 @@
<forward name="baddata" path="/showMain.rdo" redirect="true" />
</action>
- <action path="/export"
- type="org.bedework.webcommon.misc.ExportAction"
+ <!-- ===============================================================
+ Locations
+ =============================================================== -->
+
+ <!-- ........... PERSONAL client only ...... -->
+
+ <!-- renderUrl -->
+ <action path="/showManageLocations"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/showExportData.rdo" redirect="true" />
+ <forward name="success" path="/docs/location/manageLocations.jsp" />
</action>
- <action path="/showPage"
- type="org.bedework.webclient.BwAction"
+ <!-- renderUrl -->
+ <action path="/showEditLocation"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/showPage.jsp" />
+ <forward name="success" path="/docs/location/editLocation.jsp" />
</action>
<action path="/manageLocations"
@@ -361,6 +386,9 @@
Free / Busy
=============================================================== -->
+ <!-- ........... PERSONAL client only ...... -->
+
+ <!-- renderUrl -->
<action path="/freeBusy/showFreeBusy"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
@@ -391,11 +419,20 @@
</action>
<!-- ===============================================================
- Calendar Actions
+ Calendars
=============================================================== -->
- <!-- ........... public and personal for viewing and selecting ...... -->
+ <!-- ........... PUBLIC and PERSONAL clients ...... -->
+ <!-- renderUrl -->
+ <action path="/showPublicCals"
+ type="org.bedework.webclient.BwRenderAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/docs/calendar/calendarList.jsp" />
+ </action>
+
<action path="/fetchPublicCalendars"
type="org.bedework.webclient.BwAction"
name="calForm"
@@ -404,6 +441,15 @@
<forward name="success" path="/showPublicCals.rdo" redirect="true" />
</action>
+ <!-- renderUrl -->
+ <action path="/showCals"
+ type="org.bedework.webclient.BwRenderAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/docs/calendar/emitCalendars.jsp" />
+ </action>
+
<action path="/fetchCalendars"
type="org.bedework.webclient.BwAction"
name="calForm"
@@ -412,8 +458,9 @@
<forward name="success" path="/showCals.rdo" redirect="true" />
</action>
- <!-- ........... personal only for modifying calendars .............. -->
+ <!-- ........... PERSONAL client only .............. -->
+ <!-- renderUrl -->
<action path="/calendar/showCalendar"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
@@ -422,14 +469,17 @@
<forward name="success" path="/docs/calendar/displayCalendar.jsp"/>
</action>
- <action path="/calendar/showReferenced"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/calendar/fetchForDisplay"
+ type="org.bedework.webcommon.calendars.FetchCalendarAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/calendar/referenced.jsp"/>
+ <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="continue" path="/calendar/showCalendar.rdo" redirect="true" />
</action>
+ <!-- === Adding and Modifying Calendars === -->
+ <!-- renderUrl -->
<action path="/calendar/showModForm"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
@@ -438,14 +488,15 @@
<forward name="success" path="/docs/calendar/modCalendar.jsp"/>
</action>
- <action path="/calendar/showDescriptionList"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/calendar/initAdd"
+ type="org.bedework.webcommon.calendars.InitAddCalendarAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/calendar/calendarDescriptions.jsp"/>
+ <forward name="continue" path="/calendar/showModForm.rdo" redirect="true" />
</action>
+ <!-- renderUrl -->
<action path="/calendar/showUpdateList"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
@@ -454,6 +505,39 @@
<forward name="success" path="/docs/calendar/calendarList.jsp"/>
</action>
+ <action path="/calendar/fetchForUpdate"
+ type="org.bedework.webcommon.calendars.FetchCalendarAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="notFound" path="/admin/showUpdateList.rdo" redirect="true" />
+ <forward name="continue" path="/calendar/showModForm.rdo" redirect="true" />
+ </action>
+
+ <action path="/calendar/update"
+ type="org.bedework.webcommon.calendars.UpdateCalendarAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" />
+ <forward name="cancelled" path="/calendar/showUpdateList.rdo" redirect="true" />
+ <forward name="retry" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="delete" path="/calendar/showDeleteConfirm.rdo" redirect="true" />
+ </action>
+
+ <action path="/calendar/setAccess"
+ type="org.bedework.webcommon.access.AccessAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="error" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="notFound" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="doNothing" path="/calendar/showModForm.rdo" redirect="true" />
+ </action>
+
+ <!-- === deleting calendars === -->
+ <!-- renderUrl -->
<action path="/calendar/showDeleteConfirm"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
@@ -463,12 +547,13 @@
<forward name="success" path="/docs/calendar/deleteConfirm.jsp" />
</action>
- <action path="/calendar/initAdd"
- type="org.bedework.webcommon.calendars.InitAddCalendarAction"
+ <!-- renderUrl -->
+ <action path="/calendar/showReferenced"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="continue" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="success" path="/docs/calendar/referenced.jsp"/>
</action>
<action path="/calendar/delete"
@@ -482,187 +567,223 @@
<forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" />
</action>
- <action path="/calendar/fetchForDisplay"
- type="org.bedework.webcommon.calendars.FetchCalendarAction"
+ <!-- === display a page of descriptions for public calendars (not currently used) === -->
+ <!-- renderUrl -->
+ <action path="/calendar/showDescriptionList"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
- <forward name="continue" path="/calendar/showCalendar.rdo" redirect="true" />
+ <forward name="success" path="/docs/calendar/calendarDescriptions.jsp"/>
</action>
- <action path="/calendar/fetchForUpdate"
- type="org.bedework.webcommon.calendars.FetchCalendarAction"
+ <!-- ===============================================================
+ Subscriptions
+ =============================================================== -->
+
+ <!-- renderUrl -->
+ <action path="/subs/showSubs"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showUpdateList.rdo" redirect="true" />
- <forward name="continue" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="success" path="/docs/subs/subscriptions.jsp"/>
</action>
- <action path="/calendar/update"
- type="org.bedework.webcommon.calendars.UpdateCalendarAction"
+ <action path="/subs/fetch"
+ type="org.bedework.webcommon.subs.GetSubscriptionsAction"
name="calForm"
scope="session"
validate="false">
- <forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" />
- <forward name="cancelled" path="/calendar/showUpdateList.rdo" redirect="true" />
- <forward name="retry" path="/calendar/showModForm.rdo" redirect="true" />
- <forward name="delete" path="/calendar/showDeleteConfirm.rdo" redirect="true" />
+ <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
</action>
- <action path="/calendar/setAccess"
- type="org.bedework.webcommon.access.AccessAction"
+ <!-- renderUrl -->
+ <action path="/subs/showModForm"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/calendar/showModForm.rdo" redirect="true" />
- <forward name="error" path="/calendar/showModForm.rdo" redirect="true" />
- <forward name="notFound" path="/calendar/showModForm.rdo" redirect="true" />
- <forward name="doNothing" path="/calendar/showModForm.rdo" redirect="true" />
+ <forward name="success" path="/docs/subs/modSubscription.jsp"/>
</action>
- <!-- ....................... system stats .......................... -->
- <action path="/showStats"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/subs/initAdd"
+ type="org.bedework.webcommon.subs.InitSubscribeAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/showSysStats.jsp" />
+ <forward name="noAccess" path="/subs/showSubs.rdo" redirect="true"/>
+ <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
+ <forward name="success" path="/subs/showModForm.rdo" redirect="true" />
</action>
- <action path="/stats"
- type="org.bedework.webcommon.misc.StatisticsAction"
+ <action path="/subs/fetchForUpdate"
+ type="org.bedework.webcommon.subs.FetchSubscriptionAction"
name="calForm"
scope="session"
validate="false">
- <forward name="continue" path="/showStats.rdo" redirect="true" />
- <forward name="success" path="/showStats.rdo" redirect="true" />
+ <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="continue" path="/subs/showModForm.rdo" redirect="true" />
</action>
- <!-- ....................... mailing events ........................ -->
-
- <action path="/initMailEvent"
- type="org.bedework.webclient.BwEventAction"
+ <action path="/subs/subscribe"
+ type="org.bedework.webcommon.subs.SubscribeAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/showMain.rdo" redirect="true" />
- <forward name="success" path="/showEmailOptions.rdo" redirect="true" />
+ <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
+ <forward name="retry" path="/subs/showModForm.rdo" redirect="true"/>
+ <forward name="reffed" path="/subs/showSubs.rdo" redirect="true"/>
+ <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
</action>
- <action path="/mailEvent"
- type="org.bedework.webclient.BwMailEventAction"
+ <action path="/subs/unsubscribe"
+ type="org.bedework.webcommon.subs.UnsubscribeAction"
name="calForm"
scope="session"
validate="false">
- <forward name="noEvent" path="/showMain.rdo" redirect="true" />
- <forward name="retry" path="/showEmailOptions.rdo" redirect="true" />
- <forward name="success" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
</action>
- <!-- ....................... event alarms .......................... -->
+ <!-- ===============================================================
+ Views
+ =============================================================== -->
- <action path="/initEventAlarm"
- type="org.bedework.webclient.BwEventAction"
+ <action path="/addView"
+ type="org.bedework.webcommon.views.AddViewAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/showMain.rdo" redirect="true" />
- <forward name="success" path="/showAlarmOptions.rdo" redirect="true" />
</action>
- <action path="/setAlarm"
- type="org.bedework.webclient.BwSetAlarmAction"
+ <action path="/removeView"
+ type="org.bedework.webcommon.views.DeleteViewAction"
name="calForm"
scope="session"
validate="false">
- <forward name="noEvent" path="/showMain.rdo" redirect="true" />
- <forward name="retry" path="/showAlarmOptions.rdo" redirect="true" />
- <forward name="success" path="/showMain.rdo" redirect="true" />
</action>
- <!-- ..................... subscriptions .......................... -->
+ <!-- ===============================================================
+ User Preferences (also see email and alarms)
+ =============================================================== -->
- <action path="/subs/showSubs"
+ <!-- ........... PERSONAL client only ...... -->
+
+ <!-- renderUrl -->
+ <action path="/prefs/showModForm"
type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/subs/subscriptions.jsp"/>
+ <forward name="success" path="/docs/prefs/modPrefs.jsp"/>
</action>
- <action path="/subs/showModForm"
- type="org.bedework.webclient.BwRenderAction"
+ <action path="/prefs/fetchForUpdate"
+ type="org.bedework.webcommon.pref.FetchPrefsAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/docs/subs/modSubscription.jsp"/>
+ <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="success" path="/prefs/showModForm.rdo" redirect="true" />
</action>
- <action path="/subs/fetch"
- type="org.bedework.webcommon.subs.GetSubscriptionsAction"
+ <action path="/prefs/update"
+ type="org.bedework.webcommon.pref.UpdatePrefsAction"
+ name="peForm"
+ scope="session"
+ validate="false">
+ <forward name="cancelled" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="retry" path="/prefs/showModForm.rdo" />
+ <forward name="success" path="/admin/showMain.rdo" redirect="true" />
+ </action>
+
+ <!-- ===============================================================
+ Mailing Events
+ =============================================================== -->
+
+ <!-- renderUrl -->
+ <action path="/showEmailOptions"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
+ <forward name="success" path="/docs/emailOptions.jsp" />
</action>
- <action path="/subs/fetchForUpdate"
- type="org.bedework.webcommon.subs.FetchSubscriptionAction"
+ <action path="/initMailEvent"
+ type="org.bedework.webclient.BwEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
- <forward name="continue" path="/subs/showModForm.rdo" redirect="true" />
+ <forward name="notFound" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/showEmailOptions.rdo" redirect="true" />
</action>
- <action path="/subs/initAdd"
- type="org.bedework.webcommon.subs.InitSubscribeAction"
+ <action path="/mailEvent"
+ type="org.bedework.webclient.BwMailEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="noAccess" path="/subs/showSubs.rdo" redirect="true"/>
- <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
- <forward name="success" path="/subs/showModForm.rdo" redirect="true" />
+ <forward name="noEvent" path="/showMain.rdo" redirect="true" />
+ <forward name="retry" path="/showEmailOptions.rdo" redirect="true" />
+ <forward name="success" path="/showMain.rdo" redirect="true" />
</action>
+ <!-- ===============================================================
+ Event Alarms
+ =============================================================== -->
- <action path="/subs/subscribe"
- type="org.bedework.webcommon.subs.SubscribeAction"
+ <!-- renderUrl -->
+ <action path="/showAlarmOptions"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
- <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
- <forward name="retry" path="/subs/showModForm.rdo" redirect="true"/>
- <forward name="reffed" path="/subs/showSubs.rdo" redirect="true"/>
- <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
+ <forward name="success" path="/docs/alarmOptions.jsp" />
</action>
- <action path="/subs/unsubscribe"
- type="org.bedework.webcommon.subs.UnsubscribeAction"
+ <action path="/initEventAlarm"
+ type="org.bedework.webclient.BwEventAction"
name="calForm"
scope="session"
validate="false">
- <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
+ <forward name="notFound" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/showAlarmOptions.rdo" redirect="true" />
</action>
- <!-- ......................... views .............................. -->
+ <action path="/setAlarm"
+ type="org.bedework.webclient.BwSetAlarmAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="noEvent" path="/showMain.rdo" redirect="true" />
+ <forward name="retry" path="/showAlarmOptions.rdo" redirect="true" />
+ <forward name="success" path="/showMain.rdo" redirect="true" />
+ </action>
- <action path="/addView"
- type="org.bedework.webcommon.views.AddViewAction"
+ <!-- ===============================================================
+ System Statistics
+ =============================================================== -->
+
+ <!-- renderUrl -->
+ <action path="/showStats"
+ type="org.bedework.webclient.BwRenderAction"
name="calForm"
scope="session"
validate="false">
+ <forward name="success" path="/docs/showSysStats.jsp" />
</action>
- <action path="/removeView"
- type="org.bedework.webcommon.views.DeleteViewAction"
+ <action path="/stats"
+ type="org.bedework.webcommon.misc.StatisticsAction"
name="calForm"
scope="session"
validate="false">
+ <forward name="continue" path="/showStats.rdo" redirect="true" />
+ <forward name="success" path="/showStats.rdo" redirect="true" />
</action>
</action-mappings>
+
<!-- unknown="true" -->
<!-- Below will be one or more comments which must not be edited or removed
Modified: trunk/calendar3/webclient/war/docs/calendar/calendarDescriptions.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/calendar/calendarDescriptions.jsp 2006-05-04 14:26:02 UTC (rev 446)
+++ trunk/calendar3/webclient/war/docs/calendar/calendarDescriptions.jsp 2006-05-04 17:23:01 UTC (rev 447)
@@ -6,6 +6,6 @@
<% /* the same as calendarList.jsp, but will be treated differently */ %>
<page>calendarDescriptions</page>
-<%@include file="/docs/calendar/emitCalendars.jsp"%>
+<%@include file="/docs/calendar/emitPublicCalendars.jsp"%>
<%@include file="/docs/footer.jsp"%>
Modified: trunk/calendar3/webclient/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/header.jsp 2006-05-04 14:26:02 UTC (rev 446)
+++ trunk/calendar3/webclient/war/docs/header.jsp 2006-05-04 17:23:01 UTC (rev 447)
@@ -171,6 +171,11 @@
<editLocation><genurl:rewrite action="editLoc.do"/></editLocation>
<delLocation><genurl:rewrite action="delLocation.do"/></delLocation>
+ <prefs>
+ <fetchForUpdate><genurl:link page="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate>
+ <update><genurl:link page="/prefs/update.do?b=de"/></update>
+ </prefs>
+
<initEventAlarm><genurl:rewrite action="initEventAlarm.do"/></initEventAlarm>
<setAlarm><genurl:rewrite action="setAlarm.do"/></setAlarm>
<addEventRef><genurl:rewrite action="addEventRef.do"/></addEventRef>
Modified: trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp 2006-05-04 14:26:02 UTC (rev 446)
+++ trunk/calendar3/webclient/war/docs/prefs/modPrefs.jsp 2006-05-04 17:23:01 UTC (rev 447)
@@ -10,10 +10,25 @@
<bean:define id="userPrefs" name="calForm" property="userPreferences"/>
<prefs>
<user><bean:write name="userPrefs" property="owner.account"/></user>
+ <email><bean:write name="userPrefs" property="email"/></email>
+ <!-- default calendar into which events will be placed -->
+ <defaultCalendar><bean:write name="userPrefs" property="defaultCalendar"/></defaultCalendar>
+ <!-- name of default view (collection of subscriptions) that will appear upon login -->
<preferredView><bean:write name="userPrefs" property="preferredView"/></preferredView>
+ <!-- default period that will appear upon login (day, week, month, year, today) -->
<preferredViewPeriod><bean:write name="userPrefs" property="preferredViewPeriod"/></preferredViewPeriod>
+ <!-- skinName is XSL skin name; skinStyle is intended for CSS stylesheet name -->
<skinName><bean:write name="userPrefs" property="skinName"/></skinName>
<skinStyle><bean:write name="userPrefs" property="skinStyle"/></skinStyle>
+ <!-- string of chars representing the days -->
+ <workDays><bean:write name="userPrefs" property="workDays"/></workDays>
+ <!-- start and end in minutes: e.g. 14:30 is 870 and 17:30 is 1050 -->
+ <workdayStart><bean:write name="userPrefs" property="workdayStart"/></workdayStart>
+ <workdayEnd><bean:write name="userPrefs" property="workdayEnd"/></workdayEnd>
+ <!-- pref end type = date or duration -->
+ <preferredEndType><bean:write name="userPrefs" property="preferredEndType"/></preferredEndType>
+ <!-- user mode: 0 = basicMode, 1 = simpleMode, 2 = advancedMode -->
+ <userMode><bean:write name="userPrefs" property="userMode"/></userMode>
</prefs>
<%@include file="/docs/footer.jsp"%>
More information about the Bedework-commit
mailing list