[Bedework-commit] webapps r505 - in trunk/webadmin/war: WEB-INF
docs docs/admingroup docs/authuser docs/calendar
docs/calsuite docs/category docs/contact docs/event
docs/location docs/prefs docs/search docs/subs docs/system docs/view
svnadmin at bedework.org
svnadmin at bedework.org
Wed Sep 5 21:51:33 EDT 2007
Author: douglm
Date: 2007-09-05 21:51:17 -0400 (Wed, 05 Sep 2007)
New Revision: 505
Modified:
trunk/webadmin/war/WEB-INF/struts-config.xml
trunk/webadmin/war/docs/admingroup/adminGroupList.jsp
trunk/webadmin/war/docs/admingroup/chooseAdminGroup.jsp
trunk/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp
trunk/webadmin/war/docs/admingroup/modAdminGroup.jsp
trunk/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp
trunk/webadmin/war/docs/authuser/authUserList.jsp
trunk/webadmin/war/docs/authuser/modAuthUser.jsp
trunk/webadmin/war/docs/calendar/displayCalendarCommon.jsp
trunk/webadmin/war/docs/calendar/emitCalendar.jsp
trunk/webadmin/war/docs/calendar/emitCalendars.jsp
trunk/webadmin/war/docs/calendar/modCalendar.jsp
trunk/webadmin/war/docs/calsuite/calSuiteList.jsp
trunk/webadmin/war/docs/calsuite/deleteConfirm.jsp
trunk/webadmin/war/docs/calsuite/displayCalSuite.jsp
trunk/webadmin/war/docs/calsuite/modCalSuite.jsp
trunk/webadmin/war/docs/calsuite/modPrefs.jsp
trunk/webadmin/war/docs/category/categoryList.jsp
trunk/webadmin/war/docs/category/deleteConfirm.jsp
trunk/webadmin/war/docs/category/modCategory.jsp
trunk/webadmin/war/docs/category/referenced.jsp
trunk/webadmin/war/docs/contact/contactList.jsp
trunk/webadmin/war/docs/contact/deleteConfirm.jsp
trunk/webadmin/war/docs/contact/displayContact.jsp
trunk/webadmin/war/docs/contact/modContact.jsp
trunk/webadmin/war/docs/contact/referenced.jsp
trunk/webadmin/war/docs/error.jsp
trunk/webadmin/war/docs/event/deleteConfirm.jsp
trunk/webadmin/war/docs/event/displayEvent.jsp
trunk/webadmin/war/docs/event/emitEventCommon.jsp
trunk/webadmin/war/docs/event/emitRecur.jsp
trunk/webadmin/war/docs/event/eventList.jsp
trunk/webadmin/war/docs/event/modEvent.jsp
trunk/webadmin/war/docs/event/rdates.jsp
trunk/webadmin/war/docs/event/selectCalForEvent.jsp
trunk/webadmin/war/docs/header.jsp
trunk/webadmin/war/docs/location/deleteConfirm.jsp
trunk/webadmin/war/docs/location/displayLocation.jsp
trunk/webadmin/war/docs/location/locationList.jsp
trunk/webadmin/war/docs/location/modLocation.jsp
trunk/webadmin/war/docs/location/referenced.jsp
trunk/webadmin/war/docs/main.jsp
trunk/webadmin/war/docs/prefs/modPrefs.jsp
trunk/webadmin/war/docs/search/list.jsp
trunk/webadmin/war/docs/subs/modSubscription.jsp
trunk/webadmin/war/docs/subs/subscriptions.jsp
trunk/webadmin/war/docs/system/modSyspars.jsp
trunk/webadmin/war/docs/system/showSysStats.jsp
trunk/webadmin/war/docs/view/deleteConfirm.jsp
trunk/webadmin/war/docs/view/modView.jsp
trunk/webadmin/war/docs/view/viewList.jsp
Log:
Change the form name from "peForm" to "calForm"
No functional change, just a long standing irritation that stands in the way of merging most of the admin and webclient code.
Modified: trunk/webadmin/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/webadmin/war/WEB-INF/struts-config.xml 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/WEB-INF/struts-config.xml 2007-09-06 01:51:17 UTC (rev 505)
@@ -37,7 +37,7 @@
<struts-config>
<!-- ========== Form Bean Definitions ================================ -->
<form-beans>
- <form-bean name="peForm"
+ <form-bean name="calForm"
type="org.bedework.webcommon.BwActionFormBase"/>
</form-beans>
@@ -71,7 +71,7 @@
<action-mappings>
<action path="/admin/showMain"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/main.jsp"/>
@@ -79,7 +79,7 @@
<action path="/admin/showError"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/error.jsp"/>
@@ -87,7 +87,7 @@
<action path="/admin/showNoAccess"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/noAccess.jsp"/>
@@ -96,7 +96,7 @@
<action path="/admin/showNoGroup"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/noGroup.jsp"/>
@@ -104,7 +104,7 @@
<action path="/categories/showCats"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/categories.jsp"/>
@@ -113,7 +113,7 @@
<action path="/setup"
type="org.bedework.webcommon.NoopAction"
unknown="true"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="loggedOut" path="/admin/showMain.rdo" redirect="true"/>
@@ -125,7 +125,7 @@
<action path="/event/showEvent"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/event/displayEvent.jsp"/>
@@ -133,7 +133,7 @@
<action path="/event/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/event/modEvent.jsp"/>
@@ -141,7 +141,7 @@
<action path="/event/showUpdateList"
type="org.bedework.webcommon.event.RenderEventListAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/docs/event/eventList.jsp"/>
@@ -149,7 +149,7 @@
<action path="/event/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/event/deleteConfirm.jsp" />
@@ -157,7 +157,7 @@
<action path="/event/initAddEvent"
type="org.bedework.webcommon.event.InitAddEventAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/event/showModForm.rdo" redirect="true" />
@@ -165,7 +165,7 @@
<action path="/event/initUpdateEvent"
type="org.bedework.webcommon.event.EventListParsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/event/showUpdateList.rdo" redirect="true" />
@@ -173,7 +173,7 @@
<action path="/event/delete"
type="org.bedework.webcommon.event.DeleteEventAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/event/initUpdateEvent.do" redirect="true" />
@@ -184,7 +184,7 @@
<action path="/event/fetchForDisplay"
type="org.bedework.webcommon.event.FetchEventAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -193,7 +193,7 @@
<action path="/event/fetchForUpdate"
type="org.bedework.webcommon.event.FetchEventAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="noAction" path="/admin/showMain.rdo" redirect="true" />
@@ -205,7 +205,7 @@
<action path="/event/update"
type="org.bedework.webcommon.event.UpdateEventAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="validationError" path="/event/showModForm.rdo" redirect="true" />
@@ -220,7 +220,7 @@
<!-- renderUrl -->
<action path="/event/initUpload"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/event/upload.jsp" />
@@ -228,7 +228,7 @@
<action path="/event/upload"
type="org.bedework.webcommon.misc.UploadAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="baddata" path="/showMain.rdo" redirect="true" />
@@ -239,7 +239,7 @@
<!-- renderUrl -->
<action path="/event/showRdates"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
parameter="refinterval=900"
validate="false">
@@ -248,7 +248,7 @@
<action path="/event/setRdate"
type="org.bedework.webcommon.event.RdateAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/event/showRdates.rdo" redirect="true" />
@@ -259,7 +259,7 @@
<!-- renderUrl -->
<action path="/event/showCalsForEvent"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/event/selectCalForEvent.jsp"/>
@@ -267,7 +267,7 @@
<action path="/event/selectCalForEvent"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/event/showCalsForEvent.rdo" redirect="true" />
@@ -279,7 +279,7 @@
<action path="/calendar/openCloseMod"
type="org.bedework.webcommon.calendars.OpenCloseAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
@@ -303,11 +303,11 @@
<forward name="notFound" path="/docs/main.jsp"/>
<forward name="success" path="/calendar/showDescriptionList.rdo" redirect="true"/>
</action>
-
+
<!-- renderUrl -->
<action path="/calendar/showCalendar"
type="org.bedework.webcommon.calendars.RenderCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
@@ -317,7 +317,7 @@
<!-- renderUrl -->
<action path="/calendar/showReferenced"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calendar/referenced.jsp"/>
@@ -326,7 +326,7 @@
<!-- renderUrl -->
<action path="/calendar/showModForm"
type="org.bedework.webcommon.calendars.RenderCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
@@ -336,7 +336,7 @@
<!-- renderUrl -->
<action path="/calendar/showAddForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calendar/modCalendar.jsp"/>
@@ -344,16 +344,16 @@
<action path="/calendar/initAdd"
type="org.bedework.webcommon.calendars.InitAddCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/calendar/showAddForm.rdo" redirect="true" />
</action>
-
+
<!-- renderUrl -->
<action path="/calendar/showDescriptionList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calendar/calendarDescriptions.jsp"/>
@@ -362,7 +362,7 @@
<!-- renderUrl -->
<action path="/calendar/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calendar/calendarList.jsp"/>
@@ -371,7 +371,7 @@
<!-- renderUrl -->
<action path="/calendar/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/calendar/showUpdateList.rdo" redirect="true" />
@@ -380,7 +380,7 @@
<action path="/calendar/delete"
type="org.bedework.webcommon.calendars.DeleteCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="inUse" path="/calendar/showReferenced.rdo" redirect="true" />
@@ -391,7 +391,7 @@
<action path="/calendar/fetchForDisplay"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/calendar/showCalendar.rdo" redirect="true" />
@@ -399,7 +399,7 @@
<action path="/calendar/fetchForUpdate"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/calendar/showModForm.rdo" redirect="true" />
@@ -407,7 +407,7 @@
<action path="/calendar/update"
type="org.bedework.webcommon.calendars.UpdateCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" />
@@ -420,25 +420,25 @@
<!-- renderUrl -->
<action path="/calendar/showMoveForm"
type="org.bedework.webcommon.calendars.RenderCalendarAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
<forward name="success" path="/docs/calendar/moveCalendar.jsp"/>
</action>
-
+
<action path="/calendar/openCloseMove"
type="org.bedework.webcommon.calendars.OpenCloseAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
<forward name="success" path="/calendar/showMoveForm.rdo" redirect="yes"/>
</action>
-
+
<action path="/calendar/setAccess"
type="org.bedework.webcommon.access.AccessAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/calendar/showModForm.rdo" redirect="true" />
@@ -453,7 +453,7 @@
<action path="/subs/openCloseMod"
type="org.bedework.webcommon.calendars.OpenCloseAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/docs/main.jsp"/>
@@ -463,7 +463,7 @@
<!-- renderUrl -->
<action path="/subs/showSubs"
type="org.bedework.webcommon.subs.RenderSubscriptionsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/subs/subscriptions.jsp"/>
@@ -472,7 +472,7 @@
<!-- renderUrl -->
<action path="/subs/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/subs/modSubscription.jsp"/>
@@ -480,7 +480,7 @@
<action path="/subs/fetch"
type="org.bedework.webcommon.subs.GetSubscriptionsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/subs/showSubs.rdo" redirect="true" />
@@ -488,7 +488,7 @@
<action path="/subs/fetchForUpdate"
type="org.bedework.webcommon.subs.FetchSubscriptionAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -497,7 +497,7 @@
<action path="/subs/initAdd"
type="org.bedework.webcommon.subs.InitSubscribeAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="noAccess" path="/subs/showSubs.rdo" redirect="true"/>
@@ -509,7 +509,7 @@
<action path="/subs/subscribe"
type="org.bedework.webcommon.subs.EndSubscribeAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/subs/showSubs.rdo" redirect="true" />
@@ -522,7 +522,7 @@
<action path="/subs/unsubscribe"
type="org.bedework.webcommon.subs.EndSubcribeAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/subs/showSubs.rdo" redirect="true" />
@@ -535,7 +535,7 @@
<!-- renderUrl -->
<action path="/calsuite/showCalSuites"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calsuite/calSuiteList.jsp"/>
@@ -544,7 +544,7 @@
<!-- renderUrl -->
<action path="/calsuite/showAddForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calsuite/addCalSuite.jsp"/>
@@ -553,7 +553,7 @@
<!-- renderUrl -->
<action path="/calsuite/showModForm"
type="org.bedework.webcommon.calsuite.RenderCalSuiteAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calsuite/modCalSuite.jsp"/>
@@ -561,7 +561,7 @@
<action path="/calsuite/fetchForUpdate"
type="org.bedework.webcommon.calsuite.FetchCalSuiteAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/calsuite/showModForm.rdo" redirect="true" />
@@ -569,7 +569,7 @@
<action path="/calsuite/addCalSuite"
type="org.bedework.webcommon.calsuite.AddCalSuiteAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notAdded" path="/calsuite/showCalSuites.rdo" redirect="true" />
@@ -579,7 +579,7 @@
<action path="/calsuite/update"
type="org.bedework.webcommon.calsuite.UpdateCalSuiteAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/calsuite/showCalSuites.rdo" redirect="true"/>
@@ -589,7 +589,7 @@
<action path="/calsuite/setAccess"
type="org.bedework.webcommon.access.AccessAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/calsuite/showModForm.rdo" redirect="true" />
@@ -601,7 +601,7 @@
<!-- renderUrl -->
<action path="/calsuite/showModPrefsForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/calsuite/modPrefs.jsp"/>
@@ -609,7 +609,7 @@
<action path="/calsuite/fetchPrefsForUpdate"
type="org.bedework.webcommon.pref.FetchPrefsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -618,7 +618,7 @@
<action path="/calsuite/updatePrefs"
type="org.bedework.webcommon.pref.UpdatePrefsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/admin/showMain.rdo" redirect="true" />
@@ -633,7 +633,7 @@
<!-- renderUrl -->
<action path="/view/showViews"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/view/viewList.jsp"/>
@@ -642,7 +642,7 @@
<!-- renderUrl -->
<action path="/view/showModForm"
type="org.bedework.webcommon.views.RenderViewAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="retry" path="/docs/view/viewList.jsp"/>
@@ -652,7 +652,7 @@
<!-- renderUrl -->
<action path="/view/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/view/deleteConfirm.jsp" />
@@ -660,7 +660,7 @@
<action path="/view/fetchForUpdate"
type="org.bedework.webcommon.views.SetViewNameAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="delete" path="/view/showDeleteConfirm.rdo" redirect="true" />
@@ -670,7 +670,7 @@
<action path="/view/update"
type="org.bedework.webcommon.views.UpdateViewAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="retry" path="/view/showModForm.rdo" redirect="true" />
@@ -679,7 +679,7 @@
<action path="/view/addView"
type="org.bedework.webcommon.views.AddViewAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notAdded" path="/view/showViews.rdo" redirect="true" />
@@ -688,7 +688,7 @@
<action path="/view/removeView"
type="org.bedework.webcommon.views.DeleteViewAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/view/showViews.rdo" redirect="true" />
@@ -703,7 +703,7 @@
<!-- renderUrl -->
<action path="/syspars/show"
type="org.bedework.webcommon.system.RenderSysparsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/system/modSyspars.jsp"/>
@@ -712,7 +712,7 @@
<!-- renderUrl -->
<action path="/syspars/fetch"
type="org.bedework.webcommon.system.RenderSysparsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/syspars/show.rdo" redirect="true" />
@@ -721,7 +721,7 @@
<!-- on update, pass back through fetch action to refresh -->
<action path="/syspars/update"
type="org.bedework.webcommon.system.UpdateSysparsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="badRequest" path="/syspars/show.rdo" redirect="true" />
@@ -736,7 +736,7 @@
<!-- renderUrl -->
<action path="/timezones/showUpload"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/timezones/upload.jsp"/>
@@ -744,7 +744,7 @@
<action path="/timezones/initUpload"
type="org.bedework.webcommon.timezones.InitUploadTimezonesAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/timezones/showUpload.rdo" redirect="true" />
@@ -752,7 +752,7 @@
<action path="/timezones/upload"
type="org.bedework.webcommon.timezones.UploadTimezonesAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="failed" path="/admin/showMain.rdo" redirect="true"/>
@@ -761,7 +761,7 @@
<action path="/timezones/fix"
type="org.bedework.webcommon.timezones.FixTimezonesAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="failed" path="/admin/showMain.rdo" redirect="true"/>
@@ -775,7 +775,7 @@
<!-- renderUrl -->
<action path="/contact/showContact"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/contact/displayContact.jsp"/>
@@ -784,7 +784,7 @@
<!-- renderUrl -->
<action path="/contact/showReferenced"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/contact/referenced.jsp"/>
@@ -793,7 +793,7 @@
<!-- renderUrl -->
<action path="/contact/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/contact/modContact.jsp"/>
@@ -802,7 +802,7 @@
<!-- renderUrl -->
<action path="/contact/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/contact/contactList.jsp"/>
@@ -811,7 +811,7 @@
<!-- renderUrl -->
<action path="/contact/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/contact/deleteConfirm.jsp" />
@@ -819,7 +819,7 @@
<action path="/contact/initAdd"
type="org.bedework.webcommon.contact.InitAddContactAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/contact/showModForm.rdo" redirect="true" />
@@ -827,7 +827,7 @@
<action path="/contact/initUpdate"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/contact/showUpdateList.rdo" redirect="true" />
@@ -839,7 +839,7 @@
<forward name="inUse" path="/contact/showReferenced.rdo" redirect="true" />-->
<action path="/contact/delete"
type="org.bedework.webcommon.contact.DeleteContactAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="inUse" path="/contact/showUpdateList.rdo" redirect="true" />
@@ -850,7 +850,7 @@
<action path="/contact/fetchForDisplay"
type="org.bedework.webcommon.contact.FetchContactAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -859,7 +859,7 @@
<action path="/contact/fetchForUpdate"
type="org.bedework.webcommon.contact.FetchContactAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -868,7 +868,7 @@
<action path="/contact/update"
type="org.bedework.webcommon.contact.UpdateContactAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/contact/showModForm.rdo" redirect="true" />
@@ -885,7 +885,7 @@
<!-- renderUrl -->
<action path="/location/showLocation"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/location/displayLocation.jsp"/>
@@ -894,7 +894,7 @@
<!-- renderUrl -->
<action path="/location/showReferenced"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/location/referenced.jsp"/>
@@ -903,7 +903,7 @@
<!-- renderUrl -->
<action path="/location/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/location/modLocation.jsp"/>
@@ -912,7 +912,7 @@
<!-- renderUrl -->
<action path="/location/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/location/locationList.jsp"/>
@@ -921,7 +921,7 @@
<!-- renderUrl -->
<action path="/location/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/location/deleteConfirm.jsp" />
@@ -929,7 +929,7 @@
<action path="/location/initAdd"
type="org.bedework.webcommon.location.InitAddLocationAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/location/showModForm.rdo" redirect="true" />
@@ -937,7 +937,7 @@
<action path="/location/initUpdate"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/location/showUpdateList.rdo" redirect="true" />
@@ -949,7 +949,7 @@
<forward name="inUse" path="/location/showReferenced.rdo" redirect="true" /> -->
<action path="/location/delete"
type="org.bedework.webcommon.location.DeleteLocationAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="noAccess" path="/location/showUpdateList.rdo" redirect="true" />
@@ -961,7 +961,7 @@
<action path="/location/fetchForDisplay"
type="org.bedework.webcommon.location.FetchLocationAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -970,7 +970,7 @@
<action path="/location/fetchForUpdate"
type="org.bedework.webcommon.location.FetchLocationAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -979,7 +979,7 @@
<action path="/location/update"
type="org.bedework.webcommon.location.UpdateLocationAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/location/showUpdateList.rdo" redirect="true" />
@@ -995,7 +995,7 @@
<!-- renderUrl -->
<action path="/category/showReferenced"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/category/referenced.jsp"/>
@@ -1004,7 +1004,7 @@
<!-- renderUrl -->
<action path="/category/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/category/modCategory.jsp"/>
@@ -1013,7 +1013,7 @@
<!-- renderUrl -->
<action path="/category/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/category/categoryList.jsp"/>
@@ -1022,7 +1022,7 @@
<!-- renderUrl -->
<action path="/category/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/category/deleteConfirm.jsp" />
@@ -1030,7 +1030,7 @@
<action path="/category/initAdd"
type="org.bedework.webcommon.category.InitAddCategoryAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/category/showModForm.rdo" redirect="true" />
@@ -1038,7 +1038,7 @@
<action path="/category/initUpdate"
type="org.bedework.webcommon.NoopAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/category/showUpdateList.rdo" redirect="true" />
@@ -1046,7 +1046,7 @@
<action path="/category/delete"
type="org.bedework.webcommon.category.DeleteCategoryAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="inUse" path="/category/showReferenced.rdo" redirect="true" />
@@ -1057,7 +1057,7 @@
<action path="/category/fetchForUpdate"
type="org.bedework.webcommon.category.FetchCategoryAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -1066,7 +1066,7 @@
<action path="/category/update"
type="org.bedework.webcommon.category.UpdateCategoryAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/category/showUpdateList.rdo" redirect="true" />
@@ -1082,7 +1082,7 @@
<!-- renderUrl -->
<action path="/authuser/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/authuser/modAuthUser.jsp"/>
@@ -1091,7 +1091,7 @@
<!-- renderUrl -->
<action path="/authuser/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/authuser/authUserList.jsp"/>
@@ -1099,7 +1099,7 @@
<action path="/authuser/initUpdate"
type="org.bedework.webcommon.authuser.GetAuthUsersAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/authuser/showUpdateList.rdo" redirect="true" />
@@ -1107,7 +1107,7 @@
<action path="/authuser/fetchForUpdate"
type="org.bedework.webcommon.authuser.FetchAuthAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/authuser/showUpdateList.rdo" redirect="true" />
@@ -1116,7 +1116,7 @@
<action path="/authuser/update"
type="org.bedework.webcommon.authuser.UpdateAuthAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/authuser/showUpdateList.rdo" redirect="true" />
@@ -1131,7 +1131,7 @@
<!-- renderUrl -->
<action path="/prefs/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/prefs/modPrefs.jsp"/>
@@ -1139,7 +1139,7 @@
<action path="/prefs/fetchForUpdate"
type="org.bedework.webcommon.pref.FetchPrefsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -1148,7 +1148,7 @@
<action path="/prefs/update"
type="org.bedework.webcommon.pref.UpdatePrefsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/admin/showMain.rdo" redirect="true" />
@@ -1163,7 +1163,7 @@
<!-- renderUrl -->
<action path="/admingroup/showChooseGroup"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/admingroup/chooseAdminGroup.jsp" />
@@ -1173,7 +1173,7 @@
<!-- renderUrl -->
<action path="/admingroup/showModForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/admingroup/modAdminGroup.jsp"/>
@@ -1182,7 +1182,7 @@
<!-- renderUrl -->
<action path="/admingroup/showModMembersForm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/admingroup/modAdminGroupMembers.jsp"/>
@@ -1191,7 +1191,7 @@
<!-- renderUrl -->
<action path="/admingroup/showUpdateList"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/admingroup/adminGroupList.jsp"/>
@@ -1200,7 +1200,7 @@
<!-- renderUrl -->
<action path="/admingroup/showDeleteConfirm"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/admingroup/deleteAdminGroupConfirm.jsp" />
@@ -1208,7 +1208,7 @@
<action path="/admingroup/initAdd"
type="org.bedework.webcommon.admingroup.InitAddAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/admingroup/showModForm.rdo" redirect="true" />
@@ -1216,7 +1216,7 @@
<action path="/admingroup/initUpdate"
type="org.bedework.webcommon.admingroup.InitUpdateAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/admingroup/showUpdateList.rdo" redirect="true" />
@@ -1224,7 +1224,7 @@
<action path="/admingroup/delete"
type="org.bedework.webcommon.admingroup.DeleteAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="inUse" path="/admingroup/showReferenced.rdo" redirect="true" />
@@ -1235,7 +1235,7 @@
<action path="/admingroup/fetchForUpdate"
type="org.bedework.webcommon.admingroup.FetchAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showUpdateList.rdo" redirect="true" />
@@ -1244,7 +1244,7 @@
<action path="/admingroup/fetchForUpdateMembers"
type="org.bedework.webcommon.admingroup.FetchAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
@@ -1253,7 +1253,7 @@
<action path="/admingroup/update"
type="org.bedework.webcommon.admingroup.UpdateAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/admingroup/showUpdateList.rdo" redirect="true" />
@@ -1264,7 +1264,7 @@
<action path="/admingroup/updateMembers"
type="org.bedework.webcommon.admingroup.UpdateAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="cancelled" path="/admingroup/showUpdateList.rdo" redirect="true" />
@@ -1275,7 +1275,7 @@
<action path="/admingroup/switch"
type="org.bedework.webcommon.admingroup.SwitchAGAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/admingroup/showChooseGroup.rdo" redirect="true" />
@@ -1288,7 +1288,7 @@
<!-- renderUrl -->
<action path="/search/showResult"
type="org.bedework.webcommon.search.RenderSearchResultAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/search/list.jsp" />
@@ -1296,7 +1296,7 @@
<action path="/search/search"
type="org.bedework.webcommon.search.Search"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="noAction" path="/showMain.rdo" redirect="true" />
@@ -1305,7 +1305,7 @@
<action path="/search/next"
type="org.bedework.webcommon.search.SearchResultParams"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/search/showResult.rdo" redirect="true" />
@@ -1318,7 +1318,7 @@
<!-- renderUrl -->
<action path="/stats/show"
type="org.bedework.webcommon.RenderAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="success" path="/docs/system/showSysStats.jsp" />
@@ -1326,7 +1326,7 @@
<action path="/stats/update"
type="org.bedework.webcommon.misc.StatisticsAction"
- name="peForm"
+ name="calForm"
scope="session"
validate="false">
<forward name="continue" path="/stats/show.rdo" redirect="true" />
Modified: trunk/webadmin/war/docs/admingroup/adminGroupList.jsp
===================================================================
--- trunk/webadmin/war/docs/admingroup/adminGroupList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/admingroup/adminGroupList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -8,13 +8,13 @@
String rpitemp;
%>
<groups>
- <showMembers><bean:write name="peForm" property="showAgMembers"/></showMembers>
- <logic:iterate id="adminGroup" name="peForm" property="adminGroups" >
+ <showMembers><bean:write name="calForm" property="showAgMembers"/></showMembers>
+ <logic:iterate id="adminGroup" name="calForm" property="adminGroups" >
<group>
<name><bean:write name="adminGroup" property="account" /></name>
<desc><bean:write name="adminGroup" property="description" /></desc>
<members>
- <logic:equal name="peForm" property="showAgMembers" value="true">
+ <logic:equal name="calForm" property="showAgMembers" value="true">
<logic:present name="adminGroup" property="groupMembers" >
<logic:iterate name="adminGroup" property="groupMembers"
id="member" >
Modified: trunk/webadmin/war/docs/admingroup/chooseAdminGroup.jsp
===================================================================
--- trunk/webadmin/war/docs/admingroup/chooseAdminGroup.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/admingroup/chooseAdminGroup.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -10,7 +10,7 @@
%>
<groups>
- <logic:iterate id="adminGroup" name="peForm" property="userAdminGroups" >
+ <logic:iterate id="adminGroup" name="calForm" property="userAdminGroups" >
<group>
<name><bean:write name="adminGroup" property="account" /></name>
<desc><bean:write name="adminGroup" property="description" /></desc>
Modified: trunk/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp
===================================================================
--- trunk/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -2,13 +2,13 @@
<%@ taglib uri='struts-logic' prefix='logic' %>
<group>
- <name><bean:write name="peForm" property="updAdminGroup.account" /></name>
- <desc><bean:write name="peForm" property="updAdminGroup.description" /></desc>
- <groupOwner><bean:write name="peForm" property="adminGroupGroupOwner" /></groupOwner>
- <eventsOwner><bean:write name="peForm" property="adminGroupEventOwner" /></eventsOwner>
+ <name><bean:write name="calForm" property="updAdminGroup.account" /></name>
+ <desc><bean:write name="calForm" property="updAdminGroup.description" /></desc>
+ <groupOwner><bean:write name="calForm" property="adminGroupGroupOwner" /></groupOwner>
+ <eventsOwner><bean:write name="calForm" property="adminGroupEventOwner" /></eventsOwner>
<members>
- <logic:present name="peForm" property="updAdminGroup.groupMembers" >
- <logic:iterate name="peForm" property="updAdminGroup.groupMembers"
+ <logic:present name="calForm" property="updAdminGroup.groupMembers" >
+ <logic:iterate name="calForm" property="updAdminGroup.groupMembers"
id="member" >
<member>
<account><bean:write name="member" property="account" /></account>
Modified: trunk/webadmin/war/docs/admingroup/modAdminGroup.jsp
===================================================================
--- trunk/webadmin/war/docs/admingroup/modAdminGroup.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/admingroup/modAdminGroup.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,26 +7,26 @@
<%@include file="/docs/header.jsp"%>
<page>modAdminGroup</page>
-<creating><bean:write name="peForm" property="addingAdmingroup"/></creating>
+<creating><bean:write name="calForm" property="addingAdmingroup"/></creating>
<formElements>
<genurl:form action="admingroup/update" >
<name>
- <logic:equal name="peForm" property="addingAdmingroup" value="true" >
- <html:text name="peForm" property="updAdminGroup.account" />
+ <logic:equal name="calForm" property="addingAdmingroup" value="true" >
+ <html:text name="calForm" property="updAdminGroup.account" />
</logic:equal>
- <logic:notEqual name="peForm" property="addingAdmingroup" value="true" >
- <bean:write name="peForm" property="updAdminGroup.account" />
+ <logic:notEqual name="calForm" property="addingAdmingroup" value="true" >
+ <bean:write name="calForm" property="updAdminGroup.account" />
</logic:notEqual>
</name>
<desc>
<html:textarea property="updAdminGroup.description" cols="50" rows="3"></html:textarea>
</desc>
<groupOwner>
- <html:text name="peForm" property="adminGroupGroupOwner" />
+ <html:text name="calForm" property="adminGroupGroupOwner" />
</groupOwner>
<eventsOwner>
- <html:text name="peForm" property="adminGroupEventOwner" />
+ <html:text name="calForm" property="adminGroupEventOwner" />
</eventsOwner>
<!-- these are the values that may be submitted to the update action -->
Modified: trunk/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp
===================================================================
--- trunk/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,10 +9,10 @@
<page>modAdminGroupMembers</page>
<adminGroup>
- <name><bean:write name="peForm" property="updAdminGroup.account" /></name>
+ <name><bean:write name="calForm" property="updAdminGroup.account" /></name>
<members>
- <logic:present name="peForm" property="updAdminGroup.groupMembers" >
- <logic:iterate name="peForm" property="updAdminGroup.groupMembers"
+ <logic:present name="calForm" property="updAdminGroup.groupMembers" >
+ <logic:iterate name="calForm" property="updAdminGroup.groupMembers"
id="member" >
<member>
<account><bean:write name="member" property="account" /></account>
Modified: trunk/webadmin/war/docs/authuser/authUserList.jsp
===================================================================
--- trunk/webadmin/war/docs/authuser/authUserList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/authuser/authUserList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -12,7 +12,7 @@
%>
<authUsers>
- <logic:iterate id="authUser" name="peForm" property="authUsers" >
+ <logic:iterate id="authUser" name="calForm" property="authUsers" >
<authUser>
<account><bean:write name="authUser" property="user.account" /></account>
<superUser><bean:write name="authUser" property="superUser"/></superUser>
Modified: trunk/webadmin/war/docs/authuser/modAuthUser.jsp
===================================================================
--- trunk/webadmin/war/docs/authuser/modAuthUser.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/authuser/modAuthUser.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -12,7 +12,7 @@
take advantage of Struts' form processing features -->
<formElements>
<genurl:form action="authuser/update" >
- <account><bean:write name="peForm" property="editAuthUser.user.account" /></account>
+ <account><bean:write name="calForm" property="editAuthUser.user.account" /></account>
<alerts><html:checkbox property="editAuthUserAlerts" /></alerts>
<publicEvents><html:checkbox property="editAuthUserPublicEvents" /></publicEvents>
<superUser><html:checkbox property="editAuthUserSuperUser" /></superUser>
Modified: trunk/webadmin/war/docs/calendar/displayCalendarCommon.jsp
===================================================================
--- trunk/webadmin/war/docs/calendar/displayCalendarCommon.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calendar/displayCalendarCommon.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -2,7 +2,7 @@
<%@ taglib uri='struts-logic' prefix='logic' %>
<%@ taglib uri='bedework' prefix='bw' %>
-<bean:define id="curcal" name="peForm" property="calendar"/>
+<bean:define id="curcal" name="calForm" property="calendar"/>
<currentCalendar>
<id><bean:write name="curcal" property="id" /></id>
<bw:emitText name="curcal" property="name" />
@@ -12,7 +12,7 @@
<bw:emitText name="curcal" property="description" tagName="desc" />
<calendarCollection><bean:write name="curcal" property="calendarCollection" /></calendarCollection>
<bw:emitText name="curcal" property="mailListId" />
- <logic:notEqual name="peForm" property="addingCalendar" value="true">
+ <logic:notEqual name="calForm" property="addingCalendar" value="true">
<bw:emitCurrentPrivs name="curcal" property="currentAccess" />
<bw:emitAcl name="curcal" property="currentAccess" />
</logic:notEqual>
Modified: trunk/webadmin/war/docs/calendar/emitCalendar.jsp
===================================================================
--- trunk/webadmin/war/docs/calendar/emitCalendar.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calendar/emitCalendar.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -16,7 +16,7 @@
<open><bean:write name="calendar" property="open" /></open>
<logic:equal name="calendar" property="open" value="true">
- <bw:getChildren id="children" name="calendar" form="peForm" />
+ <bw:getChildren id="children" name="calendar" form="calForm" />
<logic:iterate name="children" id="cal">
<bean:define id="calendar" name="cal" toScope="session" />
<jsp:include page="/docs/calendar/emitCalendar.jsp" />
Modified: trunk/webadmin/war/docs/calendar/emitCalendars.jsp
===================================================================
--- trunk/webadmin/war/docs/calendar/emitCalendars.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calendar/emitCalendars.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -2,7 +2,7 @@
<%@ taglib uri='struts-logic' prefix='logic' %>
<calendars>
- <bean:define id="calendar" name="peForm" property="calendars"
+ <bean:define id="calendar" name="calForm" property="calendars"
toScope="session" />
<%@include file="/docs/calendar/emitCalendar.jsp"%>
</calendars>
Modified: trunk/webadmin/war/docs/calendar/modCalendar.jsp
===================================================================
--- trunk/webadmin/war/docs/calendar/modCalendar.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calendar/modCalendar.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -4,7 +4,7 @@
<%@include file="/docs/header.jsp"%>
<page>modCalendar</page>
-<creating><bean:write name="peForm" property="addingCalendar"/></creating>
+<creating><bean:write name="calForm" property="addingCalendar"/></creating>
<%@include file="/docs/calendar/displayCalendarCommon.jsp"%>
Modified: trunk/webadmin/war/docs/calsuite/calSuiteList.jsp
===================================================================
--- trunk/webadmin/war/docs/calsuite/calSuiteList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calsuite/calSuiteList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,7 +9,7 @@
<page>calSuiteList</page>
<calSuites>
- <logic:iterate id="calSuite" name="peForm" property="calSuites" >
+ <logic:iterate id="calSuite" name="calForm" property="calSuites" >
<%@include file="/docs/calsuite/emitCalSuite.jsp"%>
</logic:iterate>
</calSuites>
Modified: trunk/webadmin/war/docs/calsuite/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/calsuite/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calsuite/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,7 +9,7 @@
<page>deleteCalSuiteConfirm</page>
-<bean:define id="calSuite" name="peForm" property="calSuite" >
+<bean:define id="calSuite" name="calForm" property="calSuite" >
<calSuite>
<bw:emitText name="calSuite" property="name" />
<bw:emitText name="calSuite" property="group.name" tagName"group" />
Modified: trunk/webadmin/war/docs/calsuite/displayCalSuite.jsp
===================================================================
--- trunk/webadmin/war/docs/calsuite/displayCalSuite.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calsuite/displayCalSuite.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,7 +9,7 @@
<page>displayCalSuite</page>
<calSuites>
- <logic:iterate id="calSuite" name="peForm" property="calSuite" >
+ <logic:iterate id="calSuite" name="calForm" property="calSuite" >
<%@include file="/docs/calsuite/emitcalSuite.jsp"%>
</logic:iterate>
</calSuites>
Modified: trunk/webadmin/war/docs/calsuite/modCalSuite.jsp
===================================================================
--- trunk/webadmin/war/docs/calsuite/modCalSuite.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calsuite/modCalSuite.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -8,7 +8,7 @@
<page>modCalSuite</page>
-<bean:define id="calSuite" name="peForm" property="calSuite"/>
+<bean:define id="calSuite" name="calForm" property="calSuite"/>
<%@include file="/docs/calsuite/emitCalSuite.jsp"%>
<%@include file="/docs/footer.jsp"%>
Modified: trunk/webadmin/war/docs/calsuite/modPrefs.jsp
===================================================================
--- trunk/webadmin/war/docs/calsuite/modPrefs.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/calsuite/modPrefs.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,7 +7,7 @@
<%@include file="/docs/header.jsp"%>
<page>calSuitePrefs</page>
-<bean:define id="userPrefs" name="peForm" property="userPreferences"/>
+<bean:define id="userPrefs" name="calForm" property="userPreferences"/>
<prefs>
<user><bean:write name="userPrefs" property="owner.account"/></user>
<preferredView><bean:write name="userPrefs" property="preferredView"/></preferredView>
Modified: trunk/webadmin/war/docs/category/categoryList.jsp
===================================================================
--- trunk/webadmin/war/docs/category/categoryList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/category/categoryList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,8 +9,8 @@
<page>categoryList</page>
<categories>
- <logic:present name="peForm" property="editableCategories" >
- <logic:iterate id="category" name="peForm" property="editableCategories" >
+ <logic:present name="calForm" property="editableCategories" >
+ <logic:iterate id="category" name="calForm" property="editableCategories" >
<%@include file="/docs/category/emitCategory.jsp"%>
</logic:iterate>
</logic:present>
Modified: trunk/webadmin/war/docs/category/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/category/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/category/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,8 +9,8 @@
<page>deleteCategoryConfirm</page>
<currentCategory>
- <logic:present name="peForm" property="category">
- <bean:define id="category" name="peForm" property="category"/>
+ <logic:present name="calForm" property="category">
+ <bean:define id="category" name="calForm" property="category"/>
<%@include file="/docs/category/emitCategory.jsp"%>
</logic:present>
</currentCategory>
Modified: trunk/webadmin/war/docs/category/modCategory.jsp
===================================================================
--- trunk/webadmin/war/docs/category/modCategory.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/category/modCategory.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -8,11 +8,11 @@
<page>modCategory</page>
-<creating><bean:write name="peForm" property="addingCategory"/></creating>
+<creating><bean:write name="calForm" property="addingCategory"/></creating>
<currentCategory>
- <logic:present name="peForm" property="category">
- <bean:define id="category" name="peForm" property="category"/>
+ <logic:present name="calForm" property="category">
+ <bean:define id="category" name="calForm" property="category"/>
<%@include file="/docs/category/emitCategory.jsp"%>
</logic:present>
</currentCategory>
Modified: trunk/webadmin/war/docs/category/referenced.jsp
===================================================================
--- trunk/webadmin/war/docs/category/referenced.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/category/referenced.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,8 +9,8 @@
<page>categoryReferenced</page>
<currentCategory>
- <logic:present name="peForm" property="category">
- <bean:define id="category" name="peForm" property="category"/>
+ <logic:present name="calForm" property="category">
+ <bean:define id="category" name="calForm" property="category"/>
<%@include file="/docs/category/emitCategory.jsp"%>
</logic:present>
</currentCategory>
Modified: trunk/webadmin/war/docs/contact/contactList.jsp
===================================================================
--- trunk/webadmin/war/docs/contact/contactList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/contact/contactList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<contacts>
- <logic:iterate id="contact" name="peForm" property="editableContacts" >
+ <logic:iterate id="contact" name="calForm" property="editableContacts" >
<%@include file="/docs/contact/emitContact.jsp"%>
</logic:iterate>
</contacts>
Modified: trunk/webadmin/war/docs/contact/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/contact/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/contact/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -10,14 +10,14 @@
<contact>
<name>
- <bean:write name="peForm" property="contact.name.value" />
+ <bean:write name="calForm" property="contact.name.value" />
</name>
- <phone><bean:write name="peForm" property="contact.phone" /></phone>
- <logic:present name="peForm" property="contact.email">
- <email><bean:write name="peForm" property="contact.email"/></email>
+ <phone><bean:write name="calForm" property="contact.phone" /></phone>
+ <logic:present name="calForm" property="contact.email">
+ <email><bean:write name="calForm" property="contact.email"/></email>
</logic:present>
- <logic:present name="peForm" property="contact.link">
- <link><bean:write name="peForm" property="contact.link" /></link>
+ <logic:present name="calForm" property="contact.link">
+ <link><bean:write name="calForm" property="contact.link" /></link>
</logic:present>
</contact>
Modified: trunk/webadmin/war/docs/contact/displayContact.jsp
===================================================================
--- trunk/webadmin/war/docs/contact/displayContact.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/contact/displayContact.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<contacts>
- <logic:iterate id="contact" name="peForm" property="editableContacts" >
+ <logic:iterate id="contact" name="calForm" property="editableContacts" >
<%@include file="/docs/contact/emitContact.jsp"%>
</logic:iterate>
</contacts>
Modified: trunk/webadmin/war/docs/contact/modContact.jsp
===================================================================
--- trunk/webadmin/war/docs/contact/modContact.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/contact/modContact.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,7 +7,7 @@
<%@include file="/docs/header.jsp"%>
<page>modContact</page>
-<creating><bean:write name="peForm" property="addingContact"/></creating>
+<creating><bean:write name="calForm" property="addingContact"/></creating>
<!-- Mod pages contain only formElements for now; we do this to
take advantage of Struts' form processing features -->
Modified: trunk/webadmin/war/docs/contact/referenced.jsp
===================================================================
--- trunk/webadmin/war/docs/contact/referenced.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/contact/referenced.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<contacts>
- <logic:iterate id="contact" name="peForm" property="editableContacts" >
+ <logic:iterate id="contact" name="calForm" property="editableContacts" >
<%@include file="/docs/contact/emitContact.jsp"%>
</logic:iterate>
</contacts>
Modified: trunk/webadmin/war/docs/error.jsp
===================================================================
--- trunk/webadmin/war/docs/error.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/error.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,18 +9,18 @@
<title>Events Calendar: Logged Out</title>
</head>
<body>
- <logic:notEmpty name="peForm" property="err.msgList">
+ <logic:notEmpty name="calForm" property="err.msgList">
<p>The following errors occurred:</p>
<ul>
- <logic:iterate id="errBean" name="peForm" property="err.msgList">
+ <logic:iterate id="errBean" name="calForm" property="err.msgList">
<li><bean:write name="errBean" property="msg" filter="no" /></li>
</logic:iterate>
</ul>
</logic:notEmpty>
- <logic:notEmpty name="peForm" property="msg.msgList">
+ <logic:notEmpty name="calForm" property="msg.msgList">
<bean:message key="messages.header" />
- <logic:iterate id="msgBean" name="peForm" property="msg.msgList">
+ <logic:iterate id="msgBean" name="calForm" property="msg.msgList">
<li><bean:write name="msgBean" property="msg" filter="no" /></li>
</logic:iterate>
<bean:message key="messages.footer" />
Modified: trunk/webadmin/war/docs/event/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/event/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -10,7 +10,7 @@
<bean:define id="allView" value="true" toScope="request"/>
<bean:define id="eventFormatter"
- name="peForm"
+ name="calForm"
property="curEventFmt"
toScope="request"/>
Modified: trunk/webadmin/war/docs/event/displayEvent.jsp
===================================================================
--- trunk/webadmin/war/docs/event/displayEvent.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/displayEvent.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,17 +7,17 @@
<page>displayEvent</page>
-<bean:define id="loggedInId" name="peForm" property="adminUserId" />
-<logic:equal name="peForm" property="event.creator.account" value="<%=(String)loggedInId%>">
+<bean:define id="loggedInId" name="calForm" property="adminUserId" />
+<logic:equal name="calForm" property="event.creator.account" value="<%=(String)loggedInId%>">
<canEdit>true</canEdit>
</logic:equal>
-<logic:notEqual name="peForm" property="event.creator.account" value="<%=(String)loggedInId%>">
+<logic:notEqual name="calForm" property="event.creator.account" value="<%=(String)loggedInId%>">
<canEdit>false</canEdit>
</logic:notEqual>
<bean:define id="allView" value="true" toScope="request"/>
<bean:define id="eventFormatter"
- name="peForm"
+ name="calForm"
property="curEventFmt"
toScope="request"/>
Modified: trunk/webadmin/war/docs/event/emitEventCommon.jsp
===================================================================
--- trunk/webadmin/war/docs/event/emitEventCommon.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/emitEventCommon.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -101,7 +101,7 @@
<%-- ****************************************************************
the following code should not be produced in the public client
**************************************************************** --%>
- <logic:equal name="peForm" property="guest" value="false">
+ <logic:equal name="calForm" property="guest" value="false">
<bw:emitCurrentPrivs name="eventInfo" property="currentAccess" />
</logic:equal>
</event>
Modified: trunk/webadmin/war/docs/event/emitRecur.jsp
===================================================================
--- trunk/webadmin/war/docs/event/emitRecur.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/emitRecur.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -2,8 +2,8 @@
<%@ taglib uri='struts-logic' prefix='logic' %>
<%@ taglib uri='bedework' prefix='bw' %>
-<logic:present name="peForm" property="rruleComponents">
- <logic:iterate id="rrc" name="peForm" property="rruleComponents">
+<logic:present name="calForm" property="rruleComponents">
+ <logic:iterate id="rrc" name="calForm" property="rruleComponents">
<recurrence>
<bw:emitText name="rrc" property="rule"/>
Modified: trunk/webadmin/war/docs/event/eventList.jsp
===================================================================
--- trunk/webadmin/war/docs/event/eventList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/eventList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<%-- Generate events --%>
<bean:define id="detailView" value="true" toScope="request"/>
<events>
- <logic:iterate id="eventFormatter" name="peForm" property="formattedEvents">
+ <logic:iterate id="eventFormatter" name="calForm" property="formattedEvents">
<%@include file="/docs/event/emitEvent.jsp"%>
</logic:iterate>
</events>
@@ -20,14 +20,14 @@
<formElements>
<genurl:form action="event/fetchForDisplay.do">
<listAllSwitchFalse>
- <html:radio name="peForm" property="listAllEvents"
+ <html:radio name="calForm" property="listAllEvents"
value="false"
- onclick="document.peForm.submit();" />
+ onclick="document.calForm.submit();" />
</listAllSwitchFalse>
<listAllSwitchTrue>
- <html:radio name="peForm" property="listAllEvents"
+ <html:radio name="calForm" property="listAllEvents"
value="true"
- onclick="document.peForm.submit();" />
+ onclick="document.calForm.submit();" />
</listAllSwitchTrue>
</genurl:form>
</formElements>
Modified: trunk/webadmin/war/docs/event/modEvent.jsp
===================================================================
--- trunk/webadmin/war/docs/event/modEvent.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/modEvent.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -8,22 +8,22 @@
<%@include file="/docs/header.jsp"%>
<page>modEvent</page>
-<creating><bean:write name="peForm" property="addingEvent"/></creating>
-<bw:emitText name="peForm" property="hour24" /><%--
+<creating><bean:write name="calForm" property="addingEvent"/></creating>
+<bw:emitText name="calForm" property="hour24" /><%--
Values: true, false - Flag if we are using 24 hour time --%>
<!-- Mod pages contain only formElements for now; we do this to
take advantage of Struts' form processing features -->
<formElements>
<subscriptionId></subscriptionId>
- <calendarId><%--<bean:write name="peForm" property="event.calendar.id"/>--%></calendarId>
- <guid><bean:write name="peForm" property="event.uid"/></guid>
- <recurrenceId><bean:write name="peForm" property="event.recurrenceId"/></recurrenceId>
+ <calendarId><%--<bean:write name="calForm" property="event.calendar.id"/>--%></calendarId>
+ <guid><bean:write name="calForm" property="event.uid"/></guid>
+ <recurrenceId><bean:write name="calForm" property="event.recurrenceId"/></recurrenceId>
<genurl:form action="event/update" >
<title><html:text property="summary" size="40" styleId="iTitle" styleClass="edit"/></title>
<calendar>
- <logic:present name="peForm" property="preferredCalendars">
+ <logic:present name="calForm" property="preferredCalendars">
<preferred>
<html:select property="prefCalendarId">
<html:optionsCollection property="preferredCalendars"
@@ -39,8 +39,8 @@
value="id"/>
</html:select>
</all>
- <logic:present name="peForm" property="event.calendar">
- <bean:define id="calendar" name="peForm" property="event.calendar"/>
+ <logic:present name="calForm" property="event.calendar">
+ <bean:define id="calendar" name="calForm" property="event.calendar"/>
<bw:emitText name="calendar" property="name"/><%--
Value: string - name of the calendar --%>
<bw:emitText name="calendar" property="path"/><%--
@@ -57,7 +57,7 @@
<storeUTC><html:checkbox property="eventStartDate.storeUTC"/></storeUTC>
<floating><html:checkbox property="eventStartDate.floating"/></floating>
<start>
- <rfc3339DateTime><bean:write name="peForm" property="eventStartDate.rfc3339DateTime"/></rfc3339DateTime>
+ <rfc3339DateTime><bean:write name="calForm" property="eventStartDate.rfc3339DateTime"/></rfc3339DateTime>
<month>
<html:select property="eventStartDate.month">
<html:options labelProperty="eventStartDate.monthLabels"
@@ -90,18 +90,18 @@
property="eventStartDate.minuteVals"/>
</html:select>
</minute>
- <logic:notEqual name="peForm" property="hour24" value="true" >
+ <logic:notEqual name="calForm" property="hour24" value="true" >
<ampm>
<html:select property="eventStartDate.ampm">
<html:options property="eventStartDate.ampmLabels"/>
</html:select>
</ampm>
</logic:notEqual>
- <bw:emitText name="peForm" property="eventStartDate.tzid" tagName="tzid"/>
+ <bw:emitText name="calForm" property="eventStartDate.tzid" tagName="tzid"/>
</start>
<end>
- <rfc3339DateTime><bean:write name="peForm" property="eventEndDate.rfc3339DateTime"/></rfc3339DateTime>
- <type><bean:write name="peForm" property="eventEndType"/></type>
+ <rfc3339DateTime><bean:write name="calForm" property="eventEndDate.rfc3339DateTime"/></rfc3339DateTime>
+ <type><bean:write name="calForm" property="eventEndType"/></type>
<dateTime>
<month>
<html:select property="eventEndDate.month">
@@ -136,13 +136,13 @@
</html:select>
</minute>
<ampm>
- <logic:notEqual name="peForm" property="hour24" value="true" >
+ <logic:notEqual name="calForm" property="hour24" value="true" >
<html:select property="eventEndDate.ampm">
<html:options property="eventEndDate.ampmLabels"/>
</html:select>
</logic:notEqual>
</ampm>
- <bw:emitText name="peForm" property="eventEndDate.tzid" tagName="tzid"/>
+ <bw:emitText name="calForm" property="eventEndDate.tzid" tagName="tzid"/>
</dateTime>
<duration>
<days><html:text property="eventDuration.daysStr" size="2" /></days>
@@ -152,12 +152,12 @@
</duration>
</end>
<desc><html:textarea property="description" rows="8" cols="55" styleId="iDesc" styleClass="edit"></html:textarea></desc>
- <descLength><bean:write name="peForm" property="maxDescriptionLength" /></descLength>
- <status><bean:write name="peForm" property="event.status"/></status>
+ <descLength><bean:write name="calForm" property="maxDescriptionLength" /></descLength>
+ <status><bean:write name="calForm" property="event.status"/></status>
<cost><html:text property="event.cost" size="30" styleId="iCost" styleClass="edit"/></cost>
<link><html:text property="event.link" size="30" styleId="iLink" styleClass="edit"/></link>
<location>
- <logic:present name="peForm" property="preferredLocations">
+ <logic:present name="calForm" property="preferredLocations">
<preferred>
<html:select property="prefLocationId">
<html:optionsCollection property="preferredLocations"
@@ -185,9 +185,9 @@
</location>
<categories>
- <logic:present name="peForm" property="preferredCategories">
+ <logic:present name="calForm" property="preferredCategories">
<preferred>
- <logic:iterate id="category" name="peForm" property="preferredCategories">
+ <logic:iterate id="category" name="calForm" property="preferredCategories">
<category>
<keyword><bean:write name="category" property="word.value"/></keyword>
</category>
@@ -195,15 +195,15 @@
</preferred>
</logic:present>
<all>
- <logic:iterate id="category" name="peForm" property="categories">
+ <logic:iterate id="category" name="calForm" property="categories">
<category>
<keyword><bean:write name="category" property="word.value"/></keyword>
</category>
</logic:iterate>
</all>
<current>
- <logic:present name="peForm" property="event.categories">
- <logic:iterate id="category" name="peForm" property="event.categories">
+ <logic:present name="calForm" property="event.categories">
+ <logic:iterate id="category" name="calForm" property="event.categories">
<category>
<keyword><bean:write name="category" property="word.value"/></keyword>
</category>
@@ -212,12 +212,12 @@
</current>
</categories>
- <bw:emitText name="peForm" property="event.trashable" tagName="trashable"/>
- <bw:emitText name="peForm" property="event.recurringEntity" tagName="recurringEntity"/>
+ <bw:emitText name="calForm" property="event.trashable" tagName="trashable"/>
+ <bw:emitText name="calForm" property="event.recurringEntity" tagName="recurringEntity"/>
<jsp:include page="/docs/event/emitRecur.jsp"/>
<contact>
- <logic:present name="peForm" property="preferredContacts">
+ <logic:present name="calForm" property="preferredContacts">
<preferred>
<html:select property="prefContactId">
<html:optionsCollection property="preferredContacts"
@@ -251,7 +251,7 @@
</formElements>
<timezones>
- <logic:iterate id="tz" name="peForm" property="timeZoneNames">
+ <logic:iterate id="tz" name="calForm" property="timeZoneNames">
<timezone>
<name><bean:write name="tz" property="name" filter="true"/></name>
<id><bean:write name="tz" property="id" filter="true"/></id>
@@ -259,7 +259,7 @@
</logic:iterate>
</timezones>
-<bean:define id="calInfo" name="peForm" property="today.calInfo" />
+<bean:define id="calInfo" name="calForm" property="today.calInfo" />
<shortdaynames>
<logic:iterate id="shortDayName" name="calInfo" property="shortDayNamesAdjusted">
<val><bean:write name="shortDayName"/></val>
@@ -279,7 +279,7 @@
<logic:iterate id="monthVal" name="calInfo" property="monthVals">
<val><bean:write name="monthVal"/></val>
</logic:iterate>
- <start><bean:write name="peForm" property="viewStartDate.month"/></start>
+ <start><bean:write name="calForm" property="viewStartDate.month"/></start>
</monthvalues>
<%@include file="/docs/footer.jsp"%>
Modified: trunk/webadmin/war/docs/event/rdates.jsp
===================================================================
--- trunk/webadmin/war/docs/event/rdates.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/rdates.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -14,10 +14,10 @@
%>
<rdates>
- <bw:emitText name="peForm" property="eventStartDate.tzid" tagName="tzid"/>
- <bw:emitText name="peForm" property="eventStartDate.dateOnly" tagName="allday"/>
- <logic:present name="peForm" property="formattedRdates">
- <logic:iterate id="date" name="peForm" property="formattedRdates">
+ <bw:emitText name="calForm" property="eventStartDate.tzid" tagName="tzid"/>
+ <bw:emitText name="calForm" property="eventStartDate.dateOnly" tagName="allday"/>
+ <logic:present name="calForm" property="formattedRdates">
+ <logic:iterate id="date" name="calForm" property="formattedRdates">
<rdate>
<%@ include file="/docs/event/emitDate.jsp" %>
</rdate>
@@ -26,10 +26,10 @@
</rdates>
<exdates>
- <bw:emitText name="peForm" property="eventStartDate.tzid" tagName="tzid"/>
- <bw:emitText name="peForm" property="eventStartDate.dateOnly" tagName="allday"/>
- <logic:present name="peForm" property="formattedExdates">
- <logic:iterate id="date" name="peForm" property="formattedExdates">
+ <bw:emitText name="calForm" property="eventStartDate.tzid" tagName="tzid"/>
+ <bw:emitText name="calForm" property="eventStartDate.dateOnly" tagName="allday"/>
+ <logic:present name="calForm" property="formattedExdates">
+ <logic:iterate id="date" name="calForm" property="formattedExdates">
<rdate>
<%@ include file="/docs/event/emitDate.jsp" %>
</rdate>
@@ -38,7 +38,7 @@
</exdates>
<timezones>
- <logic:iterate id="tz" name="peForm" property="eventStartDate.timeZoneNames">
+ <logic:iterate id="tz" name="calForm" property="eventStartDate.timeZoneNames">
<timezone>
<name><bean:write name="tz" property="name" filter="true"/></name>
<id><bean:write name="tz" property="id" filter="true"/></id>
Modified: trunk/webadmin/war/docs/event/selectCalForEvent.jsp
===================================================================
--- trunk/webadmin/war/docs/event/selectCalForEvent.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/event/selectCalForEvent.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -17,7 +17,7 @@
*/ %>
<calendars>
- <bean:define id="calendar" name="peForm" property="calendars"
+ <bean:define id="calendar" name="calForm" property="calendars"
toScope="session" />
<%@include file="/docs/calendar/emitCalendar.jsp"%>
</calendars>
Modified: trunk/webadmin/war/docs/header.jsp
===================================================================
--- trunk/webadmin/war/docs/header.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/header.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -10,14 +10,14 @@
%>
<bedeworkadmin>
- <bean:define id="bwconfig" name="peForm" property="config" toScope="session" />
+ <bean:define id="bwconfig" name="calForm" property="config" toScope="session" />
<now><%-- The actual date right "now" - this may not be the same as currentdate --%>
- <bw:emitText name="peForm" property="defaultTzid" />
+ <bw:emitText name="calForm" property="defaultTzid" />
</now>
<%-- messages --%>
- <logic:iterate id="msg" name="peForm" property="msg.msgList">
+ <logic:iterate id="msg" name="calForm" property="msg.msgList">
<message>
<id><bean:write name="msg" property="msgId" /></id>
<logic:iterate id="param" name="msg" property="params" >
@@ -27,7 +27,7 @@
</logic:iterate>
<%-- errors --%>
- <logic:iterate id="errBean" name="peForm" property="err.msgList">
+ <logic:iterate id="errBean" name="calForm" property="err.msgList">
<error>
<id><bean:write name="errBean" property="msgId" /></id>
<logic:iterate id="param" name="errBean" property="params" >
@@ -37,13 +37,13 @@
</logic:iterate>
<%-- global variables --%>
- <approot><bean:write name="peForm" property="presentationState.appRoot"/></approot><%--
+ <approot><bean:write name="calForm" property="presentationState.appRoot"/></approot><%--
Value: URI - the location of web resources used by the code to find the
XSLT files. This element is defined prior to build in
../../../../clones/democal.properties
as pubevents.app.root and personal.app.root. Note that references to
html web resources such as images are set in the xsl stylesheets. --%>
- <urlprefix><bean:write name="peForm" property="urlPrefix"/></urlprefix><%--
+ <urlprefix><bean:write name="calForm" property="urlPrefix"/></urlprefix><%--
Value: URI - this is prefix of the calendar application.
e.g. http://localhost:8080/cal
Use this value to prefix calls to the application actions in your XSLT.
@@ -208,46 +208,46 @@
</admingroup>
</urlPrefixes>
- <logic:present name="peForm" property="currentCalSuite" >
+ <logic:present name="calForm" property="currentCalSuite" >
<currentCalSuite>
- <bw:emitText name="peForm" property="currentCalSuite.name" tagName="name" />
- <bw:emitCurrentPrivs name="peForm" property="currentCalSuite.currentAccess" tagName="currentAccess"/>
+ <bw:emitText name="calForm" property="currentCalSuite.name" tagName="name" />
+ <bw:emitCurrentPrivs name="calForm" property="currentCalSuite.currentAccess" tagName="currentAccess"/>
</currentCalSuite>
</logic:present>
<userInfo>
<%-- user type --%>
- <bw:emitText name="peForm" property="curUserContentAdminUser"
+ <bw:emitText name="calForm" property="curUserContentAdminUser"
tagName="contentAdminUser" />
- <bw:emitText name="peForm" property="curUserSuperUser"
+ <bw:emitText name="calForm" property="curUserSuperUser"
tagName="superUser" />
- <logic:equal name="peForm" property="userMaintOK" value="true" >
+ <logic:equal name="calForm" property="userMaintOK" value="true" >
<userMaintOK>true</userMaintOK>
</logic:equal>
- <logic:notEqual name="peForm" property="userMaintOK" value="true" >
+ <logic:notEqual name="calForm" property="userMaintOK" value="true" >
<userMaintOK>false</userMaintOK>
</logic:notEqual>
- <logic:equal name="peForm" property="adminGroupMaintOK" value="true">
+ <logic:equal name="calForm" property="adminGroupMaintOK" value="true">
<adminGroupMaintOk>true</adminGroupMaintOk>
</logic:equal>
- <logic:notEqual name="peForm" property="adminGroupMaintOK" value="true">
+ <logic:notEqual name="calForm" property="adminGroupMaintOK" value="true">
<adminGroupMaintOk>false</adminGroupMaintOk>
</logic:notEqual>
<%-- user and group --%>
- <bw:emitText name="peForm" property="adminUserId" tagName="user"/>
- <logic:present name="peForm" property="adminGroup" >
- <bw:emitText name="peForm" property="adminGroup.account" tagName="group"/>
+ <bw:emitText name="calForm" property="adminUserId" tagName="user"/>
+ <logic:present name="calForm" property="adminGroup" >
+ <bw:emitText name="calForm" property="adminGroup.account" tagName="group"/>
</logic:present>
</userInfo>
<%-- System parameters and directory info--%>
<syspars>
- <logic:present name="peForm" property="dirInfo" >
- <bean:define id="dir" name="peForm" property="dirInfo" />
+ <logic:present name="calForm" property="dirInfo" >
+ <bean:define id="dir" name="calForm" property="dirInfo" />
<bw:emitText name="dir" property="userPrincipalRoot" />
<bw:emitText name="dir" property="groupPrincipalRoot" />
<bw:emitText name="dir" property="ticketPrincipalRoot" />
@@ -257,7 +257,7 @@
</logic:present>
</syspars>
- <logic:iterate id="appvar" name="peForm" property="appVars">
+ <logic:iterate id="appvar" name="calForm" property="appVars">
<appvar><%--
Application variables can be set arbitrarily by the stylesheet designer.
Use an "appvar" by adding setappvar=key(value) to the query string of
Modified: trunk/webadmin/war/docs/location/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/location/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/location/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -10,15 +10,15 @@
<location>
<address>
- <bean:write name="peForm" property="location.address.value" />
+ <bean:write name="calForm" property="location.address.value" />
</address>
<subaddress>
- <logic:present name="peForm" property="location.subaddress">
- <bean:write name="peForm" property="location.subaddress.value" />
+ <logic:present name="calForm" property="location.subaddress">
+ <bean:write name="calForm" property="location.subaddress.value" />
</logic:present>
</subaddress>
- <logic:present name="peForm" property="location.link">
- <link><bean:write name="peForm" property="location.link" /></link>
+ <logic:present name="calForm" property="location.link">
+ <link><bean:write name="calForm" property="location.link" /></link>
</logic:present>
</location>
Modified: trunk/webadmin/war/docs/location/displayLocation.jsp
===================================================================
--- trunk/webadmin/war/docs/location/displayLocation.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/location/displayLocation.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<locations>
- <logic:iterate id="location" name="peForm" property="editableLocations" >
+ <logic:iterate id="location" name="calForm" property="editableLocations" >
<%@include file="/docs/location/emitLocation.jsp"%>
</logic:iterate>
</locations>
Modified: trunk/webadmin/war/docs/location/locationList.jsp
===================================================================
--- trunk/webadmin/war/docs/location/locationList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/location/locationList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<locations>
- <logic:iterate id="location" name="peForm" property="editableLocations" >
+ <logic:iterate id="location" name="calForm" property="editableLocations" >
<%@include file="/docs/location/emitLocation.jsp"%>
</logic:iterate>
</locations>
Modified: trunk/webadmin/war/docs/location/modLocation.jsp
===================================================================
--- trunk/webadmin/war/docs/location/modLocation.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/location/modLocation.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,7 +7,7 @@
<%@include file="/docs/header.jsp"%>
<page>modLocation</page>
-<creating><bean:write name="peForm" property="addingLocation"/></creating>
+<creating><bean:write name="calForm" property="addingLocation"/></creating>
<!-- Mod pages contain only formElements for now; we do this to
take advantage of Struts' form processing features -->
Modified: trunk/webadmin/war/docs/location/referenced.jsp
===================================================================
--- trunk/webadmin/war/docs/location/referenced.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/location/referenced.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -11,7 +11,7 @@
<% /* used by included file */
String rpitemp; %>
<locations>
- <logic:iterate id="location" name="peForm" property="editableLocations" >
+ <logic:iterate id="location" name="calForm" property="editableLocations" >
<%@include file="/docs/location/emitLocation.jsp"%>
</logic:iterate>
</locations>
Modified: trunk/webadmin/war/docs/main.jsp
===================================================================
--- trunk/webadmin/war/docs/main.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/main.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -12,7 +12,7 @@
These can be manipulated in the xslt if desired.
<formElements>
<genurl:form action="event/fetchForDisplay.do">
- <html:text name="peForm" property="eventId" size="6" />
+ <html:text name="calForm" property="eventId" size="6" />
<html:submit value="go"/>
</genurl:form>
</formElements>
Modified: trunk/webadmin/war/docs/prefs/modPrefs.jsp
===================================================================
--- trunk/webadmin/war/docs/prefs/modPrefs.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/prefs/modPrefs.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -7,7 +7,7 @@
<%@include file="/docs/header.jsp"%>
<page>modPrefs</page>
-<bean:define id="userPrefs" name="peForm" property="userPreferences"/>
+<bean:define id="userPrefs" name="calForm" property="userPreferences"/>
<prefs>
<user><bean:write name="userPrefs" property="owner.account"/></user>
<preferredView><bean:write name="userPrefs" property="preferredView"/></preferredView>
Modified: trunk/webadmin/war/docs/search/list.jsp
===================================================================
--- trunk/webadmin/war/docs/search/list.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/search/list.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -14,14 +14,14 @@
<page>searchResult</page>
<searchResults>
- <bw:emitText name="peForm" property="query"/>
- <bw:emitText name="peForm" property="resultSize" />
- <bw:emitText name="peForm" property="curPage"/>
- <bw:emitText name="peForm" property="numPages"/>
- <bw:emitText name="peForm" property="searchLimits"/>
+ <bw:emitText name="calForm" property="query"/>
+ <bw:emitText name="calForm" property="resultSize" />
+ <bw:emitText name="calForm" property="curPage"/>
+ <bw:emitText name="calForm" property="numPages"/>
+ <bw:emitText name="calForm" property="searchLimits"/>
- <logic:present name="peForm" property="searchResult" >
- <logic:iterate id="sre" name="peForm" property="searchResult" >
+ <logic:present name="calForm" property="searchResult" >
+ <logic:iterate id="sre" name="calForm" property="searchResult" >
<searchResult>
<bw:emitText name="sre" property="score" />
<logic:present name="sre" property="event" >
Modified: trunk/webadmin/war/docs/subs/modSubscription.jsp
===================================================================
--- trunk/webadmin/war/docs/subs/modSubscription.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/subs/modSubscription.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -4,19 +4,19 @@
<%@include file="/docs/header.jsp"%>
<page>modSubscription</page>
-<creating><bean:write name="peForm" property="addingSubscription"/></creating>
+<creating><bean:write name="calForm" property="addingSubscription"/></creating>
<subscriptions>
<subscription>
- <name><bean:write name="peForm" property="subscription.name" /></name>
- <uri><bean:write name="peForm" property="subscription.uri" /></uri>
- <affectsFreeBusy><bean:write name="peForm" property="subscription.affectsFreeBusy" /></affectsFreeBusy>
- <display><bean:write name="peForm" property="subscription.display" /></display>
- <style><bean:write name="peForm" property="subscription.style" /></style>
- <internal><bean:write name="peForm" property="subscription.internalSubscription" /></internal>
- <emailNotifications><bean:write name="peForm" property="subscription.emailNotifications" /></emailNotifications>
- <calendarDeleted><bean:write name="peForm" property="subscription.calendarDeleted" /></calendarDeleted>
- <unremoveable><bean:write name="peForm" property="subscription.unremoveable" /></unremoveable>
+ <name><bean:write name="calForm" property="subscription.name" /></name>
+ <uri><bean:write name="calForm" property="subscription.uri" /></uri>
+ <affectsFreeBusy><bean:write name="calForm" property="subscription.affectsFreeBusy" /></affectsFreeBusy>
+ <display><bean:write name="calForm" property="subscription.display" /></display>
+ <style><bean:write name="calForm" property="subscription.style" /></style>
+ <internal><bean:write name="calForm" property="subscription.internalSubscription" /></internal>
+ <emailNotifications><bean:write name="calForm" property="subscription.emailNotifications" /></emailNotifications>
+ <calendarDeleted><bean:write name="calForm" property="subscription.calendarDeleted" /></calendarDeleted>
+ <unremoveable><bean:write name="calForm" property="subscription.unremoveable" /></unremoveable>
</subscription>
<subscribe>
Modified: trunk/webadmin/war/docs/subs/subscriptions.jsp
===================================================================
--- trunk/webadmin/war/docs/subs/subscriptions.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/subs/subscriptions.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -6,7 +6,7 @@
<page>subscriptions</page>
<subscriptions>
- <logic:iterate name="peForm" property="subscriptions" id="subscription">
+ <logic:iterate name="calForm" property="subscriptions" id="subscription">
<subscription>
<name><bean:write name="subscription" property="name" /></name>
<uri><bean:write name="subscription" property="uri" /></uri>
Modified: trunk/webadmin/war/docs/system/modSyspars.jsp
===================================================================
--- trunk/webadmin/war/docs/system/modSyspars.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/system/modSyspars.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -8,7 +8,7 @@
<%@include file="/docs/header.jsp"%>
<page>modSyspars</page>
-<bean:define id="systemParams" name="peForm" property="syspars"/>
+<bean:define id="systemParams" name="calForm" property="syspars"/>
<system>
<bw:emitText name="systemParams" property="name"/>
<bw:emitText name="systemParams" property="tzid"/>
@@ -50,7 +50,7 @@
</system>
<timezones>
- <logic:iterate id="tz" name="peForm" property="timeZoneNames">
+ <logic:iterate id="tz" name="calForm" property="timeZoneNames">
<timezone>
<name><bean:write name="tz" property="name" filter="true"/></name>
<id><bean:write name="tz" property="id" filter="true"/></id>
@@ -59,7 +59,7 @@
</timezones>
<views>
- <logic:iterate name="peForm" property="views" id="view">
+ <logic:iterate name="calForm" property="views" id="view">
<view>
<name><bean:write name="view" property="name" /></name>
</view>
Modified: trunk/webadmin/war/docs/system/showSysStats.jsp
===================================================================
--- trunk/webadmin/war/docs/system/showSysStats.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/system/showSysStats.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -9,7 +9,7 @@
<page>showSysStats</page>
<sysStats>
- <logic:iterate id="sysStat" name="peForm" property="sysStats">
+ <logic:iterate id="sysStat" name="calForm" property="sysStats">
<logic:equal name="sysStat" property="statKind" value="0">
<header><bean:write name="sysStat" property="statLabel" /></header>
</logic:equal>
Modified: trunk/webadmin/war/docs/view/deleteConfirm.jsp
===================================================================
--- trunk/webadmin/war/docs/view/deleteConfirm.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/view/deleteConfirm.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -6,7 +6,7 @@
<page>deleteViewConfirm</page>
<views>
- <bean:define name="peForm" property="view" id="view"/>
+ <bean:define name="calForm" property="view" id="view"/>
<view>
<name><bean:write name="view" property="name" /></name>
<subscriptions>
Modified: trunk/webadmin/war/docs/view/modView.jsp
===================================================================
--- trunk/webadmin/war/docs/view/modView.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/view/modView.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -4,10 +4,10 @@
<%@include file="/docs/header.jsp"%>
<page>modView</page>
-<creating><bean:write name="peForm" property="addingView"/></creating>
+<creating><bean:write name="calForm" property="addingView"/></creating>
<views>
- <bean:define name="peForm" property="view" id="view"/>
+ <bean:define name="calForm" property="view" id="view"/>
<view>
<name><bean:write name="view" property="name" /></name>
<subscriptions>
@@ -21,7 +21,7 @@
</views>
<subscriptions>
- <logic:iterate name="peForm" property="subscriptions" id="subscription">
+ <logic:iterate name="calForm" property="subscriptions" id="subscription">
<subscription>
<name><bean:write name="subscription" property="name" /></name>
<uri><bean:write name="subscription" property="uri" /></uri>
Modified: trunk/webadmin/war/docs/view/viewList.jsp
===================================================================
--- trunk/webadmin/war/docs/view/viewList.jsp 2007-09-05 19:53:11 UTC (rev 504)
+++ trunk/webadmin/war/docs/view/viewList.jsp 2007-09-06 01:51:17 UTC (rev 505)
@@ -6,7 +6,7 @@
<page>views</page>
<!--fix-->
<views>
- <logic:iterate name="peForm" property="views" id="view">
+ <logic:iterate name="calForm" property="views" id="view">
<view>
<name><bean:write name="view" property="name" /></name>
<subscriptions>
More information about the Bedework-commit
mailing list