[Bedework-commit] r629 - in trunk/calendar3:
deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default
deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default
deployment/webuser/uportal2/resources/demoskins/default/default
deployment/webuser/webapp/resources/demoskins/default/default
webclient/war/docs
svnadmin at bedework.org
svnadmin at bedework.org
Thu Jun 22 14:29:23 EDT 2006
Author: johnsa
Date: 2006-06-22 14:29:22 -0400 (Thu, 22 Jun 2006)
New Revision: 629
Modified:
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl
trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/webclient/war/docs/header.jsp
Log:
stylesheet changes - partially working uportal skins
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2006-06-22 18:29:22 UTC (rev 629)
@@ -70,7 +70,11 @@
<xsl:variable name="resourcesRoot" select="/bedework/approot"/>
<!-- Properly encoded prefixes to the application actions; use these to build
- urls; allows the application to be used without cookies or within a portal. -->
+ urls; allows the application to be used without cookies or within a portal.
+ These urls are rewritten in header.jsp and simply passed through for use
+ here. Every url includes a query string (either ?b=de or a real query
+ string) so that all links constructed in this stylesheet may begin the
+ query string with an ampersand. -->
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
<xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/>
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2006-06-22 18:29:22 UTC (rev 629)
@@ -70,7 +70,11 @@
<xsl:variable name="resourcesRoot" select="/bedework/approot"/>
<!-- Properly encoded prefixes to the application actions; use these to build
- urls; allows the application to be used without cookies or within a portal. -->
+ urls; allows the application to be used without cookies or within a portal.
+ These urls are rewritten in header.jsp and simply passed through for use
+ here. Every url includes a query string (either ?b=de or a real query
+ string) so that all links constructed in this stylesheet may begin the
+ query string with an ampersand. -->
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
<xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/>
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl 2006-06-22 18:29:22 UTC (rev 629)
@@ -81,7 +81,11 @@
<xsl:variable name="resourcesRoot" select="/bedework/approot"/>
<!-- Properly encoded prefixes to the application actions; use these to build
- urls; allows the application to be used without cookies or within a portal. -->
+ urls; allows the application to be used without cookies or within a portal.
+ These urls are rewritten in header.jsp and simply passed through for use
+ here. Every url includes a query string (either ?b=de or a real query
+ string) so that all links constructed in this stylesheet may begin the
+ query string with an ampersand. -->
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
<xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/>
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
Modified: trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl 2006-06-22 18:29:22 UTC (rev 629)
@@ -60,17 +60,21 @@
<xsl:variable name="appRoot" select="/bedework/approot"/>
<!-- Properly encoded prefixes to the application actions; use these to build
- urls; allows the application to be used without cookies or within a portal. -->
+ urls; allows the application to be used without cookies or within a portal.
+ These urls are rewritten in header.jsp and simply passed through for use
+ here. Every url includes a query string (either ?b=de or a real query
+ string) so that all links constructed in this stylesheet may begin the
+ query string with an ampersand. -->
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
<xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/>
<xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/setViewPeriod"/>
<xsl:variable name="eventView" select="/bedework/urlPrefixes/eventView"/>
<xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/>
<xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/>
- <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/>
- <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/>
- <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/>
- <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/>
+ <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable>
+ <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/>
+ <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/>
+ <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/>
<xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/>
<xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/>
<xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/>
@@ -85,28 +89,28 @@
<xsl:variable name="setAlarm" select="/bedework/urlPrefixes/setAlarm"/>
<xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/>
<xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/>
- <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/>
- <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/>
+ <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/>
+ <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/>
<!-- calendars -->
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
- <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used -->
- <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used -->
- <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used -->
- <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/>
- <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/>
- <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used -->
- <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used -->
- <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/>
+ <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used -->
+ <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used -->
+ <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used -->
+ <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/>
+ <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/>
+ <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used -->
+ <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used -->
+ <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/>
<!-- subscriptions -->
- <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/>
- <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/>
- <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/>
- <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/>
- <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/>
- <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/>
+ <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/>
+ <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/>
+ <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/>
+ <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/>
+ <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/>
+ <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/>
<!-- 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"/>
+ <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/>
+ <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/>
<!-- URL of the web application - includes web context
<xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> -->
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-22 18:29:22 UTC (rev 629)
@@ -60,17 +60,21 @@
<xsl:variable name="appRoot" select="/bedework/approot"/>
<!-- Properly encoded prefixes to the application actions; use these to build
- urls; allows the application to be used without cookies or within a portal. -->
+ urls; allows the application to be used without cookies or within a portal.
+ These urls are rewritten in header.jsp and simply passed through for use
+ here. Every url includes a query string (either ?b=de or a real query
+ string) so that all links constructed in this stylesheet may begin the
+ query string with an ampersand. -->
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
<xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/>
<xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/setViewPeriod"/>
<xsl:variable name="eventView" select="/bedework/urlPrefixes/eventView"/>
<xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/>
<xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/>
- <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/>
- <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/>
- <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/>
- <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/>
+ <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable>
+ <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/>
+ <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/>
+ <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/>
<xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/>
<xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/>
<xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/>
@@ -85,28 +89,28 @@
<xsl:variable name="setAlarm" select="/bedework/urlPrefixes/setAlarm"/>
<xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/>
<xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/>
- <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/>
- <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/>
+ <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/>
+ <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/>
<!-- calendars -->
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
- <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used -->
- <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used -->
- <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used -->
- <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/>
- <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/>
- <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used -->
- <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used -->
- <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/>
+ <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used -->
+ <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used -->
+ <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used -->
+ <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/>
+ <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/>
+ <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used -->
+ <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used -->
+ <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/>
<!-- subscriptions -->
- <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/>
- <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/>
- <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/>
- <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/>
- <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/>
- <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/>
+ <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/>
+ <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/>
+ <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/>
+ <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/>
+ <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/>
+ <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/>
<!-- 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"/>
+ <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/>
+ <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/>
<!-- URL of the web application - includes web context
<xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> -->
Modified: trunk/calendar3/webclient/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/header.jsp 2006-06-22 16:23:21 UTC (rev 628)
+++ trunk/calendar3/webclient/war/docs/header.jsp 2006-06-22 18:29:22 UTC (rev 629)
@@ -140,34 +140,34 @@
<editEvent><genurl:rewrite action="editEvent.do?b=de"/></editEvent>
<delEvent><genurl:rewrite action="delEvent.do?b=de"/></delEvent>
<event>
- <setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess>
- <addEventRefComplete><genurl:link page="/event/addEventRefComplete.do?b=de"/></addEventRefComplete>
- <selectCalForEvent><genurl:link page="/event/selectCalForEvent.do?b=de"/></selectCalForEvent>
+ <setAccess><genurl:rewrite action="/event/setAccess.do?b=de"/></setAccess>
+ <addEventRefComplete><genurl:rewrite action="/event/addEventRefComplete.do?b=de"/></addEventRefComplete>
+ <selectCalForEvent><genurl:rewrite action="/event/selectCalForEvent.do?b=de"/></selectCalForEvent>
</event>
<freeBusy>
- <fetch><genurl:link page="/freeBusy/getFreeBusy.do?b=de"/></fetch>
- <setAccess><genurl:link page="/freeBusy/setAccess.do?b=de"/></setAccess>
+ <fetch><genurl:rewrite action="/freeBusy/getFreeBusy.do?b=de"/></fetch>
+ <setAccess><genurl:rewrite action="/freeBusy/setAccess.do?b=de"/></setAccess>
</freeBusy>
<calendar>
- <fetch><genurl:link page="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep -->
- <fetchDescriptions><genurl:link page="/calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep -->
- <initAdd><genurl:link page="/calendar/initAdd.do?b=de"/></initAdd><!-- keep -->
- <delete><genurl:link page="/calendar/delete.do?b=de"/></delete>
- <fetchForDisplay><genurl:link page="/calendar/fetchForDisplay.do?b=de"/></fetchForDisplay>
- <fetchForUpdate><genurl:link page="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep -->
- <update><genurl:link page="/calendar/update.do?b=de"/></update><!-- keep -->
- <setAccess><genurl:link page="/calendar/setAccess.do?b=de"/></setAccess>
+ <fetch><genurl:rewrite action="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep -->
+ <fetchDescriptions><genurl:rewrite action="/calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep -->
+ <initAdd><genurl:rewrite action="/calendar/initAdd.do?b=de"/></initAdd><!-- keep -->
+ <delete><genurl:rewrite action="/calendar/delete.do?b=de"/></delete>
+ <fetchForDisplay><genurl:rewrite action="/calendar/fetchForDisplay.do?b=de"/></fetchForDisplay>
+ <fetchForUpdate><genurl:rewrite action="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep -->
+ <update><genurl:rewrite action="/calendar/update.do?b=de"/></update><!-- keep -->
+ <setAccess><genurl:rewrite action="/calendar/setAccess.do?b=de"/></setAccess>
</calendar>
<subscriptions> <!-- only those listed are used here (no need to clean up) -->
- <fetch><genurl:link page="/subs/fetch.do?b=de"/></fetch>
- <fetchForUpdate><genurl:link page="/subs/fetchForUpdate.do?b=de"/></fetchForUpdate>
- <addSubByUri><genurl:link page="/subs/showAddByUriForm.rdo?b=de"/></addSubByUri>
- <subscribeByUri><genurl:link page="/subs/subscribeByUri.do?b=de"/></subscribeByUri>
- <initAdd><genurl:link page="/subs/initAdd.do?b=de"/></initAdd>
- <subscribe><genurl:link page="/subs/subscribe.do?b=de"/></subscribe>
+ <fetch><genurl:rewrite action="subs/fetch.do?b=de"/></fetch>
+ <fetchForUpdate><genurl:rewrite action="subs/fetchForUpdate.do?b=de"/></fetchForUpdate>
+ <addSubByUri><genurl:rewrite action="subs/showAddByUriForm.rdo?b=de"/></addSubByUri>
+ <subscribeByUri><genurl:rewrite action="subs/subscribeByUri.do?b=de"/></subscribeByUri>
+ <initAdd><genurl:rewrite action="subs/initAdd.do?b=de"/></initAdd>
+ <subscribe><genurl:rewrite action="subs/subscribe.do?b=de"/></subscribe>
</subscriptions>
<manageLocations><genurl:rewrite action="manageLocations.do?b=de"/></manageLocations>
@@ -176,8 +176,8 @@
<delLocation><genurl:rewrite action="delLocation.do?b=de"/></delLocation>
<prefs>
- <fetchForUpdate><genurl:link page="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate>
- <update><genurl:link page="/prefs/update.do?b=de"/></update>
+ <fetchForUpdate><genurl:rewrite action="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate>
+ <update><genurl:rewrite action="/prefs/update.do?b=de"/></update>
</prefs>
<initEventAlarm><genurl:rewrite action="initEventAlarm.do?b=de"/></initEventAlarm>
More information about the Bedework-commit
mailing list