Changeset 1554

Show
Ignore:
Timestamp:
09/05/07 23:00:04
Author:
douglm
Message:

Another step on the way to refactoring the ui.

Change the root element for the admin client to bedework instead of bedeworkadmin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/portlet/resources/default/default/default.xsl

    r1195 r1554  
    5151  <xsl:variable name="resourcesRoot" select="'https://mywebserver.edu/myresourcesdir'"/> 
    5252    --> 
    53   <xsl:variable name="resourcesRoot" select="/bedeworkadmin/approot"/> 
     53  <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    5454 
    5555  <!-- URL of the XSL template directory --> 
     
    6060       reference it explicitly.  It is not used in this stylesheet, however, 
    6161       and can be safely removed if you so choose. --> 
    62   <xsl:variable name="appRoot" select="/bedeworkadmin/approot"/> 
     62  <xsl:variable name="appRoot" select="/bedework/approot"/> 
    6363 
    6464  <!-- Properly encoded prefixes to the application actions; use these to build 
     
    6666       we will probably change the way we create these before long (e.g. build them 
    6767       dynamically in the xslt). --> 
    68   <xsl:variable name="setup" select="/bedeworkadmin/urlPrefixes/setup/a/@href"/> 
    69   <xsl:variable name="logout" select="/bedeworkadmin/urlPrefixes/logout/a/@href"/> 
    70   <xsl:variable name="search" select="/bedeworkadmin/urlPrefixes/search/search/a/@href"/> 
    71   <xsl:variable name="search-next" select="/bedeworkadmin/urlPrefixes/search/next/a/@href"/> 
     68  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup/a/@href"/> 
     69  <xsl:variable name="logout" select="/bedework/urlPrefixes/logout/a/@href"/> 
     70  <xsl:variable name="search" select="/bedework/urlPrefixes/search/search/a/@href"/> 
     71  <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next/a/@href"/> 
    7272  <!-- events --> 
    73   <xsl:variable name="event-showEvent" select="/bedeworkadmin/urlPrefixes/event/showEvent/a/@href"/> 
    74   <xsl:variable name="event-showModForm" select="/bedeworkadmin/urlPrefixes/event/showModForm/a/@href"/> 
    75   <xsl:variable name="event-showUpdateList" select="/bedeworkadmin/urlPrefixes/event/showUpdateList/a/@href"/> 
    76   <xsl:variable name="event-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/event/showDeleteConfirm/a/@href"/> 
    77   <xsl:variable name="event-initAddEvent" select="/bedeworkadmin/urlPrefixes/event/initAddEvent/a/@href"/> 
    78   <xsl:variable name="event-initUpdateEvent" select="/bedeworkadmin/urlPrefixes/event/initUpdateEvent/a/@href"/> 
    79   <xsl:variable name="event-delete" select="/bedeworkadmin/urlPrefixes/event/delete/a/@href"/> 
    80   <xsl:variable name="event-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/event/fetchForDisplay/a/@href"/> 
    81   <xsl:variable name="event-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/event/fetchForUpdate/a/@href"/> 
    82   <xsl:variable name="event-update" select="/bedeworkadmin/urlPrefixes/event/update/a/@href"/> 
    83   <xsl:variable name="event-selectCalForEvent" select="/bedeworkadmin/urlPrefixes/event/selectCalForEvent/a/@href"/> 
    84   <xsl:variable name="event-initUpload" select="/bedeworkadmin/urlPrefixes/event/initUpload/a/@href"/> 
    85   <xsl:variable name="event-upload" select="/bedeworkadmin/urlPrefixes/event/upload/a/@href"/> 
     73  <xsl:variable name="event-showEvent" select="/bedework/urlPrefixes/event/showEvent/a/@href"/> 
     74  <xsl:variable name="event-showModForm" select="/bedework/urlPrefixes/event/showModForm/a/@href"/> 
     75  <xsl:variable name="event-showUpdateList" select="/bedework/urlPrefixes/event/showUpdateList/a/@href"/> 
     76  <xsl:variable name="event-showDeleteConfirm" select="/bedework/urlPrefixes/event/showDeleteConfirm/a/@href"/> 
     77  <xsl:variable name="event-initAddEvent" select="/bedework/urlPrefixes/event/initAddEvent/a/@href"/> 
     78  <xsl:variable name="event-initUpdateEvent" select="/bedework/urlPrefixes/event/initUpdateEvent/a/@href"/> 
     79  <xsl:variable name="event-delete" select="/bedework/urlPrefixes/event/delete/a/@href"/> 
     80  <xsl:variable name="event-fetchForDisplay" select="/bedework/urlPrefixes/event/fetchForDisplay/a/@href"/> 
     81  <xsl:variable name="event-fetchForUpdate" select="/bedework/urlPrefixes/event/fetchForUpdate/a/@href"/> 
     82  <xsl:variable name="event-update" select="/bedework/urlPrefixes/event/update/a/@href"/> 
     83  <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
     84  <xsl:variable name="event-initUpload" select="/bedework/urlPrefixes/event/initUpload/a/@href"/> 
     85  <xsl:variable name="event-upload" select="/bedework/urlPrefixes/event/upload/a/@href"/> 
    8686  <!-- contacts --> 
    87   <xsl:variable name="contact-showContact" select="/bedeworkadmin/urlPrefixes/contact/showContact/a/@href"/> 
    88   <xsl:variable name="contact-showReferenced" select="/bedeworkadmin/urlPrefixes/contact/showReferenced/a/@href"/> 
    89   <xsl:variable name="contact-showModForm" select="/bedeworkadmin/urlPrefixes/contact/showModForm/a/@href"/> 
    90   <xsl:variable name="contact-showUpdateList" select="/bedeworkadmin/urlPrefixes/contact/showUpdateList/a/@href"/> 
    91   <xsl:variable name="contact-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/contact/showDeleteConfirm/a/@href"/> 
    92   <xsl:variable name="contact-initAdd" select="/bedeworkadmin/urlPrefixes/contact/initAdd/a/@href"/> 
    93   <xsl:variable name="contact-initUpdate" select="/bedeworkadmin/urlPrefixes/contact/initUpdate/a/@href"/> 
    94   <xsl:variable name="contact-delete" select="/bedeworkadmin/urlPrefixes/contact/delete/a/@href"/> 
    95   <xsl:variable name="contact-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/contact/fetchForDisplay/a/@href"/> 
    96   <xsl:variable name="contact-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/contact/fetchForUpdate/a/@href"/> 
    97   <xsl:variable name="contact-update" select="/bedeworkadmin/urlPrefixes/contact/update/a/@href"/> 
     87  <xsl:variable name="contact-showContact" select="/bedework/urlPrefixes/contact/showContact/a/@href"/> 
     88  <xsl:variable name="contact-showReferenced" select="/bedework/urlPrefixes/contact/showReferenced/a/@href"/> 
     89  <xsl:variable name="contact-showModForm" select="/bedework/urlPrefixes/contact/showModForm/a/@href"/> 
     90  <xsl:variable name="contact-showUpdateList" select="/bedework/urlPrefixes/contact/showUpdateList/a/@href"/> 
     91  <xsl:variable name="contact-showDeleteConfirm" select="/bedework/urlPrefixes/contact/showDeleteConfirm/a/@href"/> 
     92  <xsl:variable name="contact-initAdd" select="/bedework/urlPrefixes/contact/initAdd/a/@href"/> 
     93  <xsl:variable name="contact-initUpdate" select="/bedework/urlPrefixes/contact/initUpdate/a/@href"/> 
     94  <xsl:variable name="contact-delete" select="/bedework/urlPrefixes/contact/delete/a/@href"/> 
     95  <xsl:variable name="contact-fetchForDisplay" select="/bedework/urlPrefixes/contact/fetchForDisplay/a/@href"/> 
     96  <xsl:variable name="contact-fetchForUpdate" select="/bedework/urlPrefixes/contact/fetchForUpdate/a/@href"/> 
     97  <xsl:variable name="contact-update" select="/bedework/urlPrefixes/contact/update/a/@href"/> 
    9898  <!-- locations --> 
    99   <xsl:variable name="location-showLocation" select="/bedeworkadmin/urlPrefixes/location/showLocation/a/@href"/> 
    100   <xsl:variable name="location-showReferenced" select="/bedeworkadmin/urlPrefixes/location/showReferenced/a/@href"/> 
    101   <xsl:variable name="location-showModForm" select="/bedeworkadmin/urlPrefixes/location/showModForm/a/@href"/> 
    102   <xsl:variable name="location-showUpdateList" select="/bedeworkadmin/urlPrefixes/location/showUpdateList/a/@href"/> 
    103   <xsl:variable name="location-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/location/showDeleteConfirm/a/@href"/> 
    104   <xsl:variable name="location-initAdd" select="/bedeworkadmin/urlPrefixes/location/initAdd/a/@href"/> 
    105   <xsl:variable name="location-initUpdate" select="/bedeworkadmin/urlPrefixes/location/initUpdate/a/@href"/> 
    106   <xsl:variable name="location-delete" select="/bedeworkadmin/urlPrefixes/location/delete/a/@href"/> 
    107   <xsl:variable name="location-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/location/fetchForDisplay/a/@href"/> 
    108   <xsl:variable name="location-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/location/fetchForUpdate/a/@href"/> 
    109   <xsl:variable name="location-update" select="/bedeworkadmin/urlPrefixes/location/update/a/@href"/> 
     99  <xsl:variable name="location-showLocation" select="/bedework/urlPrefixes/location/showLocation/a/@href"/> 
     100  <xsl:variable name="location-showReferenced" select="/bedework/urlPrefixes/location/showReferenced/a/@href"/> 
     101  <xsl:variable name="location-showModForm" select="/bedework/urlPrefixes/location/showModForm/a/@href"/> 
     102  <xsl:variable name="location-showUpdateList" select="/bedework/urlPrefixes/location/showUpdateList/a/@href"/> 
     103  <xsl:variable name="location-showDeleteConfirm" select="/bedework/urlPrefixes/location/showDeleteConfirm/a/@href"/> 
     104  <xsl:variable name="location-initAdd" select="/bedework/urlPrefixes/location/initAdd/a/@href"/> 
     105  <xsl:variable name="location-initUpdate" select="/bedework/urlPrefixes/location/initUpdate/a/@href"/> 
     106  <xsl:variable name="location-delete" select="/bedework/urlPrefixes/location/delete/a/@href"/> 
     107  <xsl:variable name="location-fetchForDisplay" select="/bedework/urlPrefixes/location/fetchForDisplay/a/@href"/> 
     108  <xsl:variable name="location-fetchForUpdate" select="/bedework/urlPrefixes/location/fetchForUpdate/a/@href"/> 
     109  <xsl:variable name="location-update" select="/bedework/urlPrefixes/location/update/a/@href"/> 
    110110  <!-- categories --> 
    111   <xsl:variable name="category-showReferenced" select="/bedeworkadmin/urlPrefixes/category/showReferenced/a/@href"/> 
    112   <xsl:variable name="category-showModForm" select="/bedeworkadmin/urlPrefixes/category/showModForm/a/@href"/> 
    113   <xsl:variable name="category-showUpdateList" select="/bedeworkadmin/urlPrefixes/category/showUpdateList/a/@href"/> 
    114   <xsl:variable name="category-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/category/showDeleteConfirm/a/@href"/> 
    115   <xsl:variable name="category-initAdd" select="/bedeworkadmin/urlPrefixes/category/initAdd/a/@href"/> 
    116   <xsl:variable name="category-initUpdate" select="/bedeworkadmin/urlPrefixes/category/initUpdate/a/@href"/> 
    117   <xsl:variable name="category-delete" select="/bedeworkadmin/urlPrefixes/category/delete/a/@href"/> 
    118   <xsl:variable name="category-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/category/fetchForUpdate/a/@href"/> 
    119   <xsl:variable name="category-update" select="/bedeworkadmin/urlPrefixes/category/update/a/@href"/> 
     111  <xsl:variable name="category-showReferenced" select="/bedework/urlPrefixes/category/showReferenced/a/@href"/> 
     112  <xsl:variable name="category-showModForm" select="/bedework/urlPrefixes/category/showModForm/a/@href"/> 
     113  <xsl:variable name="category-showUpdateList" select="/bedework/urlPrefixes/category/showUpdateList/a/@href"/> 
     114  <xsl:variable name="category-showDeleteConfirm" select="/bedework/urlPrefixes/category/showDeleteConfirm/a/@href"/> 
     115  <xsl:variable name="category-initAdd" select="/bedework/urlPrefixes/category/initAdd/a/@href"/> 
     116  <xsl:variable name="category-initUpdate" select="/bedework/urlPrefixes/category/initUpdate/a/@href"/> 
     117  <xsl:variable name="category-delete" select="/bedework/urlPrefixes/category/delete/a/@href"/> 
     118  <xsl:variable name="category-fetchForUpdate" select="/bedework/urlPrefixes/category/fetchForUpdate/a/@href"/> 
     119  <xsl:variable name="category-update" select="/bedework/urlPrefixes/category/update/a/@href"/> 
    120120  <!-- calendars --> 
    121   <xsl:variable name="calendar-fetch" select="/bedeworkadmin/urlPrefixes/calendar/fetch/a/@href"/> 
    122   <xsl:variable name="calendar-fetchDescriptions" select="/bedeworkadmin/urlPrefixes/calendar/fetchDescriptions/a/@href"/> 
    123   <xsl:variable name="calendar-initAdd" select="/bedeworkadmin/urlPrefixes/calendar/initAdd/a/@href"/> 
    124   <xsl:variable name="calendar-delete" select="/bedeworkadmin/urlPrefixes/calendar/delete/a/@href"/> 
    125   <xsl:variable name="calendar-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
    126   <xsl:variable name="calendar-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/calendar/fetchForUpdate/a/@href"/> 
    127   <xsl:variable name="calendar-update" select="/bedeworkadmin/urlPrefixes/calendar/update/a/@href"/> 
    128   <xsl:variable name="calendar-setAccess" select="/bedeworkadmin/urlPrefixes/calendar/setAccess/a/@href"/> 
     121  <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/> 
     122  <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/> 
     123  <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/> 
     124  <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
     125  <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
     126  <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/> 
     127  <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/> 
     128  <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
    129129  <!-- subscriptions --> 
    130   <xsl:variable name="subscriptions-fetch" select="/bedeworkadmin/urlPrefixes/subscriptions/fetch/a/@href"/> 
    131   <xsl:variable name="subscriptions-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    132   <xsl:variable name="subscriptions-initAdd" select="/bedeworkadmin/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    133   <xsl:variable name="subscriptions-subscribe" select="/bedeworkadmin/urlPrefixes/subscriptions/subscribe/a/@href"/> 
     130  <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
     131  <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
     132  <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
     133  <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
    134134  <!-- views --> 
    135   <xsl:variable name="view-fetch" select="/bedeworkadmin/urlPrefixes/view/fetch/a/@href"/> 
    136   <xsl:variable name="view-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/view/fetchForUpdate/a/@href"/> 
    137   <xsl:variable name="view-addView" select="/bedeworkadmin/urlPrefixes/view/addView/a/@href"/> 
    138   <xsl:variable name="view-update" select="/bedeworkadmin/urlPrefixes/view/update/a/@href"/> 
    139   <xsl:variable name="view-remove" select="/bedeworkadmin/urlPrefixes/view/remove/a/@href"/> 
     135  <xsl:variable name="view-fetch" select="/bedework/urlPrefixes/view/fetch/a/@href"/> 
     136  <xsl:variable name="view-fetchForUpdate" select="/bedework/urlPrefixes/view/fetchForUpdate/a/@href"/> 
     137  <xsl:variable name="view-addView" select="/bedework/urlPrefixes/view/addView/a/@href"/> 
     138  <xsl:variable name="view-update" select="/bedework/urlPrefixes/view/update/a/@href"/> 
     139  <xsl:variable name="view-remove" select="/bedework/urlPrefixes/view/remove/a/@href"/> 
    140140  <!-- system --> 
    141   <xsl:variable name="system-fetch" select="/bedeworkadmin/urlPrefixes/system/fetch/a/@href"/> 
    142   <xsl:variable name="system-update" select="/bedeworkadmin/urlPrefixes/system/update/a/@href"/> 
     141  <xsl:variable name="system-fetch" select="/bedework/urlPrefixes/system/fetch/a/@href"/> 
     142  <xsl:variable name="system-update" select="/bedework/urlPrefixes/system/update/a/@href"/> 
    143143  <!-- calsuites --> 
    144   <xsl:variable name="calsuite-fetch" select="/bedeworkadmin/urlPrefixes/calsuite/fetch/a/@href"/> 
    145   <xsl:variable name="calsuite-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/calsuite/fetchForUpdate/a/@href"/> 
    146   <xsl:variable name="calsuite-add" select="/bedeworkadmin/urlPrefixes/calsuite/add/a/@href"/> 
    147   <xsl:variable name="calsuite-update" select="/bedeworkadmin/urlPrefixes/calsuite/update/a/@href"/> 
    148   <xsl:variable name="calsuite-showAddForm" select="/bedeworkadmin/urlPrefixes/calsuite/showAddForm/a/@href"/> 
    149   <xsl:variable name="calsuite-setAccess" select="/bedeworkadmin/urlPrefixes/calsuite/setAccess/a/@href"/> 
    150   <xsl:variable name="calsuite-fetchPrefsForUpdate" select="/bedeworkadmin/urlPrefixes/calsuite/fetchPrefsForUpdate/a/@href"/> 
    151   <xsl:variable name="calsuite-updatePrefs" select="/bedeworkadmin/urlPrefixes/calsuite/updatePrefs/a/@href"/> 
     144  <xsl:variable name="calsuite-fetch" select="/bedework/urlPrefixes/calsuite/fetch/a/@href"/> 
     145  <xsl:variable name="calsuite-fetchForUpdate" select="/bedework/urlPrefixes/calsuite/fetchForUpdate/a/@href"/> 
     146  <xsl:variable name="calsuite-add" select="/bedework/urlPrefixes/calsuite/add/a/@href"/> 
     147  <xsl:variable name="calsuite-update" select="/bedework/urlPrefixes/calsuite/update/a/@href"/> 
     148  <xsl:variable name="calsuite-showAddForm" select="/bedework/urlPrefixes/calsuite/showAddForm/a/@href"/> 
     149  <xsl:variable name="calsuite-setAccess" select="/bedework/urlPrefixes/calsuite/setAccess/a/@href"/> 
     150  <xsl:variable name="calsuite-fetchPrefsForUpdate" select="/bedework/urlPrefixes/calsuite/fetchPrefsForUpdate/a/@href"/> 
     151  <xsl:variable name="calsuite-updatePrefs" select="/bedework/urlPrefixes/calsuite/updatePrefs/a/@href"/> 
    152152  <!-- timezones and stats --> 
    153   <xsl:variable name="timezones-initUpload" select="/bedeworkadmin/urlPrefixes/timezones/initUpload/a/@href"/> 
    154   <xsl:variable name="timezones-upload" select="/bedeworkadmin/urlPrefixes/timezones/upload/a/@href"/> 
    155   <xsl:variable name="stats-update" select="/bedeworkadmin/urlPrefixes/stats/update/a/@href"/> 
     153  <xsl:variable name="timezones-initUpload" select="/bedework/urlPrefixes/timezones/initUpload/a/@href"/> 
     154  <xsl:variable name="timezones-upload" select="/bedework/urlPrefixes/timezones/upload/a/@href"/> 
     155  <xsl:variable name="stats-update" select="/bedework/urlPrefixes/stats/update/a/@href"/> 
    156156  <!-- authuser and prefs --> 
    157   <xsl:variable name="authuser-showModForm" select="/bedeworkadmin/urlPrefixes/authuser/showModForm/a/@href"/> 
    158   <xsl:variable name="authuser-showUpdateList" select="/bedeworkadmin/urlPrefixes/authuser/showUpdateList/a/@href"/> 
    159   <xsl:variable name="authuser-initUpdate" select="/bedeworkadmin/urlPrefixes/authuser/initUpdate/a/@href"/> 
    160   <xsl:variable name="authuser-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/authuser/fetchForUpdate/a/@href"/> 
    161   <xsl:variable name="authuser-update" select="/bedeworkadmin/urlPrefixes/authuser/update/a/@href"/> 
    162   <xsl:variable name="prefs-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
    163   <xsl:variable name="prefs-update" select="/bedeworkadmin/urlPrefixes/prefs/update/a/@href"/> 
     157  <xsl:variable name="authuser-showModForm" select="/bedework/urlPrefixes/authuser/showModForm/a/@href"/> 
     158  <xsl:variable name="authuser-showUpdateList" select="/bedework/urlPrefixes/authuser/showUpdateList/a/@href"/> 
     159  <xsl:variable name="authuser-initUpdate" select="/bedework/urlPrefixes/authuser/initUpdate/a/@href"/> 
     160  <xsl:variable name="authuser-fetchForUpdate" select="/bedework/urlPrefixes/authuser/fetchForUpdate/a/@href"/> 
     161  <xsl:variable name="authuser-update" select="/bedework/urlPrefixes/authuser/update/a/@href"/> 
     162  <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
     163  <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
    164164  <!-- admin groups --> 
    165   <xsl:variable name="admingroup-showModForm" select="/bedeworkadmin/urlPrefixes/admingroup/showModForm/a/@href"/> 
    166   <xsl:variable name="admingroup-showModMembersForm" select="/bedeworkadmin/urlPrefixes/admingroup/showModMembersForm/a/@href"/> 
    167   <xsl:variable name="admingroup-showUpdateList" select="/bedeworkadmin/urlPrefixes/admingroup/showUpdateList/a/@href"/> 
    168   <xsl:variable name="admingroup-showChooseGroup" select="/bedeworkadmin/urlPrefixes/admingroup/showChooseGroup/a/@href"/> 
    169   <xsl:variable name="admingroup-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/admingroup/showDeleteConfirm/a/@href"/> 
    170   <xsl:variable name="admingroup-initAdd" select="/bedeworkadmin/urlPrefixes/admingroup/initAdd/a/@href"/> 
    171   <xsl:variable name="admingroup-initUpdate" select="/bedeworkadmin/urlPrefixes/admingroup/initUpdate/a/@href"/> 
    172   <xsl:variable name="admingroup-delete" select="/bedeworkadmin/urlPrefixes/admingroup/delete/a/@href"/> 
    173   <xsl:variable name="admingroup-fetchUpdateList" select="/bedeworkadmin/urlPrefixes/admingroup/fetchUpdateList/a/@href"/> 
    174   <xsl:variable name="admingroup-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/admingroup/fetchForUpdate/a/@href"/> 
    175   <xsl:variable name="admingroup-fetchForUpdateMembers" select="/bedeworkadmin/urlPrefixes/admingroup/fetchForUpdateMembers/a/@href"/> 
    176   <xsl:variable name="admingroup-update" select="/bedeworkadmin/urlPrefixes/admingroup/update/a/@href"/> 
    177   <xsl:variable name="admingroup-updateMembers" select="/bedeworkadmin/urlPrefixes/admingroup/updateMembers/a/@href"/> 
    178   <xsl:variable name="admingroup-switch" select="/bedeworkadmin/urlPrefixes/admingroup/switch/a/@href"/> 
     165  <xsl:variable name="admingroup-showModForm" select="/bedework/urlPrefixes/admingroup/showModForm/a/@href"/> 
     166  <xsl:variable name="admingroup-showModMembersForm" select="/bedework/urlPrefixes/admingroup/showModMembersForm/a/@href"/> 
     167  <xsl:variable name="admingroup-showUpdateList" select="/bedework/urlPrefixes/admingroup/showUpdateList/a/@href"/> 
     168  <xsl:variable name="admingroup-showChooseGroup" select="/bedework/urlPrefixes/admingroup/showChooseGroup/a/@href"/> 
     169  <xsl:variable name="admingroup-showDeleteConfirm" select="/bedework/urlPrefixes/admingroup/showDeleteConfirm/a/@href"/> 
     170  <xsl:variable name="admingroup-initAdd" select="/bedework/urlPrefixes/admingroup/initAdd/a/@href"/> 
     171  <xsl:variable name="admingroup-initUpdate" select="/bedework/urlPrefixes/admingroup/initUpdate/a/@href"/> 
     172  <xsl:variable name="admingroup-delete" select="/bedework/urlPrefixes/admingroup/delete/a/@href"/> 
     173  <xsl:variable name="admingroup-fetchUpdateList" select="/bedework/urlPrefixes/admingroup/fetchUpdateList/a/@href"/> 
     174  <xsl:variable name="admingroup-fetchForUpdate" select="/bedework/urlPrefixes/admingroup/fetchForUpdate/a/@href"/> 
     175  <xsl:variable name="admingroup-fetchForUpdateMembers" select="/bedework/urlPrefixes/admingroup/fetchForUpdateMembers/a/@href"/> 
     176  <xsl:variable name="admingroup-update" select="/bedework/urlPrefixes/admingroup/update/a/@href"/> 
     177  <xsl:variable name="admingroup-updateMembers" select="/bedework/urlPrefixes/admingroup/updateMembers/a/@href"/> 
     178  <xsl:variable name="admingroup-switch" select="/bedework/urlPrefixes/admingroup/switch/a/@href"/> 
    179179 
    180180  <!-- URL of the web application - includes web context --> 
    181   <xsl:variable name="urlPrefix" select="/bedeworkadmin/urlprefix"/> 
     181  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    182182 
    183183  <!-- Other generally useful global variables --> 
     
    192192        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    193193        <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
    194         <xsl:if test="/bedeworkadmin/page='modEvent'"> 
     194        <xsl:if test="/bedework/page='modEvent'"> 
    195195          <script type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script> 
    196196          <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script> 
     
    200200          <script type="text/javascript" src="{$resourcesRoot}/resources/browserSniffer.js"></script> 
    201201        </xsl:if> 
    202         <xsl:if test="/bedeworkadmin/page='upload' or /bedeworkadmin/page='selectCalForEvent'"> 
     202        <xsl:if test="/bedework/page='upload' or /bedework/page='selectCalForEvent'"> 
    203203          <script type="text/javascript" src="{$resourcesRoot}/resources/includes.js"></script> 
    204204        </xsl:if> 
    205         <xsl:if test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     205        <xsl:if test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    206206          <link rel="stylesheet" href="{$resourcesRoot}/resources/calendarDescriptions.css"/> 
    207207        </xsl:if> 
     
    222222      <body onLoad="focusFirstElement()"> 
    223223        <xsl:choose> 
    224           <xsl:when test="/bedeworkadmin/page='selectCalForEvent'"> 
     224          <xsl:when test="/bedework/page='selectCalForEvent'"> 
    225225            <xsl:call-template name="selectCalForEvent"/> 
    226226          </xsl:when> 
     
    229229            <div id="content"> 
    230230              <xsl:choose> 
    231                 <xsl:when test="/bedeworkadmin/page='eventList'"> 
     231                <xsl:when test="/bedework/page='eventList'"> 
    232232                  <xsl:call-template name="eventList"/> 
    233233                </xsl:when> 
    234                 <xsl:when test="/bedeworkadmin/page='modEvent'"> 
    235                   <xsl:apply-templates select="/bedeworkadmin/formElements" mode="modEvent"/> 
    236                 </xsl:when> 
    237                 <xsl:when test="/bedeworkadmin/page='displayEvent' or /bedeworkadmin/page='deleteEventConfirm'"> 
    238                   <xsl:apply-templates select="/bedeworkadmin/event" mode="displayEvent"/> 
    239                 </xsl:when> 
    240                 <xsl:when test="/bedeworkadmin/page='contactList'"> 
     234                <xsl:when test="/bedework/page='modEvent'"> 
     235                  <xsl:apply-templates select="/bedework/formElements" mode="modEvent"/> 
     236                </xsl:when> 
     237                <xsl:when test="/bedework/page='displayEvent' or /bedework/page='deleteEventConfirm'"> 
     238                  <xsl:apply-templates select="/bedework/event" mode="displayEvent"/> 
     239                </xsl:when> 
     240                <xsl:when test="/bedework/page='contactList'"> 
    241241                  <xsl:call-template name="contactList"/> 
    242242                </xsl:when> 
    243                 <xsl:when test="/bedeworkadmin/page='modContact'"> 
     243                <xsl:when test="/bedework/page='modContact'"> 
    244244                  <xsl:call-template name="modContact"/> 
    245245                </xsl:when> 
    246                 <xsl:when test="/bedeworkadmin/page='deleteContactConfirm' or /bedeworkadmin/page='contactReferenced'"> 
     246                <xsl:when test="/bedework/page='deleteContactConfirm' or /bedework/page='contactReferenced'"> 
    247247                  <xsl:call-template name="deleteContactConfirm"/> 
    248248                </xsl:when> 
    249                 <xsl:when test="/bedeworkadmin/page='locationList'"> 
     249                <xsl:when test="/bedework/page='locationList'"> 
    250250                  <xsl:call-template name="locationList"/> 
    251251                </xsl:when> 
    252                 <xsl:when test="/bedeworkadmin/page='modLocation'"> 
     252                <xsl:when test="/bedework/page='modLocation'"> 
    253253                  <xsl:call-template name="modLocation"/> 
    254254                </xsl:when> 
    255                 <xsl:when test="/bedeworkadmin/page='deleteLocationConfirm'"> 
     255                <xsl:when test="/bedework/page='deleteLocationConfirm'"> 
    256256                  <xsl:call-template name="deleteLocationConfirm"/> 
    257257                </xsl:when> 
    258                 <xsl:when test="/bedeworkadmin/page='categoryList'"> 
     258                <xsl:when test="/bedework/page='categoryList'"> 
    259259                  <xsl:call-template name="categoryList"/> 
    260260                </xsl:when> 
    261                 <xsl:when test="/bedeworkadmin/page='modCategory'"> 
     261                <xsl:when test="/bedework/page='modCategory'"> 
    262262                  <xsl:call-template name="modCategory"/> 
    263263                </xsl:when> 
    264                 <xsl:when test="/bedeworkadmin/page='deleteCategoryConfirm'"> 
     264                <xsl:when test="/bedework/page='deleteCategoryConfirm'"> 
    265265                  <xsl:call-template name="deleteCategoryConfirm"/> 
    266266                </xsl:when> 
    267                 <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='deleteCalendarConfirm' or /bedeworkadmin/page='calendarReferenced'"> 
    268                   <xsl:apply-templates select="/bedeworkadmin/calendars"/> 
    269                 </xsl:when> 
    270                 <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
    271                   <xsl:apply-templates select="/bedeworkadmin/subscriptions"/> 
    272                 </xsl:when> 
    273                 <xsl:when test="/bedeworkadmin/page='views'"> 
    274                   <xsl:apply-templates select="/bedeworkadmin/views" mode="viewList"/> 
    275                 </xsl:when> 
    276                 <xsl:when test="/bedeworkadmin/page='modView'"> 
     267                <xsl:when test="/bedework/page='calendarList' or /bedework/page='calendarDescriptions' or /bedework/page='displayCalendar' or /bedework/page='modCalendar' or /bedework/page='deleteCalendarConfirm' or /bedework/page='calendarReferenced'"> 
     268                  <xsl:apply-templates select="/bedework/calendars"/> 
     269                </xsl:when> 
     270                <xsl:when test="/bedework/page='subscriptions' or /bedework/page='modSubscription'"> 
     271                  <xsl:apply-templates select="/bedework/subscriptions"/> 
     272                </xsl:when> 
     273                <xsl:when test="/bedework/page='views'"> 
     274                  <xsl:apply-templates select="/bedework/views" mode="viewList"/> 
     275                </xsl:when> 
     276                <xsl:when test="/bedework/page='modView'"> 
    277277                  <xsl:call-template name="modView"/> 
    278278                </xsl:when> 
    279                 <xsl:when test="/bedeworkadmin/page='deleteViewConfirm'"> 
     279                <xsl:when test="/bedework/page='deleteViewConfirm'"> 
    280280                  <xsl:call-template name="deleteViewConfirm"/> 
    281281                </xsl:when> 
    282                 <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     282                <xsl:when test="/bedework/page='modSyspars'"> 
    283283                  <xsl:call-template name="modSyspars"/> 
    284284                </xsl:when> 
    285                 <xsl:when test="/bedeworkadmin/page='calSuiteList'"> 
    286                   <xsl:apply-templates select="/bedeworkadmin/calSuites" mode="calSuiteList"/> 
    287                 </xsl:when> 
    288                 <xsl:when test="/bedeworkadmin/page='addCalSuite'"> 
     285                <xsl:when test="/bedework/page='calSuiteList'"> 
     286                  <xsl:apply-templates select="/bedework/calSuites" mode="calSuiteList"/> 
     287                </xsl:when> 
     288                <xsl:when test="/bedework/page='addCalSuite'"> 
    289289                  <xsl:call-template name="addCalSuite"/> 
    290290                </xsl:when> 
    291                 <xsl:when test="/bedeworkadmin/page='modCalSuite'"> 
    292                   <xsl:apply-templates select="/bedeworkadmin/calSuite"/> 
    293                 </xsl:when> 
    294                 <xsl:when test="/bedeworkadmin/page='calSuitePrefs'"> 
     291                <xsl:when test="/bedework/page='modCalSuite'"> 
     292                  <xsl:apply-templates select="/bedework/calSuite"/> 
     293                </xsl:when> 
     294                <xsl:when test="/bedework/page='calSuitePrefs'"> 
    295295                  <xsl:call-template name="calSuitePrefs"/> 
    296296                </xsl:when> 
    297                 <xsl:when test="/bedeworkadmin/page='authUserList'"> 
     297                <xsl:when test="/bedework/page='authUserList'"> 
    298298                  <xsl:call-template name="authUserList"/> 
    299299                </xsl:when> 
    300                 <xsl:when test="/bedeworkadmin/page='modAuthUser'"> 
     300                <xsl:when test="/bedework/page='modAuthUser'"> 
    301301                  <xsl:call-template name="modAuthUser"/> 
    302302                </xsl:when> 
    303                 <xsl:when test="/bedeworkadmin/page='modPrefs'"> 
     303                <xsl:when test="/bedework/page='modPrefs'"> 
    304304                  <xsl:call-template name="modPrefs"/> 
    305305                </xsl:when> 
    306                 <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
    307                   <xsl:apply-templates select="/bedeworkadmin/groups" mode="chooseGroup"/> 
    308                 </xsl:when> 
    309                 <xsl:when test="/bedeworkadmin/page='adminGroupList'"> 
     306                <xsl:when test="/bedework/page='chooseGroup'"> 
     307                  <xsl:apply-templates select="/bedework/groups" mode="chooseGroup"/> 
     308                </xsl:when> 
     309                <xsl:when test="/bedework/page='adminGroupList'"> 
    310310                  <xsl:call-template name="listAdminGroups"/> 
    311311                </xsl:when> 
    312                 <xsl:when test="/bedeworkadmin/page='modAdminGroup'"> 
     312                <xsl:when test="/bedework/page='modAdminGroup'"> 
    313313                  <xsl:call-template name="modAdminGroup"/> 
    314314                </xsl:when> 
    315                 <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'"> 
     315                <xsl:when test="/bedework/page='modAdminGroupMembers'"> 
    316316                  <xsl:call-template name="modAdminGroupMembers"/> 
    317317                </xsl:when> 
    318                 <xsl:when test="/bedeworkadmin/page='deleteAdminGroupConfirm'"> 
     318                <xsl:when test="/bedework/page='deleteAdminGroupConfirm'"> 
    319319                  <xsl:call-template name="deleteAdminGroupConfirm"/> 
    320320                </xsl:when> 
    321                 <xsl:when test="/bedeworkadmin/page='searchResult'"> 
     321                <xsl:when test="/bedework/page='searchResult'"> 
    322322                  <xsl:call-template name="searchResult"/> 
    323323                </xsl:when> 
    324                 <xsl:when test="/bedeworkadmin/page='noGroup'"> 
     324                <xsl:when test="/bedework/page='noGroup'"> 
    325325                  <h2>No administrative group</h2> 
    326326                  <p>Your userid has not been assigned to an administrative group. 
    327327                    Please inform your administrator.</p> 
    328328                </xsl:when> 
    329                 <xsl:when test="/bedeworkadmin/page='upload'"> 
     329                <xsl:when test="/bedework/page='upload'"> 
    330330                  <xsl:call-template name="upload"/> 
    331331                </xsl:when> 
    332                 <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
     332                <xsl:when test="/bedework/page='uploadTimezones'"> 
    333333                  <xsl:call-template name="uploadTimezones"/> 
    334334                </xsl:when> 
    335                 <xsl:when test="/bedeworkadmin/page='showSysStats'"> 
    336                   <xsl:apply-templates select="/bedeworkadmin/sysStats" mode="showSysStats"/> 
    337                 </xsl:when> 
    338                 <xsl:when test="/bedeworkadmin/page='noAccess'"> 
     335                <xsl:when test="/bedework/page='showSysStats'"> 
     336                  <xsl:apply-templates select="/bedework/sysStats" mode="showSysStats"/> 
     337                </xsl:when> 
     338                <xsl:when test="/bedework/page='noAccess'"> 
    339339                  <h2>No Access</h2> 
    340340                  <p> 
     
    347347                  </p> 
    348348                </xsl:when> 
    349                 <xsl:when test="/bedeworkadmin/page='error'"> 
     349                <xsl:when test="/bedework/page='error'"> 
    350350                  <h2>Application error</h2> 
    351351                  <p>An application error occurred.</p> 
     
    396396          <td> 
    397397            Event ID: 
    398             <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     398            <xsl:copy-of select="/bedework/formElements/*"/> 
    399399          </td>--> 
    400400        </tr> 
     
    443443      <form name="searchForm" method="post" action="{$search}" id="searchForm"> 
    444444        <input type="text" name="query" size="30"> 
    445           <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/searchResults/query"/></xsl:attribute> 
     445          <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    446446        </input> 
    447447        <input type="submit" name="submit" value="go"/> 
     
    457457 
    458458    <div id="adminRightColumn"> 
    459       <xsl:if test="/bedeworkadmin/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedeworkadmin/userInfo/superUser='true'"> 
     459      <xsl:if test="/bedework/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedework/userInfo/superUser='true'"> 
    460460        <h4 class="menuTitle"> 
    461461          Manage calendar suite: 
    462           <em><xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     462          <em><xsl:value-of select="/bedework/currentCalSuite/name"/> 
    463463          </em> 
    464464        </h4> 
     
    492492      </xsl:if> 
    493493 
    494       <xsl:if test="/bedeworkadmin/userInfo/contentAdminUser='true'"> 
     494      <xsl:if test="/bedework/userInfo/contentAdminUser='true'"> 
    495495        <h4 class="menuTitle">Manage users:</h4> 
    496496        <ul class="adminMenu"> 
    497           <xsl:if test="/bedeworkadmin/userInfo/userMaintOK='true'"> 
     497          <xsl:if test="/bedework/userInfo/userMaintOK='true'"> 
    498498            <li> 
    499499              <a href="{$authuser-initUpdate}"> 
     
    502502            </li> 
    503503          </xsl:if> 
    504           <xsl:if test="/bedeworkadmin/userInfo/adminGroupMaintOk='true'"> 
     504          <xsl:if test="/bedework/userInfo/adminGroupMaintOk='true'"> 
    505505            <li> 
    506506              <a href="{$admingroup-initUpdate}"> 
     
    514514            </a> 
    515515          </li> 
    516           <xsl:if test="/bedeworkadmin/userInfo/userMaintOK='true'"> 
     516          <xsl:if test="/bedework/userInfo/userMaintOK='true'"> 
    517517            <li> 
    518518              <form action="{$prefs-fetchForUpdate}" method="post"> 
     
    526526      </xsl:if> 
    527527 
    528       <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     528      <xsl:if test="/bedework/userInfo/superUser='true'"> 
    529529        <h4 class="menuTitle">Super user features:</h4> 
    530530        <ul class="adminMenu"> 
     
    577577          <td style="padding-right: 1em;">Show:</td> 
    578578          <td> 
    579             <xsl:copy-of select="/bedeworkadmin/formElements/form/listAllSwitchFalse/*"/> 
     579            <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    580580            Active 
    581581          </td> 
    582582          <td> 
    583             <xsl:copy-of select="/bedeworkadmin/formElements/form/listAllSwitchTrue/*"/> 
     583            <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    584584            All 
    585585          </td> 
     
    597597      </tr> 
    598598 
    599       <xsl:for-each select="/bedeworkadmin/events/event"> 
     599      <xsl:for-each select="/bedework/events/event"> 
    600600        <xsl:variable name="subscriptionId" select="subscription/id"/> 
    601601        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     
    752752                <xsl:copy-of select="form/start/day/*"/> 
    753753                <xsl:choose> 
    754                   <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     754                  <xsl:when test="/bedework/creating = 'true'"> 
    755755                    <xsl:copy-of select="form/start/year/*"/> 
    756756                  </xsl:when> 
     
    780780                    <option value="-1">select timezone...</option> 
    781781                    <xsl:variable name="startTzId" select="form/start/tzid"/> 
    782                     <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     782                    <xsl:for-each select="/bedework/timezones/timezone"> 
    783783                      <option> 
    784784                        <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    813813                  <xsl:copy-of select="form/end/dateTime/day/*"/> 
    814814                  <xsl:choose> 
    815                     <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     815                    <xsl:when test="/bedework/creating = 'true'"> 
    816816                      <xsl:copy-of select="form/end/dateTime/year/*"/> 
    817817                    </xsl:when> 
     
    841841                      <option value="-1">select timezone...</option> 
    842842                      <xsl:variable name="endTzId" select="form/end/dateTime/tzid"/> 
    843                       <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     843                      <xsl:for-each select="/bedework/timezones/timezone"> 
    844844                        <option> 
    845845                          <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    998998                    <xsl:variable name="dayVal" select="."/> 
    999999                    <xsl:variable name="dayPos"> 
    1000                       <xsl:for-each select="/bedeworkadmin/recurdayvals/val"> 
     1000                      <xsl:for-each select="/bedework/recurdayvals/val"> 
    10011001                        <xsl:if test="node() = $dayVal"><xsl:value-of select="position()"/></xsl:if> 
    10021002                      </xsl:for-each> 
    10031003                    </xsl:variable> 
    1004                     <xsl:value-of select="/bedeworkadmin/shortdaynames/val[position() = $dayPos]"/> 
     1004                    <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/> 
    10051005                    <xsl:if test="position() != last()">, </xsl:if> 
    10061006                  </xsl:for-each> 
     
    10131013                  <xsl:if test="position() != 1 and position() = last()"> and </xsl:if> 
    10141014                  <xsl:variable name="monthNum" select="number(.)"/> 
    1015                   <xsl:value-of select="/bedeworkadmin/monthlabels/val[position() = $monthNum]"/> 
     1015                  <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/> 
    10161016                  <xsl:if test="position() != last()">, </xsl:if> 
    10171017                </xsl:for-each> 
     
    10631063                <input type="checkbox" name="recurrenceFlag" onclick="swapRecurrence(this)" value="on"/> 
    10641064                <xsl:choose> 
    1065                   <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     1065                  <xsl:when test="/bedework/creating = 'true'"> 
    10661066                    set recurrence rules 
    10671067                  </xsl:when> 
     
    11351135                              in these months: 
    11361136                              <div id="dayMonthCheckBoxList" class="invisible"> 
    1137                                 <xsl:for-each select="/bedeworkadmin/monthlabels/val"> 
     1137                                <xsl:for-each select="/bedework/monthlabels/val"> 
    11381138                                  <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable> 
    11391139                                  <span class="chkBoxListItem"> 
    11401140                                    <input type="checkbox" name="dayMonths"> 
    1141                                       <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/monthvalues/val[position() = $pos]"/></xsl:attribute> 
     1141                                      <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute> 
    11421142                                    </input> 
    11431143                                    <xsl:value-of select="."/> 
     
    11741174                              Week start: 
    11751175                              <select name="weekWkst"> 
    1176                                 <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     1176                                <xsl:for-each select="/bedework/shortdaynames/val"> 
    11771177                                  <xsl:variable name="pos" select="position()"/> 
    11781178                                  <option> 
    1179                                     <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     1179                                    <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    11801180                                    <xsl:value-of select="."/> 
    11811181                                  </option> 
     
    12521252                              in these months: 
    12531253                              <div id="yearMonthCheckBoxList" class="invisible"> 
    1254                                 <xsl:for-each select="/bedeworkadmin/monthlabels/val"> 
     1254                                <xsl:for-each select="/bedework/monthlabels/val"> 
    12551255                                  <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable> 
    12561256                                  <span class="chkBoxListItem"> 
    12571257                                    <input type="checkbox" name="yearMonths"> 
    1258                                       <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/monthvalues/val[position() = $pos]"/></xsl:attribute> 
     1258                                      <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute> 
    12591259                                    </input> 
    12601260                                    <xsl:value-of select="."/> 
     
    13001300                              Week start: 
    13011301                              <select name="yearWkst"> 
    1302                                 <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     1302                                <xsl:for-each select="/bedework/shortdaynames/val"> 
    13031303                                  <xsl:variable name="pos" select="position()"/> 
    13041304                                  <option> 
    1305                                     <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     1305                                    <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    13061306                                    <xsl:value-of select="."/> 
    13071307                                  </option> 
     
    13371337                               </select> 
    13381338                               <xsl:choose> 
    1339                                  <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     1339                                 <xsl:when test="/bedework/creating = 'true'"> 
    13401340                                   <select name="untilYear" onfocus="selectRecurCountUntil('recurUntil')"> 
    13411341                                     <xsl:for-each select="form/start/year/select/option"> 
     
    15311531          </td> 
    15321532          <td> 
    1533             <xsl:if test="form/categories/preferred/category and /bedeworkadmin/creating='true'"> 
     1533            <xsl:if test="form/categories/preferred/category and /bedework/creating='true'"> 
    15341534              <input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>show preferred 
    15351535              <input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>show all<br/> 
     
    15631563            </xsl:if> 
    15641564            <table cellpadding="0" id="allCategoryCheckboxes"> 
    1565               <xsl:if test="form/categories/preferred/category and /bedeworkadmin/creating='true'"> 
     1565              <xsl:if test="form/categories/preferred/category and /bedework/creating='true'"> 
    15661566                <xsl:attribute name="class">invisible</xsl:attribute> 
    15671567              </xsl:if> 
     
    15721572                    <input type="checkbox" name="categoryKey"> 
    15731573                      <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 
    1574                       <xsl:if test="/bedeworkadmin/creating='true'"> 
     1574                      <xsl:if test="/bedework/creating='true'"> 
    15751575                        <xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute> 
    15761576                        <xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute> 
     
    15871587                    <input type="checkbox" name="categoryKey"> 
    15881588                      <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 
    1589                       <xsl:if test="/bedeworkadmin/creating='true'"> 
     1589                      <xsl:if test="/bedework/creating='true'"> 
    15901590                        <xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute> 
    15911591                        <xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute> 
     
    16741674        <tr> 
    16751675          <xsl:choose> 
    1676             <xsl:when test="/bedeworkadmin/creating='true'"> 
     1676            <xsl:when test="/bedework/creating='true'"> 
    16771677              <td> 
    16781678                <input type="submit" name="addEvent" value="Add Event"/> 
     
    17131713  <xsl:template name="byDayChkBoxList"> 
    17141714    <xsl:param name="name"/> 
    1715     <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     1715    <xsl:for-each select="/bedework/shortdaynames/val"> 
    17161716      <xsl:variable name="pos" select="position()"/> 
    17171717      <input type="checkbox"> 
    1718         <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     1718        <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    17191719        <xsl:attribute name="name"><xsl:value-of select="$name"/></xsl:attribute> 
    17201720      </input> 
     
    18691869 
    18701870    <xsl:choose> 
    1871       <xsl:when test="/bedeworkadmin/page='deleteEventConfirm'"> 
     1871      <xsl:when test="/bedework/page='deleteEventConfirm'"> 
    18721872 
    18731873        <h2>Ok to delete this event?</h2> 
     
    20192019 
    20202020    <p> 
    2021       <xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
     2021      <xsl:if test="/bedework/canEdit = 'true' or /bedework/userInfo/superUser = 'true'"> 
    20222022        <input type="button" name="return" value="Edit event" onclick="javascript:location.replace('{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
    20232023      </xsl:if> 
     
    20432043      </tr> 
    20442044 
    2045       <xsl:for-each select="/bedeworkadmin/contacts/contact"> 
     2045      <xsl:for-each select="/bedework/contacts/contact"> 
    20462046        <tr> 
    20472047          <td> 
     
    20782078          </td> 
    20792079          <td> 
    2080             <xsl:copy-of select="/bedeworkadmin/formElements/form/name/*"/> 
     2080            <xsl:copy-of select="/bedework/formElements/form/name/*"/> 
    20812081          </td> 
    20822082        </tr> 
     
    20862086          </td> 
    20872087          <td> 
    2088             <xsl:copy-of select="/bedeworkadmin/formElements/form/phone/*"/> 
     2088            <xsl:copy-of select="/bedework/formElements/form/phone/*"/> 
    20892089            <span class="fieldInfo"> (optional)</span> 
    20902090          </td> 
     
    20952095          </td> 
    20962096          <td> 
    2097             <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
     2097            <xsl:copy-of select="/bedework/formElements/form/link/*"/> 
    20982098            <span class="fieldInfo"> (optional)</span> 
    20992099          </td> 
     
    21042104          </td> 
    21052105          <td> 
    2106             <xsl:copy-of select="/bedeworkadmin/formElements/form/email/*"/> 
     2106            <xsl:copy-of select="/bedework/formElements/form/email/*"/> 
    21072107            <span class="fieldInfo"> (optional)</span> 
    21082108          </td> 
     
    21132113        <tr> 
    21142114          <xsl:choose> 
    2115             <xsl:when test="/bedeworkadmin/creating='true'"> 
     2115            <xsl:when test="/bedework/creating='true'"> 
    21162116              <td> 
    21172117                <input type="submit" name="addContact" value="Add Contact"/> 
     
    21402140    <h2>Ok to delete this contact?</h2> 
    21412141    <p id="confirmButtons"> 
    2142       <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     2142      <xsl:copy-of select="/bedework/formElements/*"/> 
    21432143    </p> 
    21442144 
     
    21472147        <th>Name</th> 
    21482148        <td> 
    2149           <xsl:value-of select="/bedeworkadmin/contact/name" /> 
     2149          <xsl:value-of select="/bedework/contact/name" /> 
    21502150        </td> 
    21512151      </tr> 
     
    21532153        <th>Phone</th> 
    21542154        <td> 
    2155           <xsl:value-of select="/bedeworkadmin/contact/phone" /> 
     2155          <xsl:value-of select="/bedework/contact/phone" /> 
    21562156        </td> 
    21572157      </tr> 
     
    21592159        <th>Email</th> 
    21602160        <td> 
    2161           <xsl:value-of select="/bedeworkadmin/contact/email" /> 
     2161          <xsl:value-of select="/bedework/contact/email" /> 
    21622162        </td> 
    21632163      </tr> 
     
    21652165        <th>URL</th> 
    21662166        <td> 
    2167           <xsl:value-of select="/bedeworkadmin/contact/link" /> 
     2167          <xsl:value-of select="/bedework/contact/link" /> 
    21682168        </td> 
    21692169      </tr> 
     
    21862186      </tr> 
    21872187 
    2188       <xsl:for-each select="/bedeworkadmin/locations/location"> 
     2188      <xsl:for-each select="/bedework/locations/location"> 
    21892189        <tr> 
    21902190          <td> 
     
    22072207  <xsl:template name="modLocation"> 
    22082208    <xsl:choose> 
    2209       <xsl:when test="/bedeworkadmin/creating='true'"> 
     2209      <xsl:when test="/bedework/creating='true'"> 
    22102210        <h2>Add Location</h2> 
    22112211      </xsl:when> 
     
    22222222          </td> 
    22232223          <td> 
    2224             <xsl:copy-of select="/bedeworkadmin/formElements/form/address/*"/> 
     2224            <xsl:copy-of select="/bedework/formElements/form/address/*"/> 
    22252225          </td> 
    22262226        </tr> 
     
    22302230          </td> 
    22312231          <td> 
    2232             <xsl:copy-of select="/bedeworkadmin/formElements/form/subaddress/*"/> 
     2232            <xsl:copy-of select="/bedework/formElements/form/subaddress/*"/> 
    22332233            <span class="fieldInfo"> (optional)</span> 
    22342234          </td> 
     
    22392239          </td> 
    22402240          <td> 
    2241             <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
     2241            <xsl:copy-of select="/bedework/formElements/form/link/*"/> 
    22422242            <span class="fieldInfo"> (optional)</span> 
    22432243          </td> 
     
    22482248        <tr> 
    22492249          <xsl:choose> 
    2250             <xsl:when test="/bedeworkadmin/creating='true'"> 
     2250            <xsl:when test="/bedework/creating='true'"> 
    22512251              <td> 
    22522252                <input type="submit" name="addLocation" value="Add Location"/> 
     
    22742274    <h2>Ok to delete this location?</h2> 
    22752275    <p id="confirmButtons"> 
    2276       <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     2276      <xsl:copy-of select="/bedework/formElements/*"/> 
    22772277    </p> 
    22782278 
     
    22832283          </td> 
    22842284        <td> 
    2285           <xsl:value-of select="/bedeworkadmin/location/address"/> 
     2285          <xsl:value-of select="/bedework/location/address"/> 
    22862286        </td> 
    22872287      </tr> 
     
    22912291          </td> 
    22922292        <td> 
    2293           <xsl:value-of select="/bedeworkadmin/location/subaddress"/> 
     2293          <xsl:value-of select="/bedework/location/subaddress"/> 
    22942294        </td> 
    22952295      </tr> 
     
    22992299          </td> 
    23002300        <td> 
    2301           <xsl:variable name="link" select="/bedeworkadmin/location/link"/> 
     2301          <xsl:variable name="link" select="/bedework/location/link"/> 
    23022302          <a href="{$link}"> 
    2303             <xsl:value-of select="/bedeworkadmin/location/link"/> 
     2303            <xsl:value-of select="/bedework/location/link"/> 
    23042304          </a> 
    23052305        </td> 
     
    23222322      </tr> 
    23232323 
    2324       <xsl:for-each select="/bedeworkadmin/categories/category"> 
     2324      <xsl:for-each select="/bedework/categories/category"> 
    23252325        <xsl:variable name="categoryKey" select="normalize-space(keyword)"/> 
    23262326        <tr> 
     
    23402340  <xsl:template name="modCategory"> 
    23412341    <xsl:choose> 
    2342       <xsl:when test="/bedeworkadmin/creating='true'"> 
     2342      <xsl:when test="/bedework/creating='true'"> 
    23432343        <h2>Add Category</h2> 
    23442344        <form action="{$category-update}" method="post"> 
     
    23822382            </td> 
    23832383              <td> 
    2384                 <xsl:variable name="keyword" select="normalize-space(/bedeworkadmin/currentCategory/category/keyword)"/> 
     2384                <xsl:variable name="keyword" select="normalize-space(/bedework/currentCategory/category/keyword)"/> 
    23852385                <input type="text" name="categoryWord.value" value="{$keyword}" size="40"/> 
    23862386              </td> 
     
    23922392              <td> 
    23932393                <textarea name="categoryDesc.value" rows="3" cols="60"> 
    2394                   <xsl:value-of select="normalize-space(/bedeworkadmin/currentCategory/category/desc)"/> 
     2394                  <xsl:value-of select="normalize-space(/bedework/currentCategory/category/desc)"/> 
    23952395                </textarea> 
    23962396              </td> 
     
    24272427        </td> 
    24282428        <td> 
    2429           <xsl:value-of select="/bedeworkadmin/currentCategory/category/keyword"/> 
     2429          <xsl:value-of select="/bedework/currentCategory/category/keyword"/> 
    24302430        </td> 
    24312431      </tr> 
     
    24352435        </td> 
    24362436        <td> 
    2437           <xsl:value-of select="/bedeworkadmin/currentCategory/category/desc"/> 
     2437          <xsl:value-of select="/bedework/currentCategory/category/desc"/> 
    24382438        </td> 
    24392439      </tr> 
     
    24542454          <ul id="calendarTree"> 
    24552455            <xsl:choose> 
    2456               <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     2456              <xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    24572457                <xsl:apply-templates select="calendar" mode="listForDisplay"/> 
    24582458              </xsl:when> 
     
    24652465        <td class="calendarContent"> 
    24662466          <xsl:choose> 
    2467             <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='calendarReferenced'"> 
     2467            <xsl:when test="/bedework/page='calendarList' or /bedework/page='calendarReferenced'"> 
    24682468              <xsl:call-template name="calendarList"/> 
    24692469            </xsl:when> 
    2470             <xsl:when test="/bedeworkadmin/page='calendarDescriptions'"> 
     2470            <xsl:when test="/bedework/page='calendarDescriptions'"> 
    24712471              <xsl:call-template name="calendarDescriptions"/> 
    24722472            </xsl:when> 
    2473             <xsl:when test="/bedeworkadmin/page='displayCalendar'"> 
    2474               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="displayCalendar"/> 
     2473            <xsl:when test="/bedework/page='displayCalendar'"> 
     2474              <xsl:apply-templates select="/bedework/currentCalendar" mode="displayCalendar"/> 
    24752475            </xsl:when> 
    2476             <xsl:when test="/bedeworkadmin/page='deleteCalendarConfirm'"> 
    2477               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="deleteCalendarConfirm"/> 
     2476            <xsl:when test="/bedework/page='deleteCalendarConfirm'"> 
     2477              <xsl:apply-templates select="/bedework/currentCalendar" mode="deleteCalendarConfirm"/> 
    24782478            </xsl:when> 
    2479             <xsl:when test="/bedeworkadmin/creating='true'"> 
    2480               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="addCalendar"/> 
     2479            <xsl:when test="/bedework/creating='true'"> 
     2480              <xsl:apply-templates select="/bedework/currentCalendar" mode="addCalendar"/> 
    24812481            </xsl:when> 
    24822482            <xsl:otherwise> 
    2483               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="modCalendar"/> 
     2483              <xsl:apply-templates select="/bedework/currentCalendar" mode="modCalendar"/> 
    24842484            </xsl:otherwise> 
    24852485          </xsl:choose> 
     
    26892689      <xsl:variable name="calPath" select="path"/> 
    26902690      <xsl:variable name="encodedCalPath" select="encodedPath"/> 
    2691       <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     2691      <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedework/userInfo/superUser='true'"> 
    26922692        <h3>Sharing</h3> 
    26932693        <table class="common" id="sharing"> 
     
    27222722                </xsl:if> 
    27232723                <xsl:choose> 
    2724                   <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"> 
     2724                  <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"> 
    27252725                    <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
    2726                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/> 
     2726                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/> 
    27272727                  </xsl:when> 
    2728                   <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"> 
     2728                  <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"> 
    27292729                    <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> 
    2730                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/> 
     2730                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/> 
    27312731                  </xsl:when> 
    27322732                  <xsl:when test="invert and $who='owner'"> 
     
    27672767                    <xsl:variable name="whoType"> 
    27682768                      <xsl:choose> 
    2769                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when> 
    2770                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when> 
     2769                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when> 
     2770                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when> 
    27712771                        <xsl:when test="$who='authenticated'">auth</xsl:when> 
    27722772                        <xsl:when test="invert/principal/property/owner">other</xsl:when> 
     
    27782778                    <xsl:variable name="shortWho"> 
    27792779                      <xsl:choose> 
    2780                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
    2781                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
     2780                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
     2781                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
    27822782                        <xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who --> 
    27832783                      </xsl:choose> 
     
    28032803      </xsl:if> 
    28042804 
    2805       <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     2805      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedework/userInfo/superUser='true'"> 
    28062806        <form name="calendarShareForm" action="{$calendar-setAccess}" id="shareForm" method="post"> 
    28072807          <input type="hidden" name="calPath" value="{$calPath}"/> 
     
    30353035      <!--<form name="toggleCals" action="{$event-selectCalForEvent}"> 
    30363036        <xsl:choose> 
    3037           <xsl:when test="/bedeworkadmin/appvar[key='showAllCalsForEvent']/value = 'true'"> 
     3037          <xsl:when test="/bedework/appvar[key='showAllCalsForEvent']/value = 'true'"> 
    30383038            <input type="radio" name="setappvar" value="showAllCalsForEvent(false)" onclick="submit()"/> 
    30393039            show only writable calendars 
     
    30513051      <h4>Calendars</h4> 
    30523052      <ul id="calendarTree"> 
    3053         <xsl:apply-templates select="/bedeworkadmin/calendars/calendar" mode="selectCalForEventCalTree"/> 
     3053        <xsl:apply-templates select="/bedework/calendars/calendar" mode="selectCalForEventCalTree"/> 
    30543054      </ul> 
    30553055    </div> 
     
    31013101          </p> 
    31023102          <ul id="calendarTree"> 
    3103             <xsl:apply-templates select="/bedeworkadmin/subscriptions/subscribe/calendars/calendar" mode="subscribe"/> 
     3103            <xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar" mode="subscribe"/> 
    31043104          </ul> 
    31053105        </td> 
    31063106        <td class="subs"> 
    31073107          <xsl:choose> 
    3108             <xsl:when test="/bedeworkadmin/page='subscriptions'"> 
     3108            <xsl:when test="/bedework/page='subscriptions'"> 
    31093109              <xsl:call-template name="subscriptionList"/> 
    31103110            </xsl:when> 
    3111             <xsl:when test="/bedeworkadmin/creating='true'"> 
     3111            <xsl:when test="/bedework/creating='true'"> 
    31123112              <xsl:apply-templates select="subscription" mode="addSubscription"/> 
    31133113            </xsl:when> 
     
    31703170          </td> 
    31713171        </tr> 
    3172         <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     3172        <xsl:if test="/bedework/userInfo/superUser='true'"> 
    31733173          <tr> 
    31743174            <th>Unremovable:</th> 
     
    32623262          </td> 
    32633263        </tr> 
    3264         <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     3264        <xsl:if test="/bedework/userInfo/superUser='true'"> 
    32653265          <tr> 
    32663266            <th>Unremovable:</th> 
     
    34103410  <xsl:template name="modView"> 
    34113411    <h2>Update View</h2> 
    3412     <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/> 
     3412    <xsl:variable name="viewName" select="/bedework/views/view/name"/> 
    34133413    <h3 class="viewName"> 
    34143414      <xsl:value-of select="$viewName"/> 
     
    34203420 
    34213421          <table class="subscriptionsListSubs"> 
    3422             <xsl:for-each select="/bedeworkadmin/subscriptions/subscription"> 
     3422            <xsl:for-each select="/bedework/subscriptions/subscription"> 
    34233423              <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    3424               <xsl:if test="not(/bedeworkadmin/views/view/subscriptions/subscription/name=name)"> 
     3424              <xsl:if test="not(/bedework/views/view/subscriptions/subscription/name=name)"> 
    34253425                <tr> 
    34263426                  <td> 
     
    34433443          <h3>Active Subscriptions:</h3> 
    34443444          <table class="subscriptionsListView"> 
    3445             <xsl:for-each select="/bedeworkadmin/views/view/subscriptions/subscription"> 
     3445            <xsl:for-each select="/bedework/views/view/subscriptions/subscription"> 
    34463446              <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    34473447              <tr> 
     
    34823482    <h2>Remove View?</h2> 
    34833483 
    3484     <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/> 
     3484    <xsl:variable name="viewName" select="/bedework/views/view/name"/> 
    34853485    <p>The following view will be removed. Continue?</p> 
    34863486 
     
    35693569          <th>System name:</th> 
    35703570          <td> 
    3571             <xsl:variable name="sysname" select="/bedeworkadmin/system/name"/> 
     3571            <xsl:variable name="sysname" select="/bedework/system/name"/> 
    35723572            <xsl:value-of select="$sysname"/> 
    35733573            <div class="desc"> 
     
    35793579          <th>Default timezone:</th> 
    35803580          <td> 
    3581             <xsl:variable name="tzid" select="/bedeworkadmin/system/tzid"/> 
     3581            <xsl:variable name="tzid" select="/bedework/system/tzid"/> 
    35823582 
    35833583            <select name="tzid"> 
    35843584              <option value="-1">select timezone...</option> 
    3585               <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     3585              <xsl:for-each select="/bedework/timezones/timezone"> 
    35863586                <option> 
    35873587                  <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    3588                   <xsl:if test="/bedeworkadmin/system/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     3588                  <xsl:if test="/bedework/system/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    35893589                  <xsl:value-of select="name"/> 
    35903590                </option> 
     
    36003600          <th>System id:</th> 
    36013601          <td> 
    3602             <xsl:variable name="systemid" select="/bedeworkadmin/system/systemid"/> 
     3602            <xsl:variable name="systemid" select="/bedework/system/systemid"/> 
    36033603            <xsl:value-of select="$systemid"/> 
    36043604            <div class="desc"> 
     
    36103610          <th>Principal Root:</th> 
    36113611          <td> 
    3612             <xsl:variable name="proot" select="/bedeworkadmin/system/principalRoot"/> 
     3612            <xsl:variable name="proot" select="/bedework/system/principalRoot"/> 
    36133613            <input value="{$proot}" name="principalRoot" size="0"/> 
    36143614            <div class="desc"> 
     
    36203620          <th>User Principal Root:</th> 
    36213621          <td> 
    3622             <xsl:variable name="uproot" select="/bedeworkadmin/system/userPrincipalRoot"/> 
     3622            <xsl:variable name="uproot" select="/bedework/system/userPrincipalRoot"/> 
    36233623            <input value="{$uproot}" name="userPrincipalRoot" size="0"/> 
    36243624            <div class="desc"> 
     
    36303630          <th>Group Principal Root:</th> 
    36313631          <td> 
    3632             <xsl:variable name="gproot" select="/bedeworkadmin/system/groupPrincipalRoot"/> 
     3632            <xsl:variable name="gproot" select="/bedework/system/groupPrincipalRoot"/> 
    36333633            <input value="{$gproot}" name="groupPrincipalRoot" size="0"/> 
    36343634            <div class="desc"> 
     
    36403640          <th>Public Calendar Root:</th> 
    36413641          <td> 
    3642             <xsl:variable name="publicCalendarRoot" select="/bedeworkadmin/system/publicCalendarRoot"/> 
     3642            <xsl:variable name="publicCalendarRoot" select="/bedework/system/publicCalendarRoot"/> 
    36433643            <xsl:value-of select="$publicCalendarRoot"/> 
    36443644            <div class="desc"> 
     
    36503650          <th>User Calendar Root:</th> 
    36513651          <td> 
    3652             <xsl:variable name="userCalendarRoot" select="/bedeworkadmin/system/userCalendarRoot"/> 
     3652            <xsl:variable name="userCalendarRoot" select="/bedework/system/userCalendarRoot"/> 
    36533653            <xsl:value-of select="$userCalendarRoot"/> 
    36543654            <div class="desc"> 
     
    36603660          <th>User Calendar Default name:</th> 
    36613661          <td> 
    3662             <xsl:variable name="userDefaultCalendar" select="/bedeworkadmin/system/userDefaultCalendar"/> 
     3662            <xsl:variable name="userDefaultCalendar" select="/bedework/system/userDefaultCalendar"/> 
    36633663            <input value="{$userDefaultCalendar}" name="userDefaultCalendar" /> 
    36643664            <div class="desc"> 
     
    36703670          <th>Trash Calendar Default name:</th> 
    36713671          <td> 
    3672             <xsl:variable name="defaultTrashCalendar" select="/bedeworkadmin/system/defaultTrashCalendar"/> 
     3672            <xsl:variable name="defaultTrashCalendar" select="/bedework/system/defaultTrashCalendar"/> 
    36733673            <input value="{$defaultTrashCalendar}" name="defaultTrashCalendar" /> 
    36743674            <div class="desc"> 
     
    36803680          <th>User Inbox Default name:</th> 
    36813681          <td> 
    3682             <xsl:variable name="userInbox" select="/bedeworkadmin/system/userInbox"/> 
     3682            <xsl:variable name="userInbox" select="/bedework/system/userInbox"/> 
    36833683            <input value="{$userInbox}" name="userInbox" /> 
    36843684            <div class="desc"> 
     
    36903690          <th>User Outbox Default name:</th> 
    36913691          <td> 
    3692             <xsl:variable name="userOutbox" select="/bedeworkadmin/system/userOutbox"/> 
     3692            <xsl:variable name="userOutbox" select="/bedework/system/userOutbox"/> 
    36933693            <input value="{$userOutbox}" name="userOutbox" /> 
    36943694            <div class="desc"> 
     
    37003700          <th>User Deleted Calendar Default name:</th> 
    37013701          <td> 
    3702             <xsl:variable name="deletedCalendar" select="/bedeworkadmin/system/deletedCalendar"/> 
     3702            <xsl:variable name="deletedCalendar" select="/bedework/system/deletedCalendar"/> 
    37033703            <input value="{$deletedCalendar}" name="deletedCalendar" /> 
    37043704            <div class="desc"> 
     
    37103710          <th>User Busy Calendar Default name:</th> 
    37113711          <td> 
    3712             <xsl:variable name="busyCalendar" select="/bedeworkadmin/system/busyCalendar"/> 
     3712            <xsl:variable name="busyCalendar" select="/bedework/system/busyCalendar"/> 
    37133713            <input value="{$busyCalendar}" name="busyCalendar" /> 
    37143714            <div class="desc"> 
     
    37203720          <th>Default user view name:</th> 
    37213721          <td> 
    3722             <xsl:variable name="defaultViewName" select="/bedeworkadmin/system/defaultUserViewName"/> 
     3722            <xsl:variable name="defaultViewName" select="/bedework/system/defaultUserViewName"/> 
    37233723            <input value="{$defaultViewName}" name="defaultUserViewName" /> 
    37243724            <div class="desc"> 
     
    37303730          <th>Http connections per user:</th> 
    37313731          <td> 
    3732             <xsl:variable name="httpPerUser" select="/bedeworkadmin/system/httpConnectionsPerUser"/> 
     3732            <xsl:variable name="httpPerUser" select="/bedework/system/httpConnectionsPerUser"/> 
    37333733            <input value="{$httpPerUser}" name="httpConnectionsPerUser" /> 
    37343734            <div class="desc"> 
     
    37393739          <th>Http connections per host:</th> 
    37403740          <td> 
    3741             <xsl:variable name="httpPerHost" select="/bedeworkadmin/system/httpConnectionsPerHost"/> 
     3741            <xsl:variable name="httpPerHost" select="/bedework/system/httpConnectionsPerHost"/> 
    37423742            <input value="{$httpPerHost}" name="httpConnectionsPerHost" /> 
    37433743            <div class="desc"> 
     
    37483748          <th>Total http connections:</th> 
    37493749          <td> 
    3750             <xsl:variable name="httpTotal" select="/bedeworkadmin/system/httpConnections"/> 
     3750            <xsl:variable name="httpTotal" select="/bedework/system/httpConnections"/> 
    37513751            <input value="{$httpTotal}" name="httpConnections" /> 
    37523752            <div class="desc"> 
     
    37573757          <th>Maximum length of public event description:</th> 
    37583758          <td> 
    3759             <xsl:variable name="maxPublicDescriptionLength" select="/bedeworkadmin/system/maxPublicDescriptionLength"/> 
     3759            <xsl:variable name="maxPublicDescriptionLength" select="/bedework/system/maxPublicDescriptionLength"/> 
    37603760            <input value="{$maxPublicDescriptionLength}" name="maxPublicDescriptionLength" /> 
    37613761            <div class="desc"> 
     
    37663766          <th>Maximum length of user event description:</th> 
    37673767          <td> 
    3768             <xsl:variable name="maxUserDescriptionLength" select="/bedeworkadmin/system/maxUserDescriptionLength"/> 
     3768            <xsl:variable name="maxUserDescriptionLength" select="/bedework/system/maxUserDescriptionLength"/> 
    37693769            <input value="{$maxUserDescriptionLength}" name="maxUserDescriptionLength" /> 
    37703770            <div class="desc"> 
     
    37753775          <th>Maximum size of a user entity:</th> 
    37763776          <td> 
    3777             <xsl:variable name="maxUserEntitySize" select="/bedeworkadmin/system/maxUserEntitySize"/> 
     3777            <xsl:variable name="maxUserEntitySize" select="/bedework/system/maxUserEntitySize"/> 
    37783778            <input value="{$maxUserEntitySize}" name="maxUserEntitySize" /> 
    37793779            <div class="desc"> 
     
    37843784          <th>Default user quota:</th> 
    37853785          <td> 
    3786             <xsl:variable name="defaultUserQuota" select="/bedeworkadmin/system/defaultUserQuota"/> 
     3786            <xsl:variable name="defaultUserQuota" select="/bedework/system/defaultUserQuota"/> 
    37873787            <input value="{$defaultUserQuota}" name="defaultUserQuota" /> 
    37883788            <div class="desc"> 
     
    37933793          <th>Max recurring instances:</th> 
    37943794          <td> 
    3795             <xsl:variable name="maxInstances" select="/bedeworkadmin/system/maxInstances"/> 
     3795            <xsl:variable name="maxInstances" select="/bedework/system/maxInstances"/> 
    37963796            <input value="{$maxInstances}" name="maxInstances" /> 
    37973797            <div class="desc"> 
     
    38033803          <th>Max recurring years:</th> 
    38043804          <td> 
    3805             <xsl:variable name="maxYears" select="/bedeworkadmin/system/maxYears"/> 
     3805            <xsl:variable name="maxYears" select="/bedework/system/maxYears"/> 
    38063806            <input value="{$maxYears}" name="maxYears" /> 
    38073807            <div class="desc"> 
     
    38133813          <th>User authorisation class:</th> 
    38143814          <td> 
    3815             <xsl:variable name="userauthClass" select="/bedeworkadmin/system/userauthClass"/> 
     3815            <xsl:variable name="userauthClass" select="/bedework/system/userauthClass"/> 
    38163816            <input value="{$userauthClass}" name="userauthClass" class="wide"/> 
    38173817            <div class="desc"> 
     
    38243824          <th>Mailer class:</th> 
    38253825          <td> 
    3826             <xsl:variable name="mailerClass" select="/bedeworkadmin/system/mailerClass"/> 
     3826            <xsl:variable name="mailerClass" select="/bedework/system/mailerClass"/> 
    38273827            <input value="{$mailerClass}" name="mailerClass" class="wide"/> 
    38283828            <div class="desc"> 
     
    38343834          <th>Admin groups class:</th> 
    38353835          <td> 
    3836             <xsl:variable name="admingroupsClass" select="/bedeworkadmin/system/admingroupsClass"/> 
     3836            <xsl:variable name="admingroupsClass" select="/bedework/system/admingroupsClass"/> 
    38373837            <input value="{$admingroupsClass}" name="admingroupsClass" class="wide"/> 
    38383838            <div class="desc"> 
     
    38453845          <th>User groups class:</th> 
    38463846          <td> 
    3847             <xsl:variable name="usergroupsClass" select="/bedeworkadmin/system/usergroupsClass"/> 
     3847            <xsl:variable name="usergroupsClass" select="/bedework/system/usergroupsClass"/> 
    38483848            <input value="{$usergroupsClass}" name="usergroupsClass" class="wide"/> 
    38493849            <div class="desc"> 
     
    38563856          <th>Directory browsing disallowed:</th> 
    38573857          <td> 
    3858             <xsl:variable name="directoryBrowsingDisallowed" select="/bedeworkadmin/system/directoryBrowsingDisallowed"/> 
     3858            <xsl:variable name="directoryBrowsingDisallowed" select="/bedework/system/directoryBrowsingDisallowed"/> 
    38593859            <input value="{$directoryBrowsingDisallowed}" name="directoryBrowsingDisallowed" /> 
    38603860            <div class="desc"> 
     
    38663866          <th>Index root:</th> 
    38673867          <td> 
    3868             <xsl:variable name="indexRoot" select="/bedeworkadmin/system/indexRoot"/> 
     3868            <xsl:variable name="indexRoot" select="/bedework/system/indexRoot"/> 
    38693869            <input value="{$indexRoot}" name="indexRoot" class="wide"/> 
    38703870            <div class="desc"> 
     
    40624062      <xsl:variable name="calPath" select="path"/> 
    40634063      <xsl:variable name="encodedCalPath" select="encodedPath"/> 
    4064       <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     4064      <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedework/userInfo/superUser='true'"> 
    40654065        <h3>Manage suite administrators</h3> 
    40664066        <table class="common" id="sharing"> 
     
    40954095                </xsl:if> 
    40964096                <xsl:choose> 
    4097                   <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"> 
     4097                  <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"> 
    40984098                    <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
    4099                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/> 
     4099                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/> 
    41004100                  </xsl:when> 
    4101                   <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"> 
     4101                  <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"> 
    41024102                    <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> 
    4103                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/> 
     4103                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/> 
    41044104                  </xsl:when> 
    41054105                  <xsl:when test="invert and $who='owner'"> 
     
    41404140                    <xsl:variable name="whoType"> 
    41414141                      <xsl:choose> 
    4142                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when> 
    4143                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when> 
     4142                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when> 
     4143                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when> 
    41444144                        <xsl:when test="$who='authenticated'">auth</xsl:when> 
    41454145                        <xsl:when test="invert/principal/property/owner">other</xsl:when> 
     
    41514151                    <xsl:variable name="shortWho"> 
    41524152                      <xsl:choose> 
    4153                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
    4154                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
     4153                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
     4154                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
    41554155                        <xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who --> 
    41564156                      </xsl:choose> 
     
    41764176      </xsl:if> 
    41774177 
    4178       <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     4178      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedework/userInfo/superUser='true'"> 
    41794179        <form name="calsuiteShareForm" action="{$calsuite-setAccess}" id="shareForm" method="post"> 
    41804180          <input type="hidden" name="calSuiteName" value="{$calSuiteName}"/> 
     
    42554255          </td> 
    42564256          <td> 
    4257             <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     4257            <xsl:value-of select="/bedework/currentCalSuite/name"/> 
    42584258          </td> 
    42594259        </tr> 
     
    42634263          </td> 
    42644264          <td> 
    4265             <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
     4265            <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/> 
    42664266            <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 
    42674267          </td> 
     
    42724272          </td> 
    42734273          <td> 
    4274             <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 
     4274            <xsl:variable name="preferredViewPeriod" select="/bedework/prefs/preferredViewPeriod"/> 
    42754275            <select name="viewPeriod"> 
    42764276              <!-- picking the selected item could be done with javascript. for 
     
    43244324          </td> 
    43254325          <td> 
    4326             <xsl:variable name="skinName" select="/bedeworkadmin/prefs/skinName"/> 
     4326            <xsl:variable name="skinName" select="/bedework/prefs/skinName"/> 
    43274327            <input type="text" name="skin" value="{$skinName}" size="40"/> 
    43284328          </td> 
     
    43334333          </td> 
    43344334          <td> 
    4335             <xsl:variable name="skinStyle" select="/bedeworkadmin/prefs/skinStyle"/> 
     4335            <xsl:variable name="skinStyle" select="/bedework/prefs/skinStyle"/> 
    43364336            <input type="text" name="skinStyle" value="{$skinStyle}" size="40"/> 
    43374337          </td> 
     
    43744374      </tr> 
    43754375 
    4376       <xsl:for-each select="bedeworkadmin/authUsers/authUser"> 
     4376      <xsl:for-each select="/bedework/authUsers/authUser"> 
    43774377        <!--<xsl:sort select="account" order="ascending" case-order="upper-first"/>--> 
    43784378        <tr> 
     
    44044404  <xsl:template name="modAuthUser"> 
    44054405    <h2>Update Administrator</h2> 
    4406     <xsl:variable name="modAuthUserAction" select="/bedeworkadmin/formElements/form/@action"/> 
     4406    <xsl:variable name="modAuthUserAction" select="/bedework/formElements/form/@action"/> 
    44074407    <form action="{$modAuthUserAction}" method="post"> 
    44084408      <table id="eventFormTable"> 
     
    44124412          </td> 
    44134413          <td> 
    4414             <xsl:value-of select="/bedeworkadmin/formElements/form/account"/> 
     4414            <xsl:value-of select="/bedework/formElements/form/account"/> 
    44154415          </td> 
    44164416        </tr> 
     
    44204420          </td> 
    44214421          <td> 
    4422             <xsl:copy-of select="/bedeworkadmin/formElements/form/alerts/*"/> 
     4422            <xsl:copy-of select="/bedework/formElements/form/alerts/*"/> 
    44234423          </td> 
    44244424        </tr> 
     
    44284428          </td> 
    44294429          <td> 
    4430             <xsl:copy-of select="/bedeworkadmin/formElements/form/publicEvents/*"/> 
     4430            <xsl:copy-of select="/bedework/formElements/form/publicEvents/*"/> 
    44314431          </td> 
    44324432        </tr> 
     
    44364436          </td> 
    44374437          <td> 
    4438             <xsl:copy-of select="/bedeworkadmin/formElements/form/superUser/*"/> 
     4438            <xsl:copy-of select="/bedework/formElements/form/superUser/*"/> 
    44394439          </td> 
    44404440        </tr> 
     
    44444444          </td> 
    44454445          <td> 
    4446             <xsl:copy-of select="/bedeworkadmin/formElements/form/email/*"/> 
     4446            <xsl:copy-of select="/bedework/formElements/form/email/*"/> 
    44474447            <span class="fieldInfo"></span> 
    44484448          </td> 
     
    44534453          </td> 
    44544454          <td> 
    4455             <xsl:copy-of select="/bedeworkadmin/formElements/form/phone/*"/> 
     4455            <xsl:copy-of select="/bedework/formElements/form/phone/*"/> 
    44564456            <span class="fieldInfo"></span> 
    44574457          </td> 
     
    44624462          </td> 
    44634463          <td> 
    4464             <xsl:copy-of select="/bedeworkadmin/formElements/form/dept/*"/> 
     4464            <xsl:copy-of select="/bedework/formElements/form/dept/*"/> 
    44654465            <span class="fieldInfo"></span> 
    44664466          </td> 
     
    44714471          </td> 
    44724472          <td> 
    4473             <xsl:copy-of select="/bedeworkadmin/formElements/form/lastName/*"/> 
     4473            <xsl:copy-of select="/bedework/formElements/form/lastName/*"/> 
    44744474            <span class="fieldInfo"></span> 
    44754475          </td> 
     
    44804480          </td> 
    44814481          <td> 
    4482             <xsl:copy-of select="/bedeworkadmin/formElements/form/firstName/*"/> 
     4482            <xsl:copy-of select="/bedework/formElements/form/firstName/*"/> 
    44834483            <span class="fieldInfo"></span> 
    44844484          </td> 
     
    45034503          </td> 
    45044504          <td> 
    4505             <xsl:value-of select="/bedeworkadmin/prefs/user"/> 
    4506             <xsl:variable name="user" select="/bedeworkadmin/prefs/user"/> 
     4505            <xsl:value-of select="/bedework/prefs/user"/> 
     4506            <xsl:variable name="user" select="/bedework/prefs/user"/> 
    45074507            <input type="hidden" name="user" value="{$user}"/> 
    45084508          </td> 
     
    45134513          </td> 
    45144514          <td> 
    4515             <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
     4515            <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/> 
    45164516            <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 
    45174517          </td> 
     
    45224522          </td> 
    45234523          <td> 
    4524             <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 
     4524            <xsl:variable name="preferredViewPeriod" select="/bedework/prefs/preferredViewPeriod"/> 
    45254525            <select name="viewPeriod"> 
    45264526              <!-- picking the selected item could be done with javascript. for 
     
    45744574          </td> 
    45754575          <td> 
    4576             <xsl:variable name="skinName" select="/bedeworkadmin/prefs/skinName"/> 
     4576            <xsl:variable name="skinName" select="/bedework/prefs/skinName"/> 
    45774577            <input type="text" name="skin" value="{$skinName}" size="40"/> 
    45784578          </td> 
     
    45834583          </td> 
    45844584          <td> 
    4585             <xsl:variable name="skinStyle" select="/bedeworkadmin/prefs/skinStyle"/> 
     4585            <xsl:variable name="skinStyle" select="/bedework/prefs/skinStyle"/> 
    45864586            <input type="text" name="skinStyle" value="{$skinStyle}" size="40"/> 
    45874587          </td> 
     
    46014601    <form name="adminGroupMembersForm" method="post" action="{$admingroup-initUpdate}"> 
    46024602      <xsl:choose> 
    4603         <xsl:when test="/bedeworkadmin/groups/showMembers='true'"> 
     4603        <xsl:when test="/bedework/groups/showMembers='true'"> 
    46044604          <input type="radio" name="showAgMembers" value="false" onclick="document.adminGroupMembersForm.submit();"/> 
    46054605          Hide members 
     
    46254625        <th>Name</th> 
    46264626        <th>Description</th> 
    4627         <xsl:if test="/bedeworkadmin/groups/showMembers='true'"> 
     4627        <xsl:if test="/bedework/groups/showMembers='true'"> 
    46284628          <th>Members</th> 
    46294629        </xsl:if> 
    46304630        <th></th> 
    46314631      </tr> 
    4632       <xsl:for-each select="/bedeworkadmin/groups/group"> 
     4632      <xsl:for-each select="/bedework/groups/group"> 
    46334633        <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    46344634        <xsl:variable name="groupName" select="name"/> 
     
    46424642            <xsl:value-of select="desc"/> 
    46434643          </td> 
    4644           <xsl:if test="/bedeworkadmin/groups/showMembers='true'"> 
     4644          <xsl:if test="/bedework/groups/showMembers='true'"> 
    46454645            <td> 
    46464646              <xsl:for-each select="members/member/account"> 
     
    46894689  <xsl:template name="modAdminGroup"> 
    46904690    <xsl:choose> 
    4691       <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     4691      <xsl:when test="/bedework/creating = 'true'"> 
    46924692        <h2>Add Group</h2> 
    46934693      </xsl:when> 
     
    47044704          <td> 
    47054705            <xsl:choose> 
    4706               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
    4707                 <xsl:copy-of select="/bedeworkadmin/formElements/form/name/*"/> 
     4706              <xsl:when test="/bedework/creating = 'true'"> 
     4707                <xsl:copy-of select="/bedework/formElements/form/name/*"/> 
    47084708              </xsl:when> 
    47094709              <xsl:otherwise> 
    4710                 <xsl:value-of select="/bedeworkadmin/formElements/form/name"/> 
     4710                <xsl:value-of select="/bedework/formElements/form/name"/> 
    47114711              </xsl:otherwise> 
    47124712            </xsl:choose> 
     
    47184718          </td> 
    47194719          <td> 
    4720             <xsl:copy-of select="/bedeworkadmin/formElements/form/desc/*"/> 
     4720            <xsl:copy-of select="/bedework/formElements/form/desc/*"/> 
    47214721          </td> 
    47224722        </tr> 
     
    47264726          </td> 
    47274727          <td> 
    4728             <xsl:copy-of select="/bedeworkadmin/formElements/form/groupOwner/*"/> 
     4728            <xsl:copy-of select="/bedework/formElements/form/groupOwner/*"/> 
    47294729          </td> 
    47304730        </tr> 
     
    47344734          </td> 
    47354735          <td> 
    4736             <xsl:copy-of select="/bedeworkadmin/formElements/form/eventsOwner/*"/> 
     4736            <xsl:copy-of select="/bedework/formElements/form/eventsOwner/*"/> 
    47374737          </td> 
    47384738        </tr> 
     
    47424742          <td> 
    47434743            <xsl:choose> 
    4744               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     4744              <xsl:when test="/bedework/creating = 'true'"> 
    47454745                <input type="submit" name="updateAdminGroup" value="Add Admin Group"/> 
    47464746                <input type="submit" name="cancelled" value="Cancel"/> 
     
    47854785        </td> 
    47864786        <td> 
    4787           <xsl:value-of select="/bedeworkadmin/adminGroup/name"/> 
     4787          <xsl:value-of select="/bedework/adminGroup/name"/> 
    47884788        </td> 
    47894789      </tr> 
     
    47944794        <td> 
    47954795          <table id="memberAccountList"> 
    4796             <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
     4796            <xsl:for-each select="/bedework/adminGroup/members/member"> 
    47974797              <xsl:choose> 
    47984798                <xsl:when test="kind='0'"><!-- kind = user --> 
     
    48494849    <p> 
    48504850      <strong> 
    4851         <xsl:value-of select="/bedeworkadmin/groups/group/name"/> 
     4851        <xsl:value-of select="/bedework/groups/group/name"/> 
    48524852      </strong>: 
    4853       <xsl:value-of select="/bedeworkadmin/groups/group/desc"/> 
     4853      <xsl:value-of select="/bedework/groups/group/desc"/> 
    48544854    </p> 
    48554855    <form name="adminGroupDelete" method="post" action="{$admingroup-delete}"> 
     
    49114911          Search: 
    49124912          <input type="text" name="query" size="15"> 
    4913             <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/searchResults/query"/></xsl:attribute> 
     4913            <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    49144914          </input> 
    49154915          <input type="submit" name="submit" value="go"/> 
    49164916          Limit: 
    49174917          <xsl:choose> 
    4918             <xsl:when test="/bedeworkadmin/searchResults/searchLimits = 'beforeToday'"> 
     4918            <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
    49194919              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
    49204920              <input type="radio" name="searchLimits" value="beforeToday" checked="checked"/>past dates 
    49214921              <input type="radio" name="searchLimits" value="none"/>all dates 
    49224922            </xsl:when> 
    4923             <xsl:when test="/bedeworkadmin/searchResults/searchLimits = 'none'"> 
     4923            <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
    49244924              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
    49254925              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     
    49394939      <tr> 
    49404940        <th colspan="5"> 
    4941           <xsl:if test="/bedeworkadmin/searchResults/numPages &gt; 1"> 
    4942             <xsl:variable name="curPage" select="/bedeworkadmin/searchResults/curPage"/> 
     4941          <xsl:if test="/bedework/searchResults/numPages &gt; 1"> 
     4942            <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
    49434943            <div id="searchPageForm"> 
    49444944              page: 
    4945               <xsl:if test="/bedeworkadmin/searchResults/curPage != 1"> 
     4945              <xsl:if test="/bedework/searchResults/curPage != 1"> 
    49464946                <xsl:variable name="prevPage" select="number($curPage) - 1"/> 
    49474947                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a> 
     
    49604960              <xsl:text> </xsl:text> 
    49614961              <xsl:choose> 
    4962                 <xsl:when test="$curPage != /bedeworkadmin/searchResults/numPages"> 
     4962                <xsl:when test="$curPage != /bedework/searchResults/numPages"> 
    49634963                  <xsl:variable name="nextPage" select="number($curPage) + 1"/> 
    49644964                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt; 
     
    49704970            </div> 
    49714971          </xsl:if> 
    4972           <xsl:value-of select="/bedeworkadmin/searchResults/resultSize"/> 
    4973           result<xsl:if test="/bedeworkadmin/searchResults/resultSize != 1">s</xsl:if> returned 
    4974           for <em><xsl:value-of select="/bedeworkadmin/searchResults/query"/></em> 
     4972          <xsl:value-of select="/bedework/searchResults/resultSize"/> 
     4973          result<xsl:if test="/bedework/searchResults/resultSize != 1">s</xsl:if> returned 
     4974          for <em><xsl:value-of select="/bedework/searchResults/query"/></em> 
    49754975        </th> 
    49764976      </tr> 
    4977       <xsl:if test="/bedeworkadmin/searchResults/searchResult"> 
     4977      <xsl:if test="/bedework/searchResults/searchResult"> 
    49784978        <tr class="fieldNames"> 
    49794979          <td> 
     
    49944994        </tr> 
    49954995      </xsl:if> 
    4996       <xsl:for-each select="/bedeworkadmin/searchResults/searchResult"> 
     4996      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    49974997        <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    49984998        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
     
    50395039  <xsl:template name="searchResultPageNav"> 
    50405040    <xsl:param name="page">1</xsl:param> 
    5041     <xsl:variable name="curPage" select="/bedeworkadmin/searchResults/curPage"/> 
    5042     <xsl:variable name="numPages" select="/bedeworkadmin/searchResults/numPages"/> 
     5041    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
     5042    <xsl:variable name="numPages" select="/bedework/searchResults/numPages"/> 
    50435043    <xsl:variable name="endPage"> 
    50445044      <xsl:choose> 
     
    50725072        <img id="logo" 
    50735073            alt="logo" 
    5074             src="{$resourcesRoot}/resources/bedeworkAdminLogo.gif" 
     5074            src="{$resourcesRoot}/resources/bedeworkLogo.gif" 
    50755075            width="217" 
    50765076            height="40" 
     
    50805080      <h1> 
    50815081        <xsl:choose> 
    5082           <xsl:when test="/bedeworkadmin/page='modEvent' or /bedeworkadmin/page='eventList' or /bedeworkadmin/page='displayEvent'"> 
     5082          <xsl:when test="/bedework/page='modEvent' or /bedework/page='eventList' or /bedework/page='displayEvent'"> 
    50835083            Manage Events 
    50845084          </xsl:when> 
    5085           <xsl:when test="/bedeworkadmin/page='contactList' or /bedeworkadmin/page='modContact' or /bedeworkadmin/page='deleteContactConfirm'"> 
     5085          <xsl:when test="/bedework/page='contactList' or /bedework/page='modContact' or /bedework/page='deleteContactConfirm'"> 
    50865086            Manage Contacts 
    50875087          </xsl:when> 
    5088           <xsl:when test="/bedeworkadmin/page='locationList' or /bedeworkadmin/page='modLocation' or /bedeworkadmin/page='deleteLocationConfirm'"> 
     5088          <xsl:when test="/bedework/page='locationList' or /bedework/page='modLocation' or /bedework/page='deleteLocationConfirm'"> 
    50895089            Manage Locations 
    50905090          </xsl:when> 
    5091           <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='calendarReferenced' or /bedeworkadmin/page='deleteCalendarConfirm'"> 
     5091          <xsl:when test="/bedework/page='calendarList' or /bedework/page='modCalendar' or /bedework/page='calendarReferenced' or /bedework/page='deleteCalendarConfirm'"> 
    50925092            Manage Calendars 
    50935093          </xsl:when> 
    5094           <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     5094          <xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    50955095            Public Calendars 
    50965096          </xsl:when> 
    5097           <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
     5097          <xsl:when test="/bedework/page='subscriptions' or /bedework/page='modSubscription'"> 
    50985098            Manage Subscriptions 
    50995099          </xsl:when> 
    5100           <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
     5100          <xsl:when test="/bedework/page='views' or /bedework/page='modView'"> 
    51015101            Manage Views 
    51025102          </xsl:when> 
    5103           <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     5103          <xsl:when test="/bedework/page='modSyspars'"> 
    51045104            Manage System Preferences 
    51055105          </xsl:when> 
    5106           <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 
     5106          <xsl:when test="/bedework/page='authUserList' or /bedework/page='modAuthUser'"> 
    51075107            Manage Public Events Administrators 
    51085108          </xsl:when> 
    5109           <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
     5109          <xsl:when test="/bedework/page='chooseGroup'"> 
    51105110            Choose Administrative Group 
    51115111          </xsl:when> 
    5112           <xsl:when test="/bedeworkadmin/page='adminGroupList' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroupMembers'"> 
     5112          <xsl:when test="/bedework/page='adminGroupList' or /bedework/page='modAdminGroup' or /bedework/page='modAdminGroup' or /bedework/page='modAdminGroupMembers'"> 
    51135113            Manage Administrative Groups 
    51145114          </xsl:when> 
    5115           <xsl:when test="/bedeworkadmin/page='noGroup'"> 
     5115          <xsl:when test="/bedework/page='noGroup'"> 
    51165116            No Administrative Group 
    51175117          </xsl:when> 
    5118           <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
     5118          <xsl:when test="/bedework/page='uploadTimezones'"> 
    51195119            Manage Time Zones 
    51205120          </xsl:when> 
    5121           <xsl:when test="/bedeworkadmin/page='noAccess'"> 
     5121          <xsl:when test="/bedework/page='noAccess'"> 
    51225122            Access Denied 
    51235123          </xsl:when> 
    5124           <xsl:when test="/bedeworkadmin/page='error'"> 
     5124          <xsl:when test="/bedework/page='error'"> 
    51255125            Error 
    51265126          </xsl:when> 
     
    51315131      </h1> 
    51325132 
    5133       <xsl:if test="/bedeworkadmin/message"> 
     5133      <xsl:if test="/bedework/message"> 
    51345134        <div id="messages"> 
    51355135          <p> 
    5136             <xsl:apply-templates select="/bedeworkadmin/message"/> 
     5136            <xsl:apply-templates select="/bedework/message"/> 
    51375137          </p> 
    51385138        </div> 
    51395139      </xsl:if> 
    5140       <xsl:if test="/bedeworkadmin/error"> 
     5140      <xsl:if test="/bedework/error"> 
    51415141        <div id="errors"> 
    51425142          <p> 
    5143             <xsl:apply-templates select="/bedeworkadmin/error"/> 
     5143            <xsl:apply-templates select="/bedework/error"/> 
    51445144          </p> 
    51455145        </div> 
     
    51545154          <a href="{$logout}">Log Out</a> 
    51555155        </td> 
    5156         <xsl:if test="/bedeworkadmin/userInfo/user"> 
     5156        <xsl:if test="/bedework/userInfo/user"> 
    51575157          <td class="rightCell"> 
    5158             <xsl:if test="/bedeworkadmin/currentCalSuite/name"> 
     5158            <xsl:if test="/bedework/currentCalSuite/name"> 
    51595159              Calendar Suite: 
    51605160              <span class="status"> 
    5161                 <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     5161                <xsl:value-of select="/bedework/currentCalSuite/name"/> 
    51625162              </span> 
    51635163              &#160; 
     
    51655165            Logged in as: 
    51665166            <span class="status"> 
    5167               <xsl:value-of select="/bedeworkadmin/userInfo/user"/> 
     5167              <xsl:value-of select="/bedework/userInfo/user"/> 
    51685168            </span> 
    51695169            &#160; 
    5170             <xsl:if test="/bedeworkadmin/userInfo/group"> 
     5170            <xsl:if test="/bedework/userInfo/group"> 
    51715171              Group: 
    51725172              <span class="status"> 
    5173                 <xsl:value-of select="/bedeworkadmin/userInfo/group"/> 
     5173                <xsl:value-of select="/bedework/userInfo/group"/> 
    51745174              </span> 
    51755175            </xsl:if> 
  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1548 r1554  
    5151  <xsl:variable name="resourcesRoot" select="'https://mywebserver.edu/myresourcesdir'"/> 
    5252    --> 
    53   <xsl:variable name="resourcesRoot" select="/bedeworkadmin/approot"/> 
     53  <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    5454 
    5555  <!-- URL of the XSL template directory --> 
     
    6060       reference it explicitly.  It is not used in this stylesheet, however, 
    6161       and can be safely removed if you so choose. --> 
    62   <xsl:variable name="appRoot" select="/bedeworkadmin/approot"/> 
     62  <xsl:variable name="appRoot" select="/bedework/approot"/> 
    6363 
    6464  <!-- Properly encoded prefixes to the application actions; use these to build 
     
    6666       we will probably change the way we create these before long (e.g. build them 
    6767       dynamically in the xslt). --> 
    68   <xsl:variable name="setup" select="/bedeworkadmin/urlPrefixes/setup/a/@href"/> 
    69   <xsl:variable name="logout" select="/bedeworkadmin/urlPrefixes/logout/a/@href"/> 
    70   <xsl:variable name="search" select="/bedeworkadmin/urlPrefixes/search/search/a/@href"/> 
    71   <xsl:variable name="search-next" select="/bedeworkadmin/urlPrefixes/search/next/a/@href"/> 
     68  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup/a/@href"/> 
     69  <xsl:variable name="logout" select="/bedework/urlPrefixes/logout/a/@href"/> 
     70  <xsl:variable name="search" select="/bedework/urlPrefixes/search/search/a/@href"/> 
     71  <xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next/a/@href"/> 
    7272  <!-- events --> 
    73   <xsl:variable name="event-showEvent" select="/bedeworkadmin/urlPrefixes/event/showEvent/a/@href"/> 
    74   <xsl:variable name="event-showModForm" select="/bedeworkadmin/urlPrefixes/event/showModForm/a/@href"/> 
    75   <xsl:variable name="event-showUpdateList" select="/bedeworkadmin/urlPrefixes/event/showUpdateList/a/@href"/> 
    76   <xsl:variable name="event-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/event/showDeleteConfirm/a/@href"/> 
    77   <xsl:variable name="event-initAddEvent" select="/bedeworkadmin/urlPrefixes/event/initAddEvent/a/@href"/> 
    78   <xsl:variable name="event-initUpdateEvent" select="/bedeworkadmin/urlPrefixes/event/initUpdateEvent/a/@href"/> 
    79   <xsl:variable name="event-delete" select="/bedeworkadmin/urlPrefixes/event/delete/a/@href"/> 
    80   <xsl:variable name="event-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/event/fetchForDisplay/a/@href"/> 
    81   <xsl:variable name="event-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/event/fetchForUpdate/a/@href"/> 
    82   <xsl:variable name="event-update" select="/bedeworkadmin/urlPrefixes/event/update/a/@href"/> 
    83   <xsl:variable name="event-selectCalForEvent" select="/bedeworkadmin/urlPrefixes/event/selectCalForEvent/a/@href"/> 
    84   <xsl:variable name="event-showRdates" select="/bedeworkadmin/urlPrefixes/event/showRdates"/> 
    85   <xsl:variable name="event-setRdate" select="/bedeworkadmin/urlPrefixes/event/setRdate"/> 
    86   <xsl:variable name="event-initUpload" select="/bedeworkadmin/urlPrefixes/event/initUpload/a/@href"/> 
    87   <xsl:variable name="event-upload" select="/bedeworkadmin/urlPrefixes/event/upload/a/@href"/> 
     73  <xsl:variable name="event-showEvent" select="/bedework/urlPrefixes/event/showEvent/a/@href"/> 
     74  <xsl:variable name="event-showModForm" select="/bedework/urlPrefixes/event/showModForm/a/@href"/> 
     75  <xsl:variable name="event-showUpdateList" select="/bedework/urlPrefixes/event/showUpdateList/a/@href"/> 
     76  <xsl:variable name="event-showDeleteConfirm" select="/bedework/urlPrefixes/event/showDeleteConfirm/a/@href"/> 
     77  <xsl:variable name="event-initAddEvent" select="/bedework/urlPrefixes/event/initAddEvent/a/@href"/> 
     78  <xsl:variable name="event-initUpdateEvent" select="/bedework/urlPrefixes/event/initUpdateEvent/a/@href"/> 
     79  <xsl:variable name="event-delete" select="/bedework/urlPrefixes/event/delete/a/@href"/> 
     80  <xsl:variable name="event-fetchForDisplay" select="/bedework/urlPrefixes/event/fetchForDisplay/a/@href"/> 
     81  <xsl:variable name="event-fetchForUpdate" select="/bedework/urlPrefixes/event/fetchForUpdate/a/@href"/> 
     82  <xsl:variable name="event-update" select="/bedework/urlPrefixes/event/update/a/@href"/> 
     83  <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
     84  <xsl:variable name="event-showRdates" select="/bedework/urlPrefixes/event/showRdates"/> 
     85  <xsl:variable name="event-setRdate" select="/bedework/urlPrefixes/event/setRdate"/> 
     86  <xsl:variable name="event-initUpload" select="/bedework/urlPrefixes/event/initUpload/a/@href"/> 
     87  <xsl:variable name="event-upload" select="/bedework/urlPrefixes/event/upload/a/@href"/> 
    8888  <!-- contacts --> 
    89   <xsl:variable name="contact-showContact" select="/bedeworkadmin/urlPrefixes/contact/showContact/a/@href"/> 
    90   <xsl:variable name="contact-showReferenced" select="/bedeworkadmin/urlPrefixes/contact/showReferenced/a/@href"/> 
    91   <xsl:variable name="contact-showModForm" select="/bedeworkadmin/urlPrefixes/contact/showModForm/a/@href"/> 
    92   <xsl:variable name="contact-showUpdateList" select="/bedeworkadmin/urlPrefixes/contact/showUpdateList/a/@href"/> 
    93   <xsl:variable name="contact-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/contact/showDeleteConfirm/a/@href"/> 
    94   <xsl:variable name="contact-initAdd" select="/bedeworkadmin/urlPrefixes/contact/initAdd/a/@href"/> 
    95   <xsl:variable name="contact-initUpdate" select="/bedeworkadmin/urlPrefixes/contact/initUpdate/a/@href"/> 
    96   <xsl:variable name="contact-delete" select="/bedeworkadmin/urlPrefixes/contact/delete/a/@href"/> 
    97   <xsl:variable name="contact-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/contact/fetchForDisplay/a/@href"/> 
    98   <xsl:variable name="contact-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/contact/fetchForUpdate/a/@href"/> 
    99   <xsl:variable name="contact-update" select="/bedeworkadmin/urlPrefixes/contact/update/a/@href"/> 
     89  <xsl:variable name="contact-showContact" select="/bedework/urlPrefixes/contact/showContact/a/@href"/> 
     90  <xsl:variable name="contact-showReferenced" select="/bedework/urlPrefixes/contact/showReferenced/a/@href"/> 
     91  <xsl:variable name="contact-showModForm" select="/bedework/urlPrefixes/contact/showModForm/a/@href"/> 
     92  <xsl:variable name="contact-showUpdateList" select="/bedework/urlPrefixes/contact/showUpdateList/a/@href"/> 
     93  <xsl:variable name="contact-showDeleteConfirm" select="/bedework/urlPrefixes/contact/showDeleteConfirm/a/@href"/> 
     94  <xsl:variable name="contact-initAdd" select="/bedework/urlPrefixes/contact/initAdd/a/@href"/> 
     95  <xsl:variable name="contact-initUpdate" select="/bedework/urlPrefixes/contact/initUpdate/a/@href"/> 
     96  <xsl:variable name="contact-delete" select="/bedework/urlPrefixes/contact/delete/a/@href"/> 
     97  <xsl:variable name="contact-fetchForDisplay" select="/bedework/urlPrefixes/contact/fetchForDisplay/a/@href"/> 
     98  <xsl:variable name="contact-fetchForUpdate" select="/bedework/urlPrefixes/contact/fetchForUpdate/a/@href"/> 
     99  <xsl:variable name="contact-update" select="/bedework/urlPrefixes/contact/update/a/@href"/> 
    100100  <!-- locations --> 
    101   <xsl:variable name="location-showLocation" select="/bedeworkadmin/urlPrefixes/location/showLocation/a/@href"/> 
    102   <xsl:variable name="location-showReferenced" select="/bedeworkadmin/urlPrefixes/location/showReferenced/a/@href"/> 
    103   <xsl:variable name="location-showModForm" select="/bedeworkadmin/urlPrefixes/location/showModForm/a/@href"/> 
    104   <xsl:variable name="location-showUpdateList" select="/bedeworkadmin/urlPrefixes/location/showUpdateList/a/@href"/> 
    105   <xsl:variable name="location-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/location/showDeleteConfirm/a/@href"/> 
    106   <xsl:variable name="location-initAdd" select="/bedeworkadmin/urlPrefixes/location/initAdd/a/@href"/> 
    107   <xsl:variable name="location-initUpdate" select="/bedeworkadmin/urlPrefixes/location/initUpdate/a/@href"/> 
    108   <xsl:variable name="location-delete" select="/bedeworkadmin/urlPrefixes/location/delete/a/@href"/> 
    109   <xsl:variable name="location-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/location/fetchForDisplay/a/@href"/> 
    110   <xsl:variable name="location-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/location/fetchForUpdate/a/@href"/> 
    111   <xsl:variable name="location-update" select="/bedeworkadmin/urlPrefixes/location/update/a/@href"/> 
     101  <xsl:variable name="location-showLocation" select="/bedework/urlPrefixes/location/showLocation/a/@href"/> 
     102  <xsl:variable name="location-showReferenced" select="/bedework/urlPrefixes/location/showReferenced/a/@href"/> 
     103  <xsl:variable name="location-showModForm" select="/bedework/urlPrefixes/location/showModForm/a/@href"/> 
     104  <xsl:variable name="location-showUpdateList" select="/bedework/urlPrefixes/location/showUpdateList/a/@href"/> 
     105  <xsl:variable name="location-showDeleteConfirm" select="/bedework/urlPrefixes/location/showDeleteConfirm/a/@href"/> 
     106  <xsl:variable name="location-initAdd" select="/bedework/urlPrefixes/location/initAdd/a/@href"/> 
     107  <xsl:variable name="location-initUpdate" select="/bedework/urlPrefixes/location/initUpdate/a/@href"/> 
     108  <xsl:variable name="location-delete" select="/bedework/urlPrefixes/location/delete/a/@href"/> 
     109  <xsl:variable name="location-fetchForDisplay" select="/bedework/urlPrefixes/location/fetchForDisplay/a/@href"/> 
     110  <xsl:variable name="location-fetchForUpdate" select="/bedework/urlPrefixes/location/fetchForUpdate/a/@href"/> 
     111  <xsl:variable name="location-update" select="/bedework/urlPrefixes/location/update/a/@href"/> 
    112112  <!-- categories --> 
    113   <xsl:variable name="category-showReferenced" select="/bedeworkadmin/urlPrefixes/category/showReferenced/a/@href"/> 
    114   <xsl:variable name="category-showModForm" select="/bedeworkadmin/urlPrefixes/category/showModForm/a/@href"/> 
    115   <xsl:variable name="category-showUpdateList" select="/bedeworkadmin/urlPrefixes/category/showUpdateList/a/@href"/> 
    116   <xsl:variable name="category-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/category/showDeleteConfirm/a/@href"/> 
    117   <xsl:variable name="category-initAdd" select="/bedeworkadmin/urlPrefixes/category/initAdd/a/@href"/> 
    118   <xsl:variable name="category-initUpdate" select="/bedeworkadmin/urlPrefixes/category/initUpdate/a/@href"/> 
    119   <xsl:variable name="category-delete" select="/bedeworkadmin/urlPrefixes/category/delete/a/@href"/> 
    120   <xsl:variable name="category-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/category/fetchForUpdate/a/@href"/> 
    121   <xsl:variable name="category-update" select="/bedeworkadmin/urlPrefixes/category/update/a/@href"/> 
     113  <xsl:variable name="category-showReferenced" select="/bedework/urlPrefixes/category/showReferenced/a/@href"/> 
     114  <xsl:variable name="category-showModForm" select="/bedework/urlPrefixes/category/showModForm/a/@href"/> 
     115  <xsl:variable name="category-showUpdateList" select="/bedework/urlPrefixes/category/showUpdateList/a/@href"/> 
     116  <xsl:variable name="category-showDeleteConfirm" select="/bedework/urlPrefixes/category/showDeleteConfirm/a/@href"/> 
     117  <xsl:variable name="category-initAdd" select="/bedework/urlPrefixes/category/initAdd/a/@href"/> 
     118  <xsl:variable name="category-initUpdate" select="/bedework/urlPrefixes/category/initUpdate/a/@href"/> 
     119  <xsl:variable name="category-delete" select="/bedework/urlPrefixes/category/delete/a/@href"/> 
     120  <xsl:variable name="category-fetchForUpdate" select="/bedework/urlPrefixes/category/fetchForUpdate/a/@href"/> 
     121  <xsl:variable name="category-update" select="/bedework/urlPrefixes/category/update/a/@href"/> 
    122122  <!-- calendars --> 
    123   <xsl:variable name="calendar-fetch" select="/bedeworkadmin/urlPrefixes/calendar/fetch/a/@href"/> 
    124   <xsl:variable name="calendar-fetchDescriptions" select="/bedeworkadmin/urlPrefixes/calendar/fetchDescriptions/a/@href"/> 
    125   <xsl:variable name="calendar-initAdd" select="/bedeworkadmin/urlPrefixes/calendar/initAdd/a/@href"/> 
    126   <xsl:variable name="calendar-delete" select="/bedeworkadmin/urlPrefixes/calendar/delete/a/@href"/> 
    127   <xsl:variable name="calendar-fetchForDisplay" select="/bedeworkadmin/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
    128   <xsl:variable name="calendar-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/calendar/fetchForUpdate/a/@href"/> 
    129   <xsl:variable name="calendar-update" select="/bedeworkadmin/urlPrefixes/calendar/update/a/@href"/> 
    130   <xsl:variable name="calendar-setAccess" select="/bedeworkadmin/urlPrefixes/calendar/setAccess/a/@href"/> 
    131   <xsl:variable name="calendar-openCloseMod" select="/bedeworkadmin/urlPrefixes/calendar/calOpenCloseMod/a/@href"/> 
    132   <xsl:variable name="calendar-openCloseSelect" select="/bedeworkadmin/urlPrefixes/calendar/calOpenCloseSelect/a/@href"/> 
    133   <xsl:variable name="calendar-openCloseDisplay" select="/bedeworkadmin/urlPrefixes/calendar/calOpenCloseDisplay/a/@href"/> 
    134   <xsl:variable name="calendar-openCloseMove" select="/bedeworkadmin/urlPrefixes/calendar/calOpenCloseMove/a/@href"/> 
    135   <xsl:variable name="calendar-move" select="/bedeworkadmin/urlPrefixes/calendar/move/a/@href"/> 
     123  <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/> 
     124  <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/> 
     125  <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/> 
     126  <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
     127  <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
     128  <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/> 
     129  <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/> 
     130  <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
     131  <xsl:variable name="calendar-openCloseMod" select="/bedework/urlPrefixes/calendar/calOpenCloseMod/a/@href"/> 
     132  <xsl:variable name="calendar-openCloseSelect" select="/bedework/urlPrefixes/calendar/calOpenCloseSelect/a/@href"/> 
     133  <xsl:variable name="calendar-openCloseDisplay" select="/bedework/urlPrefixes/calendar/calOpenCloseDisplay/a/@href"/> 
     134  <xsl:variable name="calendar-openCloseMove" select="/bedework/urlPrefixes/calendar/calOpenCloseMove/a/@href"/> 
     135  <xsl:variable name="calendar-move" select="/bedework/urlPrefixes/calendar/move/a/@href"/> 
    136136  <!-- subscriptions --> 
    137   <xsl:variable name="subscriptions-fetch" select="/bedeworkadmin/urlPrefixes/subscriptions/fetch/a/@href"/> 
    138   <xsl:variable name="subscriptions-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    139   <xsl:variable name="subscriptions-initAdd" select="/bedeworkadmin/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    140   <xsl:variable name="subscriptions-subscribe" select="/bedeworkadmin/urlPrefixes/subscriptions/subscribe/a/@href"/> 
    141   <xsl:variable name="subscriptions-openCloseMod" select="/bedeworkadmin/urlPrefixes/subscriptions/subOpenCloseMod/a/@href"/> 
     137  <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
     138  <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
     139  <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
     140  <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
     141  <xsl:variable name="subscriptions-openCloseMod" select="/bedework/urlPrefixes/subscriptions/subOpenCloseMod/a/@href"/> 
    142142  <!-- views --> 
    143   <xsl:variable name="view-fetch" select="/bedeworkadmin/urlPrefixes/view/fetch/a/@href"/> 
    144   <xsl:variable name="view-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/view/fetchForUpdate/a/@href"/> 
    145   <xsl:variable name="view-addView" select="/bedeworkadmin/urlPrefixes/view/addView/a/@href"/> 
    146   <xsl:variable name="view-update" select="/bedeworkadmin/urlPrefixes/view/update/a/@href"/> 
    147   <xsl:variable name="view-remove" select="/bedeworkadmin/urlPrefixes/view/remove/a/@href"/> 
     143  <xsl:variable name="view-fetch" select="/bedework/urlPrefixes/view/fetch/a/@href"/> 
     144  <xsl:variable name="view-fetchForUpdate" select="/bedework/urlPrefixes/view/fetchForUpdate/a/@href"/> 
     145  <xsl:variable name="view-addView" select="/bedework/urlPrefixes/view/addView/a/@href"/> 
     146  <xsl:variable name="view-update" select="/bedework/urlPrefixes/view/update/a/@href"/> 
     147  <xsl:variable name="view-remove" select="/bedework/urlPrefixes/view/remove/a/@href"/> 
    148148  <!-- system --> 
    149   <xsl:variable name="system-fetch" select="/bedeworkadmin/urlPrefixes/system/fetch/a/@href"/> 
    150   <xsl:variable name="system-update" select="/bedeworkadmin/urlPrefixes/system/update/a/@href"/> 
     149  <xsl:variable name="system-fetch" select="/bedework/urlPrefixes/system/fetch/a/@href"/> 
     150  <xsl:variable name="system-update" select="/bedework/urlPrefixes/system/update/a/@href"/> 
    151151  <!-- calsuites --> 
    152   <xsl:variable name="calsuite-fetch" select="/bedeworkadmin/urlPrefixes/calsuite/fetch/a/@href"/> 
    153   <xsl:variable name="calsuite-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/calsuite/fetchForUpdate/a/@href"/> 
    154   <xsl:variable name="calsuite-add" select="/bedeworkadmin/urlPrefixes/calsuite/add/a/@href"/> 
    155   <xsl:variable name="calsuite-update" select="/bedeworkadmin/urlPrefixes/calsuite/update/a/@href"/> 
    156   <xsl:variable name="calsuite-showAddForm" select="/bedeworkadmin/urlPrefixes/calsuite/showAddForm/a/@href"/> 
    157   <xsl:variable name="calsuite-setAccess" select="/bedeworkadmin/urlPrefixes/calsuite/setAccess/a/@href"/> 
    158   <xsl:variable name="calsuite-fetchPrefsForUpdate" select="/bedeworkadmin/urlPrefixes/calsuite/fetchPrefsForUpdate/a/@href"/> 
    159   <xsl:variable name="calsuite-updatePrefs" select="/bedeworkadmin/urlPrefixes/calsuite/updatePrefs/a/@href"/> 
     152  <xsl:variable name="calsuite-fetch" select="/bedework/urlPrefixes/calsuite/fetch/a/@href"/> 
     153  <xsl:variable name="calsuite-fetchForUpdate" select="/bedework/urlPrefixes/calsuite/fetchForUpdate/a/@href"/> 
     154  <xsl:variable name="calsuite-add" select="/bedework/urlPrefixes/calsuite/add/a/@href"/> 
     155  <xsl:variable name="calsuite-update" select="/bedework/urlPrefixes/calsuite/update/a/@href"/> 
     156  <xsl:variable name="calsuite-showAddForm" select="/bedework/urlPrefixes/calsuite/showAddForm/a/@href"/> 
     157  <xsl:variable name="calsuite-setAccess" select="/bedework/urlPrefixes/calsuite/setAccess/a/@href"/> 
     158  <xsl:variable name="calsuite-fetchPrefsForUpdate" select="/bedework/urlPrefixes/calsuite/fetchPrefsForUpdate/a/@href"/> 
     159  <xsl:variable name="calsuite-updatePrefs" select="/bedework/urlPrefixes/calsuite/updatePrefs/a/@href"/> 
    160160  <!-- timezones and stats --> 
    161   <xsl:variable name="timezones-initUpload" select="/bedeworkadmin/urlPrefixes/timezones/initUpload/a/@href"/> 
    162   <xsl:variable name="timezones-upload" select="/bedeworkadmin/urlPrefixes/timezones/upload/a/@href"/> 
    163   <xsl:variable name="timezones-fix" select="/bedeworkadmin/urlPrefixes/timezones/fix/a/@href"/> 
    164   <xsl:variable name="stats-update" select="/bedeworkadmin/urlPrefixes/stats/update/a/@href"/> 
     161  <xsl:variable name="timezones-initUpload" select="/bedework/urlPrefixes/timezones/initUpload/a/@href"/> 
     162  <xsl:variable name="timezones-upload" select="/bedework/urlPrefixes/timezones/upload/a/@href"/> 
     163  <xsl:variable name="timezones-fix" select="/bedework/urlPrefixes/timezones/fix/a/@href"/> 
     164  <xsl:variable name="stats-update" select="/bedework/urlPrefixes/stats/update/a/@href"/> 
    165165  <!-- authuser and prefs --> 
    166   <xsl:variable name="authuser-showModForm" select="/bedeworkadmin/urlPrefixes/authuser/showModForm/a/@href"/> 
    167   <xsl:variable name="authuser-showUpdateList" select="/bedeworkadmin/urlPrefixes/authuser/showUpdateList/a/@href"/> 
    168   <xsl:variable name="authuser-initUpdate" select="/bedeworkadmin/urlPrefixes/authuser/initUpdate/a/@href"/> 
    169   <xsl:variable name="authuser-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/authuser/fetchForUpdate/a/@href"/> 
    170   <xsl:variable name="authuser-update" select="/bedeworkadmin/urlPrefixes/authuser/update/a/@href"/> 
    171   <xsl:variable name="prefs-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
    172   <xsl:variable name="prefs-update" select="/bedeworkadmin/urlPrefixes/prefs/update/a/@href"/> 
     166  <xsl:variable name="authuser-showModForm" select="/bedework/urlPrefixes/authuser/showModForm/a/@href"/> 
     167  <xsl:variable name="authuser-showUpdateList" select="/bedework/urlPrefixes/authuser/showUpdateList/a/@href"/> 
     168  <xsl:variable name="authuser-initUpdate" select="/bedework/urlPrefixes/authuser/initUpdate/a/@href"/> 
     169  <xsl:variable name="authuser-fetchForUpdate" select="/bedework/urlPrefixes/authuser/fetchForUpdate/a/@href"/> 
     170  <xsl:variable name="authuser-update" select="/bedework/urlPrefixes/authuser/update/a/@href"/> 
     171  <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
     172  <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
    173173  <!-- admin groups --> 
    174   <xsl:variable name="admingroup-showModForm" select="/bedeworkadmin/urlPrefixes/admingroup/showModForm/a/@href"/> 
    175   <xsl:variable name="admingroup-showModMembersForm" select="/bedeworkadmin/urlPrefixes/admingroup/showModMembersForm/a/@href"/> 
    176   <xsl:variable name="admingroup-showUpdateList" select="/bedeworkadmin/urlPrefixes/admingroup/showUpdateList/a/@href"/> 
    177   <xsl:variable name="admingroup-showChooseGroup" select="/bedeworkadmin/urlPrefixes/admingroup/showChooseGroup/a/@href"/> 
    178   <xsl:variable name="admingroup-showDeleteConfirm" select="/bedeworkadmin/urlPrefixes/admingroup/showDeleteConfirm/a/@href"/> 
    179   <xsl:variable name="admingroup-initAdd" select="/bedeworkadmin/urlPrefixes/admingroup/initAdd/a/@href"/> 
    180   <xsl:variable name="admingroup-initUpdate" select="/bedeworkadmin/urlPrefixes/admingroup/initUpdate/a/@href"/> 
    181   <xsl:variable name="admingroup-delete" select="/bedeworkadmin/urlPrefixes/admingroup/delete/a/@href"/> 
    182   <xsl:variable name="admingroup-fetchUpdateList" select="/bedeworkadmin/urlPrefixes/admingroup/fetchUpdateList/a/@href"/> 
    183   <xsl:variable name="admingroup-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/admingroup/fetchForUpdate/a/@href"/> 
    184   <xsl:variable name="admingroup-fetchForUpdateMembers" select="/bedeworkadmin/urlPrefixes/admingroup/fetchForUpdateMembers/a/@href"/> 
    185   <xsl:variable name="admingroup-update" select="/bedeworkadmin/urlPrefixes/admingroup/update/a/@href"/> 
    186   <xsl:variable name="admingroup-updateMembers" select="/bedeworkadmin/urlPrefixes/admingroup/updateMembers/a/@href"/> 
    187   <xsl:variable name="admingroup-switch" select="/bedeworkadmin/urlPrefixes/admingroup/switch/a/@href"/> 
     174  <xsl:variable name="admingroup-showModForm" select="/bedework/urlPrefixes/admingroup/showModForm/a/@href"/> 
     175  <xsl:variable name="admingroup-showModMembersForm" select="/bedework/urlPrefixes/admingroup/showModMembersForm/a/@href"/> 
     176  <xsl:variable name="admingroup-showUpdateList" select="/bedework/urlPrefixes/admingroup/showUpdateList/a/@href"/> 
     177  <xsl:variable name="admingroup-showChooseGroup" select="/bedework/urlPrefixes/admingroup/showChooseGroup/a/@href"/> 
     178  <xsl:variable name="admingroup-showDeleteConfirm" select="/bedework/urlPrefixes/admingroup/showDeleteConfirm/a/@href"/> 
     179  <xsl:variable name="admingroup-initAdd" select="/bedework/urlPrefixes/admingroup/initAdd/a/@href"/> 
     180  <xsl:variable name="admingroup-initUpdate" select="/bedework/urlPrefixes/admingroup/initUpdate/a/@href"/> 
     181  <xsl:variable name="admingroup-delete" select="/bedework/urlPrefixes/admingroup/delete/a/@href"/> 
     182  <xsl:variable name="admingroup-fetchUpdateList" select="/bedework/urlPrefixes/admingroup/fetchUpdateList/a/@href"/> 
     183  <xsl:variable name="admingroup-fetchForUpdate" select="/bedework/urlPrefixes/admingroup/fetchForUpdate/a/@href"/> 
     184  <xsl:variable name="admingroup-fetchForUpdateMembers" select="/bedework/urlPrefixes/admingroup/fetchForUpdateMembers/a/@href"/> 
     185  <xsl:variable name="admingroup-update" select="/bedework/urlPrefixes/admingroup/update/a/@href"/> 
     186  <xsl:variable name="admingroup-updateMembers" select="/bedework/urlPrefixes/admingroup/updateMembers/a/@href"/> 
     187  <xsl:variable name="admingroup-switch" select="/bedework/urlPrefixes/admingroup/switch/a/@href"/> 
    188188 
    189189  <!-- URL of the web application - includes web context --> 
    190   <xsl:variable name="urlPrefix" select="/bedeworkadmin/urlprefix"/> 
     190  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/> 
    191191 
    192192  <!-- Other generally useful global variables --> 
     
    206206        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    207207        <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 
    208         <xsl:if test="/bedeworkadmin/page='modEvent' or 
    209                       /bedeworkadmin/page='rdates'"> 
     208        <xsl:if test="/bedework/page='modEvent' or 
     209                      /bedework/page='rdates'"> 
    210210          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    211211          <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script> 
     
    218218          </xsl:if> 
    219219        </xsl:if> 
    220         <xsl:if test="/bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='modCalSuite'"> 
     220        <xsl:if test="/bedework/page='modCalendar' or /bedework/page='modCalSuite'"> 
    221221          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    222222          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script> 
    223223        </xsl:if> 
    224         <xsl:if test="/bedeworkadmin/page='upload' or /bedeworkadmin/page='selectCalForEvent'"> 
     224        <xsl:if test="/bedework/page='upload' or /bedework/page='selectCalForEvent'"> 
    225225          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
    226226        </xsl:if> 
    227         <xsl:if test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     227        <xsl:if test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    228228          <link rel="stylesheet" href="{$resourcesRoot}/resources/calendarDescriptions.css"/> 
    229229        </xsl:if> 
     
    244244      <body onload="focusFirstElement()"> 
    245245        <xsl:choose> 
    246           <xsl:when test="/bedeworkadmin/page='selectCalForEvent'"> 
     246          <xsl:when test="/bedework/page='selectCalForEvent'"> 
    247247            <xsl:call-template name="selectCalForEvent"/> 
    248248          </xsl:when> 
    249           <xsl:when test="/bedeworkadmin/page='rdates'"> 
     249          <xsl:when test="/bedework/page='rdates'"> 
    250250            <xsl:call-template name="rdates"/> 
    251251          </xsl:when> 
     
    254254            <div id="content"> 
    255255              <xsl:choose> 
    256                 <xsl:when test="/bedeworkadmin/page='eventList'"> 
     256                <xsl:when test="/bedework/page='eventList'"> 
    257257                  <xsl:call-template name="eventList"/> 
    258258                </xsl:when> 
    259                 <xsl:when test="/bedeworkadmin/page='modEvent'"> 
    260                   <xsl:apply-templates select="/bedeworkadmin/formElements" mode="modEvent"/> 
     259                <xsl:when test="/bedework/page='modEvent'"> 
     260                  <xsl:apply-templates select="/bedework/formElements" mode="modEvent"/> 
    261261                </xsl:when> 
    262                 <xsl:when test="/bedeworkadmin/page='displayEvent' or /bedeworkadmin/page='deleteEventConfirm'"> 
    263                   <xsl:apply-templates select="/bedeworkadmin/event" mode="displayEvent"/> 
     262                <xsl:when test="/bedework/page='displayEvent' or /bedework/page='deleteEventConfirm'"> 
     263                  <xsl:apply-templates select="/bedework/event" mode="displayEvent"/> 
    264264                </xsl:when> 
    265                 <xsl:when test="/bedeworkadmin/page='contactList'"> 
     265                <xsl:when test="/bedework/page='contactList'"> 
    266266                  <xsl:call-template name="contactList"/> 
    267267                </xsl:when> 
    268                 <xsl:when test="/bedeworkadmin/page='modContact'"> 
     268                <xsl:when test="/bedework/page='modContact'"> 
    269269                  <xsl:call-template name="modContact"/> 
    270270                </xsl:when> 
    271                 <xsl:when test="/bedeworkadmin/page='deleteContactConfirm' or /bedeworkadmin/page='contactReferenced'"> 
     271                <xsl:when test="/bedework/page='deleteContactConfirm' or /bedework/page='contactReferenced'"> 
    272272                  <xsl:call-template name="deleteContactConfirm"/> 
    273273                </xsl:when> 
    274                 <xsl:when test="/bedeworkadmin/page='locationList'"> 
     274                <xsl:when test="/bedework/page='locationList'"> 
    275275                  <xsl:call-template name="locationList"/> 
    276276                </xsl:when> 
    277                 <xsl:when test="/bedeworkadmin/page='modLocation'"> 
     277                <xsl:when test="/bedework/page='modLocation'"> 
    278278                  <xsl:call-template name="modLocation"/> 
    279279                </xsl:when> 
    280                 <xsl:when test="/bedeworkadmin/page='deleteLocationConfirm'"> 
     280                <xsl:when test="/bedework/page='deleteLocationConfirm'"> 
    281281                  <xsl:call-template name="deleteLocationConfirm"/> 
    282282                </xsl:when> 
    283                 <xsl:when test="/bedeworkadmin/page='categoryList'"> 
     283                <xsl:when test="/bedework/page='categoryList'"> 
    284284                  <xsl:call-template name="categoryList"/> 
    285285                </xsl:when> 
    286                 <xsl:when test="/bedeworkadmin/page='modCategory'"> 
     286                <xsl:when test="/bedework/page='modCategory'"> 
    287287                  <xsl:call-template name="modCategory"/> 
    288288                </xsl:when> 
    289                 <xsl:when test="/bedeworkadmin/page='deleteCategoryConfirm'"> 
     289                <xsl:when test="/bedework/page='deleteCategoryConfirm'"> 
    290290                  <xsl:call-template name="deleteCategoryConfirm"/> 
    291291                </xsl:when> 
    292                 <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='deleteCalendarConfirm' or /bedeworkadmin/page='calendarReferenced'"> 
    293                   <xsl:apply-templates select="/bedeworkadmin/calendars" mode="calendarCommon"/> 
     292                <xsl:when test="/bedework/page='calendarList' or /bedework/page='calendarDescriptions' or /bedework/page='displayCalendar' or /bedework/page='modCalendar' or /bedework/page='deleteCalendarConfirm' or /bedework/page='calendarReferenced'"> 
     293                  <xsl:apply-templates select="/bedework/calendars" mode="calendarCommon"/> 
    294294                </xsl:when> 
    295                 <xsl:when test="/bedeworkadmin/page='moveCalendar'"> 
     295                <xsl:when test="/bedework/page='moveCalendar'"> 
    296296                  <xsl:call-template name="calendarMove"/> 
    297297                </xsl:when> 
    298                 <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
    299                   <xsl:apply-templates select="/bedeworkadmin/subscriptions"/> 
     298                <xsl:when test="/bedework/page='subscriptions' or /bedework/page='modSubscription'"> 
     299                  <xsl:apply-templates select="/bedework/subscriptions"/> 
    300300                </xsl:when> 
    301                 <xsl:when test="/bedeworkadmin/page='views'"> 
    302                   <xsl:apply-templates select="/bedeworkadmin/views" mode="viewList"/> 
     301                <xsl:when test="/bedework/page='views'"> 
     302                  <xsl:apply-templates select="/bedework/views" mode="viewList"/> 
    303303                </xsl:when> 
    304                 <xsl:when test="/bedeworkadmin/page='modView'"> 
     304                <xsl:when test="/bedework/page='modView'"> 
    305305                  <xsl:call-template name="modView"/> 
    306306                </xsl:when> 
    307                 <xsl:when test="/bedeworkadmin/page='deleteViewConfirm'"> 
     307                <xsl:when test="/bedework/page='deleteViewConfirm'"> 
    308308                  <xsl:call-template name="deleteViewConfirm"/> 
    309309                </xsl:when> 
    310                 <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     310                <xsl:when test="/bedework/page='modSyspars'"> 
    311311                  <xsl:call-template name="modSyspars"/> 
    312312                </xsl:when> 
    313                 <xsl:when test="/bedeworkadmin/page='calSuiteList'"> 
    314                   <xsl:apply-templates select="/bedeworkadmin/calSuites" mode="calSuiteList"/> 
     313                <xsl:when test="/bedework/page='calSuiteList'"> 
     314                  <xsl:apply-templates select="/bedework/calSuites" mode="calSuiteList"/> 
    315315                </xsl:when> 
    316                 <xsl:when test="/bedeworkadmin/page='addCalSuite'"> 
     316                <xsl:when test="/bedework/page='addCalSuite'"> 
    317317                  <xsl:call-template name="addCalSuite"/> 
    318318                </xsl:when> 
    319                 <xsl:when test="/bedeworkadmin/page='modCalSuite'"> 
    320                   <xsl:apply-templates select="/bedeworkadmin/calSuite"/> 
     319                <xsl:when test="/bedework/page='modCalSuite'"> 
     320                  <xsl:apply-templates select="/bedework/calSuite"/> 
    321321                </xsl:when> 
    322                 <xsl:when test="/bedeworkadmin/page='calSuitePrefs'"> 
     322                <xsl:when test="/bedework/page='calSuitePrefs'"> 
    323323                  <xsl:call-template name="calSuitePrefs"/> 
    324324                </xsl:when> 
    325                 <xsl:when test="/bedeworkadmin/page='authUserList'"> 
     325                <xsl:when test="/bedework/page='authUserList'"> 
    326326                  <xsl:call-template name="authUserList"/> 
    327327                </xsl:when> 
    328                 <xsl:when test="/bedeworkadmin/page='modAuthUser'"> 
     328                <xsl:when test="/bedework/page='modAuthUser'"> 
    329329                  <xsl:call-template name="modAuthUser"/> 
    330330                </xsl:when> 
    331                 <xsl:when test="/bedeworkadmin/page='modPrefs'"> 
     331                <xsl:when test="/bedework/page='modPrefs'"> 
    332332                  <xsl:call-template name="modPrefs"/> 
    333333                </xsl:when> 
    334                 <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
    335                   <xsl:apply-templates select="/bedeworkadmin/groups" mode="chooseGroup"/> 
     334                <xsl:when test="/bedework/page='chooseGroup'"> 
     335                  <xsl:apply-templates select="/bedework/groups" mode="chooseGroup"/> 
    336336                </xsl:when> 
    337                 <xsl:when test="/bedeworkadmin/page='adminGroupList'"> 
     337                <xsl:when test="/bedework/page='adminGroupList'"> 
    338338                  <xsl:call-template name="listAdminGroups"/> 
    339339                </xsl:when> 
    340                 <xsl:when test="/bedeworkadmin/page='modAdminGroup'"> 
     340                <xsl:when test="/bedework/page='modAdminGroup'"> 
    341341                  <xsl:call-template name="modAdminGroup"/> 
    342342                </xsl:when> 
    343                 <xsl:when test="/bedeworkadmin/page='modAdminGroupMembers'"> 
     343                <xsl:when test="/bedework/page='modAdminGroupMembers'"> 
    344344                  <xsl:call-template name="modAdminGroupMembers"/> 
    345345                </xsl:when> 
    346                 <xsl:when test="/bedeworkadmin/page='deleteAdminGroupConfirm'"> 
     346                <xsl:when test="/bedework/page='deleteAdminGroupConfirm'"> 
    347347                  <xsl:call-template name="deleteAdminGroupConfirm"/> 
    348348                </xsl:when> 
    349                 <xsl:when test="/bedeworkadmin/page='searchResult'"> 
     349                <xsl:when test="/bedework/page='searchResult'"> 
    350350                  <xsl:call-template name="searchResult"/> 
    351351                </xsl:when> 
    352                 <xsl:when test="/bedeworkadmin/page='noGroup'"> 
     352                <xsl:when test="/bedework/page='noGroup'"> 
    353353                  <h2>No administrative group</h2> 
    354354                  <p>Your userid has not been assigned to an administrative group. 
    355355                    Please inform your administrator.</p> 
    356356                </xsl:when> 
    357                 <xsl:when test="/bedeworkadmin/page='upload'"> 
     357                <xsl:when test="/bedework/page='upload'"> 
    358358                  <xsl:call-template name="upload"/> 
    359359                </xsl:when> 
    360                 <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
     360                <xsl:when test="/bedework/page='uploadTimezones'"> 
    361361                  <xsl:call-template name="uploadTimezones"/> 
    362362                </xsl:when> 
    363                 <xsl:when test="/bedeworkadmin/page='showSysStats'"> 
    364                   <xsl:apply-templates select="/bedeworkadmin/sysStats" mode="showSysStats"/> 
     363                <xsl:when test="/bedework/page='showSysStats'"> 
     364                  <xsl:apply-templates select="/bedework/sysStats" mode="showSysStats"/> 
    365365                </xsl:when> 
    366                 <xsl:when test="/bedeworkadmin/page='noAccess'"> 
     366                <xsl:when test="/bedework/page='noAccess'"> 
    367367                  <h2>No Access</h2> 
    368368                  <p> 
     
    375375                  </p> 
    376376                </xsl:when> 
    377                 <xsl:when test="/bedeworkadmin/page='error'"> 
     377                <xsl:when test="/bedework/page='error'"> 
    378378                  <h2>Application error</h2> 
    379379                  <p>An application error occurred.</p> 
     
    403403        <img id="logo" 
    404404            alt="logo" 
    405             src="{$resourcesRoot}/resources/bedeworkAdminLogo.gif" 
     405            src="{$resourcesRoot}/resources/bedeworkLogo.gif" 
    406406            width="217" 
    407407            height="40" 
     
    411411      <h1> 
    412412        <xsl:choose> 
    413           <xsl:when test="/bedeworkadmin/page='modEvent' or /bedeworkadmin/page='eventList' or /bedeworkadmin/page='displayEvent'"> 
     413          <xsl:when test="/bedework/page='modEvent' or /bedework/page='eventList' or /bedework/page='displayEvent'"> 
    414414            Manage Events 
    415415          </xsl:when> 
    416           <xsl:when test="/bedeworkadmin/page='contactList' or /bedeworkadmin/page='modContact' or /bedeworkadmin/page='deleteContactConfirm'"> 
     416          <xsl:when test="/bedework/page='contactList' or /bedework/page='modContact' or /bedework/page='deleteContactConfirm'"> 
    417417            Manage Contacts 
    418418          </xsl:when> 
    419           <xsl:when test="/bedeworkadmin/page='locationList' or /bedeworkadmin/page='modLocation' or /bedeworkadmin/page='deleteLocationConfirm'"> 
     419          <xsl:when test="/bedework/page='locationList' or /bedework/page='modLocation' or /bedework/page='deleteLocationConfirm'"> 
    420420            Manage Locations 
    421421          </xsl:when> 
    422           <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='calendarReferenced' or /bedeworkadmin/page='deleteCalendarConfirm'"> 
     422          <xsl:when test="/bedework/page='calendarList' or /bedework/page='modCalendar' or /bedework/page='calendarReferenced' or /bedework/page='deleteCalendarConfirm'"> 
    423423            Manage Calendars 
    424424          </xsl:when> 
    425           <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     425          <xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    426426            Public Calendars 
    427427          </xsl:when> 
    428           <xsl:when test="/bedeworkadmin/page='subscriptions' or /bedeworkadmin/page='modSubscription'"> 
     428          <xsl:when test="/bedework/page='subscriptions' or /bedework/page='modSubscription'"> 
    429429            Manage Subscriptions 
    430430          </xsl:when> 
    431           <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
     431          <xsl:when test="/bedework/page='views' or /bedework/page='modView'"> 
    432432            Manage Views 
    433433          </xsl:when> 
    434           <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     434          <xsl:when test="/bedework/page='modSyspars'"> 
    435435            Manage System Preferences 
    436436          </xsl:when> 
    437           <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 
     437          <xsl:when test="/bedework/page='authUserList' or /bedework/page='modAuthUser'"> 
    438438            Manage Administrative Roles 
    439439          </xsl:when> 
    440           <xsl:when test="/bedeworkadmin/page='chooseGroup'"> 
     440          <xsl:when test="/bedework/page='chooseGroup'"> 
    441441            Choose Administrative Group 
    442442          </xsl:when> 
    443           <xsl:when test="/bedeworkadmin/page='adminGroupList' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroup' or /bedeworkadmin/page='modAdminGroupMembers'"> 
     443          <xsl:when test="/bedework/page='adminGroupList' or /bedework/page='modAdminGroup' or /bedework/page='modAdminGroup' or /bedework/page='modAdminGroupMembers'"> 
    444444            Manage Administrative Groups 
    445445          </xsl:when> 
    446           <xsl:when test="/bedeworkadmin/page='noGroup'"> 
     446          <xsl:when test="/bedework/page='noGroup'"> 
    447447            No Administrative Group 
    448448          </xsl:when> 
    449           <xsl:when test="/bedeworkadmin/page='uploadTimezones'"> 
     449          <xsl:when test="/bedework/page='uploadTimezones'"> 
    450450            Manage Time Zones 
    451451          </xsl:when> 
    452           <xsl:when test="/bedeworkadmin/page='noAccess'"> 
     452          <xsl:when test="/bedework/page='noAccess'"> 
    453453            Access Denied 
    454454          </xsl:when> 
    455           <xsl:when test="/bedeworkadmin/page='error'"> 
     455          <xsl:when test="/bedework/page='error'"> 
    456456            Error 
    457457          </xsl:when> 
     
    472472          <a href="{$logout}">Log Out</a> 
    473473        </td> 
    474         <xsl:if test="/bedeworkadmin/userInfo/user"> 
     474        <xsl:if test="/bedework/userInfo/user"> 
    475475          <td class="rightCell"> 
    476             <xsl:if test="/bedeworkadmin/currentCalSuite/name"> 
     476            <xsl:if test="/bedework/currentCalSuite/name"> 
    477477              Calendar Suite: 
    478478              <span class="status"> 
    479                 <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     479                <xsl:value-of select="/bedework/currentCalSuite/name"/> 
    480480              </span> 
    481481              &#160; 
     
    483483            Logged in as: 
    484484            <span class="status"> 
    485               <xsl:value-of select="/bedeworkadmin/userInfo/user"/> 
     485              <xsl:value-of select="/bedework/userInfo/user"/> 
    486486            </span> 
    487487            &#160; 
    488             <xsl:if test="/bedeworkadmin/userInfo/group"> 
     488            <xsl:if test="/bedework/userInfo/group"> 
    489489              Group: 
    490490              <span class="status"> 
    491                 <xsl:value-of select="/bedeworkadmin/userInfo/group"/> 
     491                <xsl:value-of select="/bedework/userInfo/group"/> 
    492492              </span> 
    493493            </xsl:if> 
     
    502502 
    503503  <xsl:template name="messagesAndErrors"> 
    504     <xsl:if test="/bedeworkadmin/message"> 
     504    <xsl:if test="/bedework/message"> 
    505505      <ul id="messages"> 
    506         <xsl:for-each select="/bedeworkadmin/message"> 
     506        <xsl:for-each select="/bedework/message"> 
    507507          <li><xsl:apply-templates select="."/></li> 
    508508        </xsl:for-each> 
    509509      </ul> 
    510510    </xsl:if> 
    511     <xsl:if test="/bedeworkadmin/error"> 
     511    <xsl:if test="/bedework/error"> 
    512512      <ul id="errors"> 
    513         <xsl:for-each select="/bedeworkadmin/error"> 
     513        <xsl:for-each select="/bedework/error"> 
    514514          <li><xsl:apply-templates select="."/></li> 
    515515        </xsl:for-each> 
     
    547547          <td> 
    548548            Event ID: 
    549             <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     549            <xsl:copy-of select="/bedework/formElements/*"/> 
    550550          </td>--> 
    551551        </tr> 
     
    594594      <form name="searchForm" method="post" action="{$search}" id="searchForm"> 
    595595        <input type="text" name="query" size="30"> 
    596           <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/searchResults/query"/></xsl:attribute> 
     596          <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    597597        </input> 
    598598        <input type="submit" name="submit" value="go"/> 
     
    608608 
    609609    <div id="adminRightColumn"> 
    610       <xsl:if test="/bedeworkadmin/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedeworkadmin/userInfo/superUser='true'"> 
     610      <xsl:if test="/bedework/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedework/userInfo/superUser='true'"> 
    611611        <h4 class="menuTitle"> 
    612612          Manage calendar suite: 
    613           <em><xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     613          <em><xsl:value-of select="/bedework/currentCalSuite/name"/> 
    614614          </em> 
    615615        </h4> 
     
    643643      </xsl:if> 
    644644 
    645       <xsl:if test="/bedeworkadmin/userInfo/contentAdminUser='true'"> 
     645      <xsl:if test="/bedework/userInfo/contentAdminUser='true'"> 
    646646        <h4 class="menuTitle">Manage users:</h4> 
    647647        <ul class="adminMenu"> 
    648           <xsl:if test="/bedeworkadmin/userInfo/userMaintOK='true'"> 
     648          <xsl:if test="/bedework/userInfo/userMaintOK='true'"> 
    649649            <li> 
    650650              <a href="{$authuser-initUpdate}"> 
     
    653653            </li> 
    654654          </xsl:if> 
    655           <xsl:if test="/bedeworkadmin/userInfo/adminGroupMaintOk='true'"> 
     655          <xsl:if test="/bedework/userInfo/adminGroupMaintOk='true'"> 
    656656            <li> 
    657657              <a href="{$admingroup-initUpdate}"> 
     
    665665            </a> 
    666666          </li> 
    667           <xsl:if test="/bedeworkadmin/userInfo/userMaintOK='true'"> 
     667          <xsl:if test="/bedework/userInfo/userMaintOK='true'"> 
    668668            <li> 
    669669              <form action="{$prefs-fetchForUpdate}" method="post"> 
     
    677677      </xsl:if> 
    678678 
    679       <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     679      <xsl:if test="/bedework/userInfo/superUser='true'"> 
    680680        <h4 class="menuTitle">Super user features:</h4> 
    681681        <ul class="adminMenu"> 
     
    728728          <td style="padding-right: 1em;">Show:</td> 
    729729          <td> 
    730             <xsl:copy-of select="/bedeworkadmin/formElements/form/listAllSwitchFalse/*"/> 
     730            <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    731731            Active 
    732732          </td> 
    733733          <td> 
    734             <xsl:copy-of select="/bedeworkadmin/formElements/form/listAllSwitchTrue/*"/> 
     734            <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    735735            All 
    736736          </td> 
     
    748748      </tr> 
    749749 
    750       <xsl:for-each select="/bedeworkadmin/events/event"> 
     750      <xsl:for-each select="/bedework/events/event"> 
    751751        <xsl:variable name="subscriptionId" select="subscription/id"/> 
    752752        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     
    812812        <tr> 
    813813          <xsl:choose> 
    814             <xsl:when test="/bedeworkadmin/creating='true'"> 
     814            <xsl:when test="/bedework/creating='true'"> 
    815815              <td> 
    816816                <input type="submit" name="addEvent" value="Add Event"/> 
     
    954954                    <xsl:copy-of select="form/start/day/*"/> 
    955955                    <xsl:choose> 
    956                       <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     956                      <xsl:when test="/bedework/creating = 'true'"> 
    957957                        <xsl:copy-of select="form/start/year/*"/> 
    958958                      </xsl:when> 
     
    998998                    <option value="-1">select timezone...</option> 
    999999                    <xsl:variable name="startTzId" select="form/start/tzid"/> 
    1000                     <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     1000                    <xsl:for-each select="/bedework/timezones/timezone"> 
    10011001                      <option> 
    10021002                        <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    10331033                      <xsl:copy-of select="form/end/dateTime/day/*"/> 
    10341034                      <xsl:choose> 
    1035                         <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     1035                        <xsl:when test="/bedework/creating = 'true'"> 
    10361036                          <xsl:copy-of select="form/end/dateTime/year/*"/> 
    10371037                        </xsl:when> 
     
    10771077                      <option value="-1">select timezone...</option> 
    10781078                      <xsl:variable name="endTzId" select="form/end/dateTime/tzid"/> 
    1079                       <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     1079                      <xsl:for-each select="/bedework/timezones/timezone"> 
    10801080                        <option> 
    10811081                          <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    12051205                <div id="recurrenceFields" class="invisible"> 
    12061206                  <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
    1207                    
     1207 
    12081208                  <h4>Recurrence Rules</h4> 
    12091209                  <!-- show or hide rrules fields when editing: --> 
     
    12751275                            <xsl:variable name="dayVal" select="."/> 
    12761276                            <xsl:variable name="dayPos"> 
    1277                               <xsl:for-each select="/bedeworkadmin/recurdayvals/val"> 
     1277                              <xsl:for-each select="/bedework/recurdayvals/val"> 
    12781278                                <xsl:if test="node() = $dayVal"><xsl:value-of select="position()"/></xsl:if> 
    12791279                              </xsl:for-each> 
    12801280                            </xsl:variable> 
    1281                             <xsl:value-of select="/bedeworkadmin/shortdaynames/val[position() = $dayPos]"/> 
     1281                            <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/> 
    12821282                            <xsl:if test="position() != last()">, </xsl:if> 
    12831283                          </xsl:for-each> 
     
    12901290                          <xsl:if test="position() != 1 and position() = last()"> and </xsl:if> 
    12911291                          <xsl:variable name="monthNum" select="number(.)"/> 
    1292                           <xsl:value-of select="/bedeworkadmin/monthlabels/val[position() = $monthNum]"/> 
     1292                          <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/> 
    12931293                          <xsl:if test="position() != last()">, </xsl:if> 
    12941294                        </xsl:for-each> 
     
    14261426                            in these months: 
    14271427                            <div id="dayMonthCheckBoxList" class="invisible"> 
    1428                               <xsl:for-each select="/bedeworkadmin/monthlabels/val"> 
     1428                              <xsl:for-each select="/bedework/monthlabels/val"> 
    14291429                                <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable> 
    14301430                                <span class="chkBoxListItem"> 
    14311431                                  <input type="checkbox" name="dayMonths"> 
    1432                                     <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/monthvalues/val[position() = $pos]"/></xsl:attribute> 
     1432                                    <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute> 
    14331433                                  </input> 
    14341434                                  <xsl:value-of select="."/> 
     
    14711471                            Week start: 
    14721472                            <select name="weekWkst"> 
    1473                               <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     1473                              <xsl:for-each select="/bedework/shortdaynames/val"> 
    14741474                                <xsl:variable name="pos" select="position()"/> 
    14751475                                <option> 
    1476                                   <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     1476                                  <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    14771477                                  <xsl:value-of select="."/> 
    14781478                                </option> 
     
    15491549                            in these months: 
    15501550                            <div id="yearMonthCheckBoxList" class="invisible"> 
    1551                               <xsl:for-each select="/bedeworkadmin/monthlabels/val"> 
     1551                              <xsl:for-each select="/bedework/monthlabels/val"> 
    15521552                                <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable> 
    15531553                                <span class="chkBoxListItem"> 
    15541554                                  <input type="checkbox" name="yearMonths"> 
    1555                                     <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/monthvalues/val[position() = $pos]"/></xsl:attribute> 
     1555                                    <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute> 
    15561556                                  </input> 
    15571557                                  <xsl:value-of select="."/> 
     
    15971597                            Week start: 
    15981598                            <select name="yearWkst"> 
    1599                               <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     1599                              <xsl:for-each select="/bedework/shortdaynames/val"> 
    16001600                                <xsl:variable name="pos" select="position()"/> 
    16011601                                <option> 
    1602                                   <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     1602                                  <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    16031603                                  <xsl:value-of select="."/> 
    16041604                                </option> 
     
    16271627                      <!-- store time as coordinated universal time (UTC) --> 
    16281628                      <input type="checkbox" name="storeUTC" id="rdateStoreUTC" onclick="swapRdateStoreUTC(this)" value="true"/> 
    1629                       store as UTC<br/>                       
     1629                      store as UTC<br/> 
    16301630                      <div class="dateFields"> 
    16311631                        <input name="eventRdate.date" 
     
    16831683                          <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    16841684                          <option value="">select timezone...</option> 
    1685                           <xsl:variable name="rdateTzId" select="/bedeworkadmin/now/defaultTzid"/> 
    1686                           <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     1685                          <xsl:variable name="rdateTzId" select="/bedework/now/defaultTzid"/> 
     1686                          <xsl:for-each select="/bedework/timezones/timezone"> 
    16871687                            <option> 
    16881688                              <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    17041704                        <tr><td>No recurrence dates</td></tr> 
    17051705                      </table> 
    1706    
     1706 
    17071707                      <!-- if there are recurrence dates, the following table will show --> 
    17081708                      <table cellspacing="0" class="invisible" id="bwCurrentRdates"> 
     
    17171717                        </tr> 
    17181718                      </table> 
    1719    
     1719 
    17201720                      <input type="hidden" name="exdates" value="" id="bwExdatesField" /> 
    17211721                      <!-- if there are no exception dates, the following table will show --> 
     
    17241724                        <tr><td>No exception dates</td></tr> 
    17251725                      </table> 
    1726    
     1726 
    17271727                      <!-- if there are exception dates, the following table will show --> 
    17281728                      <table cellspacing="0" class="invisible" id="bwCurrentExdates"> 
     
    18931893          </td> 
    18941894          <td> 
    1895             <xsl:if test="form/categories/preferred/category and /bedeworkadmin/creating='true'"> 
     1895            <xsl:if test="form/categories/preferred/category and /bedework/creating='true'"> 
    18961896              <input type="radio" name="categoryCheckboxes" value="preferred" checked="checked" onclick="changeClass('preferredCategoryCheckboxes','shown');changeClass('allCategoryCheckboxes','invisible');"/>show preferred 
    18971897              <input type="radio" name="categoryCheckboxes" value="all" onclick="changeClass('preferredCategoryCheckboxes','invisible');changeClass('allCategoryCheckboxes','shown')"/>show all<br/> 
     
    19251925            </xsl:if> 
    19261926            <table cellpadding="0" id="allCategoryCheckboxes"> 
    1927               <xsl:if test="form/categories/preferred/category and /bedeworkadmin/creating='true'"> 
     1927              <xsl:if test="form/categories/preferred/category and /bedework/creating='true'"> 
    19281928                <xsl:attribute name="class">invisible</xsl:attribute> 
    19291929              </xsl:if> 
     
    19341934                    <input type="checkbox" name="categoryKey"> 
    19351935                      <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 
    1936                       <xsl:if test="/bedeworkadmin/creating='true'"> 
     1936                      <xsl:if test="/bedework/creating='true'"> 
    19371937                        <xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute> 
    19381938                        <xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute> 
     
    19491949                    <input type="checkbox" name="categoryKey"> 
    19501950                      <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute> 
    1951                       <xsl:if test="/bedeworkadmin/creating='true'"> 
     1951                      <xsl:if test="/bedework/creating='true'"> 
    19521952                        <xsl:attribute name="id">all-<xsl:value-of select="keyword"/></xsl:attribute> 
    19531953                        <xsl:attribute name="onchange">setCatChBx('all-<xsl:value-of select="keyword"/>','pref-<xsl:value-of select="keyword"/>')</xsl:attribute> 
     
    20362036        <tr> 
    20372037          <xsl:choose> 
    2038             <xsl:when test="/bedeworkadmin/creating='true'"> 
     2038            <xsl:when test="/bedework/creating='true'"> 
    20392039              <td> 
    20402040                <input type="submit" name="addEvent" value="Add Event"/> 
     
    20782078  <xsl:template name="byDayChkBoxList"> 
    20792079    <xsl:param name="name"/> 
    2080     <xsl:for-each select="/bedeworkadmin/shortdaynames/val"> 
     2080    <xsl:for-each select="/bedework/shortdaynames/val"> 
    20812081      <xsl:variable name="pos" select="position()"/> 
    20822082      <input type="checkbox"> 
    2083         <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
     2083        <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute> 
    20842084        <xsl:attribute name="name"><xsl:value-of select="$name"/></xsl:attribute> 
    20852085      </input> 
     
    21632163      <!-- Bedework 24-Hour Clock time selection widget 
    21642164           used with resources/bwClock.js and resources/bwClock.css --> 
    2165       <xsl:variable name="hour24" select="/bedeworkadmin/hour24"/><!-- true or false --> 
     2165      <xsl:variable name="hour24" select="/bedework/hour24"/><!-- true or false --> 
    21662166      <div id="bwClockClock"> 
    21672167        <img id="clockMap" src="{$resourcesRoot}/resources/clockMap.gif" width="368" height="368" border="0" alt="bwClock" usemap="#bwClockMap" /> 
     
    22972297                <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if> 
    22982298                <option value="-1">select timezone...</option> 
    2299                 <xsl:variable name="rdateTzId" select="/bedeworkadmin/rdates/tzid"/> 
    2300                 <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     2299                <xsl:variable name="rdateTzId" select="/bedework/rdates/tzid"/> 
     2300                <xsl:for-each select="/bedework/timezones/timezone"> 
    23012301                  <option> 
    23022302                    <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
     
    23282328            </tr> 
    23292329            <xsl:choose> 
    2330               <xsl:when test="/bedeworkadmin/rdates/rdate"> 
    2331                 <xsl:for-each select="/bedeworkadmin/rdates/rdate"> 
     2330              <xsl:when test="/bedework/rdates/rdate"> 
     2331                <xsl:for-each select="/bedework/rdates/rdate"> 
    23322332                  <tr> 
    23332333                    <td> 
     
    23742374            </tr> 
    23752375            <xsl:choose> 
    2376               <xsl:when test="/bedeworkadmin/exdates/exdate"> 
    2377                 <xsl:for-each select="/bedeworkadmin/exdates/exdate"> 
     2376              <xsl:when test="/bedework/exdates/exdate"> 
     2377                <xsl:for-each select="/bedework/exdates/exdate"> 
    23782378                  <tr> 
    23792379                    <td> 
     
    24192419 
    24202420    <xsl:choose> 
    2421       <xsl:when test="/bedeworkadmin/page='deleteEventConfirm'"> 
     2421      <xsl:when test="/bedework/page='deleteEventConfirm'"> 
    24222422        <h2>Ok to delete this event?</h2> 
    24232423        <p style="width: 400px;">Note: we do not encourage deletion of old but correct events; we prefer to keep 
     
    25682568 
    25692569    <p> 
    2570       <xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 
     2570      <xsl:if test="/bedework/canEdit = 'true' or /bedework/userInfo/superUser = 'true'"> 
    25712571        <input type="button" name="return" value="Edit event" onclick="javascript:location.replace('{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
    25722572      </xsl:if> 
     
    25922592      </tr> 
    25932593 
    2594       <xsl:for-each select="/bedeworkadmin/contacts/contact"> 
     2594      <xsl:for-each select="/bedework/contacts/contact"> 
    25952595        <tr> 
    25962596          <td> 
     
    26272627          </td> 
    26282628          <td> 
    2629             <xsl:copy-of select="/bedeworkadmin/formElements/form/name/*"/> 
     2629            <xsl:copy-of select="/bedework/formElements/form/name/*"/> 
    26302630          </td> 
    26312631        </tr> 
     
    26352635          </td> 
    26362636          <td> 
    2637             <xsl:copy-of select="/bedeworkadmin/formElements/form/phone/*"/> 
     2637            <xsl:copy-of select="/bedework/formElements/form/phone/*"/> 
    26382638            <span class="fieldInfo"> (optional)</span> 
    26392639          </td> 
     
    26442644          </td> 
    26452645          <td> 
    2646             <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
     2646            <xsl:copy-of select="/bedework/formElements/form/link/*"/> 
    26472647            <span class="fieldInfo"> (optional)</span> 
    26482648          </td> 
     
    26532653          </td> 
    26542654          <td> 
    2655             <xsl:copy-of select="/bedeworkadmin/formElements/form/email/*"/> 
     2655            <xsl:copy-of select="/bedework/formElements/form/email/*"/> 
    26562656            <span class="fieldInfo"> (optional)</span> 
    26572657          </td> 
     
    26622662        <tr> 
    26632663          <xsl:choose> 
    2664             <xsl:when test="/bedeworkadmin/creating='true'"> 
     2664            <xsl:when test="/bedework/creating='true'"> 
    26652665              <td> 
    26662666                <input type="submit" name="addContact" value="Add Contact"/> 
     
    26892689    <h2>Ok to delete this contact?</h2> 
    26902690    <p id="confirmButtons"> 
    2691       <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     2691      <xsl:copy-of select="/bedework/formElements/*"/> 
    26922692    </p> 
    26932693 
     
    26962696        <th>Name</th> 
    26972697        <td> 
    2698           <xsl:value-of select="/bedeworkadmin/contact/name" /> 
     2698          <xsl:value-of select="/bedework/contact/name" /> 
    26992699        </td> 
    27002700      </tr> 
     
    27022702        <th>Phone</th> 
    27032703        <td> 
    2704           <xsl:value-of select="/bedeworkadmin/contact/phone" /> 
     2704          <xsl:value-of select="/bedework/contact/phone" /> 
    27052705        </td> 
    27062706      </tr> 
     
    27082708        <th>Email</th> 
    27092709        <td> 
    2710           <xsl:value-of select="/bedeworkadmin/contact/email" /> 
     2710          <xsl:value-of select="/bedework/contact/email" /> 
    27112711        </td> 
    27122712      </tr> 
     
    27142714        <th>URL</th> 
    27152715        <td> 
    2716           <xsl:value-of select="/bedeworkadmin/contact/link" /> 
     2716          <xsl:value-of select="/bedework/contact/link" /> 
    27172717        </td> 
    27182718      </tr> 
     
    27352735      </tr> 
    27362736 
    2737       <xsl:for-each select="/bedeworkadmin/locations/location"> 
     2737      <xsl:for-each select="/bedework/locations/location"> 
    27382738        <tr> 
    27392739          <td> 
     
    27562756  <xsl:template name="modLocation"> 
    27572757    <xsl:choose> 
    2758       <xsl:when test="/bedeworkadmin/creating='true'"> 
     2758      <xsl:when test="/bedework/creating='true'"> 
    27592759        <h2>Add Location</h2> 
    27602760      </xsl:when> 
     
    27712771          </td> 
    27722772          <td> 
    2773             <xsl:copy-of select="/bedeworkadmin/formElements/form/address/*"/> 
     2773            <xsl:copy-of select="/bedework/formElements/form/address/*"/> 
    27742774          </td> 
    27752775        </tr> 
     
    27792779          </td> 
    27802780          <td> 
    2781             <xsl:copy-of select="/bedeworkadmin/formElements/form/subaddress/*"/> 
     2781            <xsl:copy-of select="/bedework/formElements/form/subaddress/*"/> 
    27822782            <span class="fieldInfo"> (optional)</span> 
    27832783          </td> 
     
    27882788          </td> 
    27892789          <td> 
    2790             <xsl:copy-of select="/bedeworkadmin/formElements/form/link/*"/> 
     2790            <xsl:copy-of select="/bedework/formElements/form/link/*"/> 
    27912791            <span class="fieldInfo"> (optional)</span> 
    27922792          </td> 
     
    27972797        <tr> 
    27982798          <xsl:choose> 
    2799             <xsl:when test="/bedeworkadmin/creating='true'"> 
     2799            <xsl:when test="/bedework/creating='true'"> 
    28002800              <td> 
    28012801                <input type="submit" name="addLocation" value="Add Location"/> 
     
    28232823    <h2>Ok to delete this location?</h2> 
    28242824    <p id="confirmButtons"> 
    2825       <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 
     2825      <xsl:copy-of select="/bedework/formElements/*"/> 
    28262826    </p> 
    28272827 
     
    28322832          </td> 
    28332833        <td> 
    2834           <xsl:value-of select="/bedeworkadmin/location/address"/> 
     2834          <xsl:value-of select="/bedework/location/address"/> 
    28352835        </td> 
    28362836      </tr> 
     
    28402840          </td> 
    28412841        <td> 
    2842           <xsl:value-of select="/bedeworkadmin/location/subaddress"/> 
     2842          <xsl:value-of select="/bedework/location/subaddress"/> 
    28432843        </td> 
    28442844      </tr> 
     
    28482848          </td> 
    28492849        <td> 
    2850           <xsl:variable name="link" select="/bedeworkadmin/location/link"/> 
     2850          <xsl:variable name="link" select="/bedework/location/link"/> 
    28512851          <a href="{$link}"> 
    2852             <xsl:value-of select="/bedeworkadmin/location/link"/> 
     2852            <xsl:value-of select="/bedework/location/link"/> 
    28532853          </a> 
    28542854        </td> 
     
    28712871      </tr> 
    28722872 
    2873       <xsl:for-each select="/bedeworkadmin/categories/category"> 
     2873      <xsl:for-each select="/bedework/categories/category"> 
    28742874        <xsl:variable name="categoryKey" select="normalize-space(keyword)"/> 
    28752875        <tr> 
     
    28892889  <xsl:template name="modCategory"> 
    28902890    <xsl:choose> 
    2891       <xsl:when test="/bedeworkadmin/creating='true'"> 
     2891      <xsl:when test="/bedework/creating='true'"> 
    28922892        <h2>Add Category</h2> 
    28932893        <form action="{$category-update}" method="post"> 
     
    29312931            </td> 
    29322932              <td> 
    2933                 <xsl:variable name="keyword" select="normalize-space(/bedeworkadmin/currentCategory/category/keyword)"/> 
     2933                <xsl:variable name="keyword" select="normalize-space(/bedework/currentCategory/category/keyword)"/> 
    29342934                <input type="text" name="categoryWord.value" value="{$keyword}" size="40"/> 
    29352935              </td> 
     
    29412941              <td> 
    29422942                <textarea name="categoryDesc.value" rows="3" cols="60"> 
    2943                   <xsl:value-of select="normalize-space(/bedeworkadmin/currentCategory/category/desc)"/> 
     2943                  <xsl:value-of select="normalize-space(/bedework/currentCategory/category/desc)"/> 
    29442944                </textarea> 
    29452945              </td> 
     
    29762976        </td> 
    29772977        <td> 
    2978           <xsl:value-of select="/bedeworkadmin/currentCategory/category/keyword"/> 
     2978          <xsl:value-of select="/bedework/currentCategory/category/keyword"/> 
    29792979        </td> 
    29802980      </tr> 
     
    29842984        </td> 
    29852985        <td> 
    2986           <xsl:value-of select="/bedeworkadmin/currentCategory/category/desc"/> 
     2986          <xsl:value-of select="/bedework/currentCategory/category/desc"/> 
    29872987        </td> 
    29882988      </tr> 
     
    30033003          <ul id="calendarTree"> 
    30043004            <xsl:choose> 
    3005               <xsl:when test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'"> 
     3005              <xsl:when test="/bedework/page='calendarDescriptions' or /bedework/page='displayCalendar'"> 
    30063006                <xsl:apply-templates select="calendar" mode="listForDisplay"/> 
    30073007              </xsl:when> 
     
    30143014        <td class="calendarContent"> 
    30153015          <xsl:choose> 
    3016             <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='calendarReferenced'"> 
     3016            <xsl:when test="/bedework/page='calendarList' or /bedework/page='calendarReferenced'"> 
    30173017              <xsl:call-template name="calendarList"/> 
    30183018            </xsl:when> 
    3019             <xsl:when test="/bedeworkadmin/page='calendarDescriptions'"> 
     3019            <xsl:when test="/bedework/page='calendarDescriptions'"> 
    30203020              <xsl:call-template name="calendarDescriptions"/> 
    30213021            </xsl:when> 
    3022             <xsl:when test="/bedeworkadmin/page='displayCalendar'"> 
    3023               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="displayCalendar"/> 
     3022            <xsl:when test="/bedework/page='displayCalendar'"> 
     3023              <xsl:apply-templates select="/bedework/currentCalendar" mode="displayCalendar"/> 
    30243024            </xsl:when> 
    3025             <xsl:when test="/bedeworkadmin/page='deleteCalendarConfirm'"> 
    3026               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="deleteCalendarConfirm"/> 
     3025            <xsl:when test="/bedework/page='deleteCalendarConfirm'"> 
     3026              <xsl:apply-templates select="/bedework/currentCalendar" mode="deleteCalendarConfirm"/> 
    30273027            </xsl:when> 
    3028             <xsl:when test="/bedeworkadmin/creating='true'"> 
    3029               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="addCalendar"/> 
     3028            <xsl:when test="/bedework/creating='true'"> 
     3029              <xsl:apply-templates select="/bedework/currentCalendar" mode="addCalendar"/> 
    30303030            </xsl:when> 
    30313031            <xsl:otherwise> 
    3032               <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="modCalendar"/> 
     3032              <xsl:apply-templates select="/bedework/currentCalendar" mode="modCalendar"/> 
    30333033            </xsl:otherwise> 
    30343034          </xsl:choose> 
     
    33233323      <xsl:variable name="calPath" select="path"/> 
    33243324      <xsl:variable name="encodedCalPath" select="encodedPath"/> 
    3325       <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     3325      <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedework/userInfo/superUser='true'"> 
    33263326        <h3>Sharing</h3> 
    33273327        <table class="common" id="sharing"> 
     
    33563356                </xsl:if> 
    33573357                <xsl:choose> 
    3358                   <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"> 
     3358                  <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"> 
    33593359                    <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
    3360                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/> 
     3360                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/> 
    33613361                  </xsl:when> 
    3362                   <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"> 
     3362                  <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"> 
    33633363                    <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> 
    3364                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/> 
     3364                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/> 
    33653365                  </xsl:when> 
    33663366                  <xsl:when test="invert and $who='owner'"> 
     
    34013401                    <xsl:variable name="whoType"> 
    34023402                      <xsl:choose> 
    3403                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when> 
    3404                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when> 
     3403                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when> 
     3404                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when> 
    34053405                        <xsl:when test="$who='authenticated'">auth</xsl:when> 
    34063406                        <xsl:when test="$who='unauthenticated'">unauth</xsl:when> 
     
    34133413                    <xsl:variable name="shortWho"> 
    34143414                      <xsl:choose> 
    3415                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
    3416                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
     3415                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
     3416                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
    34173417                        <xsl:otherwise></xsl:otherwise>--> <!-- if not user or group, send no who --> 
    34183418        <!--              </xsl:choose> 
     
    34383438      </xsl:if> 
    34393439 
    3440       <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     3440      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedework/userInfo/superUser='true'"> 
    34413441        <form name="calendarShareForm" action="{$calendar-setAccess}" id="shareForm" method="post"> 
    34423442          <input type="hidden" name="calPath" value="{$calPath}"/> 
     
    36453645      <!--<form name="toggleCals" action="{$event-selectCalForEvent}" method="post"> 
    36463646        <xsl:choose> 
    3647           <xsl:when test="/bedeworkadmin/appvar[key='showAllCalsForEvent']/value = 'true'"> 
     3647          <xsl:when test="/bedework/appvar[key='showAllCalsForEvent']/value = 'true'"> 
    36483648            <input type="radio" name="setappvar" value="showAllCalsForEvent(false)" onclick="submit()"/> 
    36493649            show only writable calendars 
     
    36613661      <h4>Calendars</h4> 
    36623662      <ul id="calendarTree"> 
    3663         <xsl:apply-templates select="/bedeworkadmin/calendars/calendar" mode="selectCalForEventCalTree"/> 
     3663        <xsl:apply-templates select="/bedework/calendars/calendar" mode="selectCalForEventCalTree"/> 
    36643664      </ul> 
    36653665    </div> 
    36663666  </xsl:template> 
    36673667 
    3668   <xsl:template match="calendar" mode="selectCalForEventCalTree">  
     3668  <xsl:template match="calendar" mode="selectCalForEventCalTree"> 
    36693669    <xsl:variable name="calPath" select="path"/><!-- not the encodedPath when put in a form - otherwise it gets double encoded --> 
    36703670      <xsl:variable name="calDisplay" select="path"/> 
     
    37093709        </ul> 
    37103710      </xsl:if> 
    3711     </li>   
     3711    </li> 
    37123712  </xsl:template> 
    37133713 
     
    37223722              <th>Current Path:</th> 
    37233723              <td> 
    3724                 <xsl:value-of select="/bedeworkadmin/currentCalendar/path"/> 
     3724                <xsl:value-of select="/bedework/currentCalendar/path"/> 
    37253725              </td> 
    37263726            </tr> 
     
    37283728              <th>Name:</th> 
    37293729              <td> 
    3730                 <xsl:value-of select="/bedeworkadmin/currentCalendar/name"/> 
     3730                <xsl:value-of select="/bedework/currentCalendar/name"/> 
    37313731              </td> 
    37323732            </tr> 
     
    37343734              <th>Mailing List ID:</th> 
    37353735              <td> 
    3736                 <xsl:value-of select="/bedeworkadmin/currentCalendar/mailListId"/> 
     3736                <xsl:value-of select="/bedework/currentCalendar/mailListId"/> 
    37373737              </td> 
    37383738            </tr> 
     
    37403740              <th>Summary:</th> 
    37413741              <td> 
    3742                 <xsl:value-of select="/bedeworkadmin/currentCalendar/summary"/> 
     3742                <xsl:value-of select="/bedework/currentCalendar/summary"/> 
    37433743              </td> 
    37443744            </tr> 
     
    37463746              <th>Description:</th> 
    37473747              <td> 
    3748                 <xsl:value-of select="/bedeworkadmin/currentCalendar/desc"/> 
     3748                <xsl:value-of select="/bedework/currentCalendar/desc"/> 
    37493749              </td> 
    37503750            </tr> 
     
    37543754          <p>Select a new parent folder:</p> 
    37553755          <ul id="calendarTree"> 
    3756             <xsl:apply-templates select="/bedeworkadmin/calendars/calendar" mode="listForMove"/> 
     3756            <xsl:apply-templates select="/bedework/calendars/calendar" mode="listForMove"/> 
    37573757          </ul> 
    37583758        </td> 
     
    38483848            <span id="accessRightsToggle"> 
    38493849              <xsl:choose> 
    3850                 <xsl:when test="/bedeworkadmin/appvar[key='accessRightsToggle']/value='basic'"> 
     3850                <xsl:when test="/bedework/appvar[key='accessRightsToggle']/value='basic'"> 
    38513851                  <input type="radio" name="setappvar" value="accessRightsToggle(basic)" checked="checked" onclick="changeClass('howList','visible');changeClass('howTable','invisible');"/>basic 
    38523852                  <input type="radio" name="setappvar" value="accessRightsToggle(advanced)" onclick="changeClass('howList','invisible');changeClass('howTable','visible');"/>advanced 
     
    38643864          <!-- the "how" field is set by iterating over the howItems below --> 
    38653865          <table id="howTable" class="visible" cellspacing="0"> 
    3866             <xsl:if test="/bedeworkadmin/appvar[key='accessRightsToggle']/value='basic'"> 
     3866            <xsl:if test="/bedework/appvar[key='accessRightsToggle']/value='basic'"> 
    38673867              <xsl:attribute name="class">invisible</xsl:attribute> 
    38683868            </xsl:if> 
     
    40504050          <!-- the "how" field is set by getting the selected basicHowItem --> 
    40514051          <ul id="howList" class="invisible"> 
    4052             <xsl:if test="/bedeworkadmin/appvar[key='accessRightsToggle']/value='basic'"> 
     4052            <xsl:if test="/bedework/appvar[key='accessRightsToggle']/value='basic'"> 
    40534053              <xsl:attribute name="class">visible</xsl:attribute> 
    40544054            </xsl:if> 
     
    41314131        <xsl:variable name="whoType"> 
    41324132          <xsl:choose> 
    4133             <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when> 
    4134             <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when> 
     4133            <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when> 
     4134            <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when> 
    41354135            <xsl:when test="$who='authenticated'">auth</xsl:when> 
    41364136            <xsl:when test="$who='unauthenticated'">unauth</xsl:when> 
     
    41444144        <xsl:variable name="shortWho"> 
    41454145          <xsl:choose> 
    4146             <xsl:when test="$whoType='user'"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
    4147             <xsl:when test="$whoType='group'"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
     4146            <xsl:when test="$whoType='user'"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
     4147            <xsl:when test="$whoType='group'"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
    41484148            <xsl:otherwise></xsl:otherwise> <!-- if not user or group, send no who --> 
    41494149          </xsl:choose> 
     
    42284228          </p> 
    42294229          <ul id="calendarTree"> 
    4230             <xsl:apply-templates select="/bedeworkadmin/subscriptions/subscribe/calendars/calendar" mode="subscribe"/> 
     4230            <xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar" mode="subscribe"/> 
    42314231          </ul> 
    42324232        </td> 
    42334233        <td class="subs"> 
    42344234          <xsl:choose> 
    4235             <xsl:when test="/bedeworkadmin/page='subscriptions'"> 
     4235            <xsl:when test="/bedework/page='subscriptions'"> 
    42364236              <xsl:call-template name="subscriptionList"/> 
    42374237            </xsl:when> 
    4238             <xsl:when test="/bedeworkadmin/creating='true'"> 
     4238            <xsl:when test="/bedework/creating='true'"> 
    42394239              <xsl:apply-templates select="subscription" mode="addSubscription"/> 
    42404240            </xsl:when> 
     
    43134313          </td> 
    43144314        </tr> 
    4315         <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     4315        <xsl:if test="/bedework/userInfo/superUser='true'"> 
    43164316          <tr> 
    43174317            <th>Unremovable:</th> 
     
    44054405          </td> 
    44064406        </tr> 
    4407         <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     4407        <xsl:if test="/bedework/userInfo/superUser='true'"> 
    44084408          <tr> 
    44094409            <th>Unremovable:</th> 
     
    45534553  <xsl:template name="modView"> 
    45544554    <h2>Update View</h2> 
    4555     <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/> 
     4555    <xsl:variable name="viewName" select="/bedework/views/view/name"/> 
    45564556    <h3 class="viewName"> 
    45574557      <xsl:value-of select="$viewName"/> 
     
    45634563 
    45644564          <table class="subscriptionsListSubs"> 
    4565             <xsl:for-each select="/bedeworkadmin/subscriptions/subscription"> 
     4565            <xsl:for-each select="/bedework/subscriptions/subscription"> 
    45664566              <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    4567               <xsl:if test="not(/bedeworkadmin/views/view/subscriptions/subscription/name=name)"> 
     4567              <xsl:if test="not(/bedework/views/view/subscriptions/subscription/name=name)"> 
    45684568                <tr> 
    45694569                  <td> 
     
    45864586          <h3>Active Subscriptions:</h3> 
    45874587          <table class="subscriptionsListView"> 
    4588             <xsl:for-each select="/bedeworkadmin/views/view/subscriptions/subscription"> 
     4588            <xsl:for-each select="/bedework/views/view/subscriptions/subscription"> 
    45894589              <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    45904590              <tr> 
     
    46254625    <h2>Remove View?</h2> 
    46264626 
    4627     <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/> 
     4627    <xsl:variable name="viewName" select="/bedework/views/view/name"/> 
    46284628    <p>The following view will be removed. <em>Be forewarned: if caching is 
    46294629    enabled, removing views from a 
     
    47184718          <th>System name:</th> 
    47194719          <td> 
    4720             <xsl:variable name="sysname" select="/bedeworkadmin/system/name"/> 
     4720            <xsl:variable name="sysname" select="/bedework/system/name"/> 
    47214721            <xsl:value-of select="$sysname"/> 
    47224722            <div class="desc"> 
     
    47284728          <th>Default timezone:</th> 
    47294729          <td> 
    4730             <xsl:variable name="tzid" select="/bedeworkadmin/system/tzid"/> 
     4730            <xsl:variable name="tzid" select="/bedework/system/tzid"/> 
    47314731 
    47324732            <select name="tzid"> 
    47334733              <option value="-1">select timezone...</option> 
    4734               <xsl:for-each select="/bedeworkadmin/timezones/timezone"> 
     4734              <xsl:for-each select="/bedework/timezones/timezone"> 
    47354735                <option> 
    47364736                  <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute> 
    4737                   <xsl:if test="/bedeworkadmin/system/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     4737                  <xsl:if test="/bedework/system/tzid = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    47384738                  <xsl:value-of select="name"/> 
    47394739                </option> 
     
    47524752              <option value="-1">select preference...</option> 
    47534753              <option value="true"> 
    4754                 <xsl:if test="/bedeworkadmin/system/NEEDPARAM = 'true'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     4754                <xsl:if test="/bedework/system/NEEDPARAM = 'true'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    47554755                Use 24 hour clock/time 
    47564756              </option> 
    47574757              <option value="false"> 
    4758                 <xsl:if test="/bedeworkadmin/system/NEEDPARAM = 'false'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     4758                <xsl:if test="/bedework/system/NEEDPARAM = 'false'"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    47594759                Use 12 Hour clock/time + am/pm 
    47604760              </option> 
     
    47684768          <th>System id:</th> 
    47694769          <td> 
    4770             <xsl:variable name="systemid" select="/bedeworkadmin/system/systemid"/> 
     4770            <xsl:variable name="systemid" select="/bedework/system/systemid"/> 
    47714771            <xsl:value-of select="$systemid"/> 
    47724772            <div class="desc"> 
     
    47784778          <th>Public Calendar Root:</th> 
    47794779          <td> 
    4780             <xsl:variable name="publicCalendarRoot" select="/bedeworkadmin/system/publicCalendarRoot"/> 
     4780            <xsl:variable name="publicCalendarRoot" select="/bedework/system/publicCalendarRoot"/> 
    47814781            <xsl:value-of select="$publicCalendarRoot"/> 
    47824782            <div class="desc"> 
     
    47884788          <th>User Calendar Root:</th> 
    47894789          <td> 
    4790             <xsl:variable name="userCalendarRoot" select="/bedeworkadmin/system/userCalendarRoot"/> 
     4790            <xsl:variable name="userCalendarRoot" select="/bedework/system/userCalendarRoot"/> 
    47914791            <xsl:value-of select="$userCalendarRoot"/> 
    47924792            <div class="desc"> 
     
    47984798          <th>User Calendar Default name:</th> 
    47994799          <td> 
    4800             <xsl:variable name="userDefaultCalendar" select="/bedeworkadmin/system/userDefaultCalendar"/> 
     4800            <xsl:variable name="userDefaultCalendar" select="/bedework/system/userDefaultCalendar"/> 
    48014801            <input value="{$userDefaultCalendar}" name="userDefaultCalendar" /> 
    48024802            <div class="desc"> 
     
    48084808          <th>Trash Calendar Default name:</th> 
    48094809          <td> 
    4810             <xsl:variable name="defaultTrashCalendar" select="/bedeworkadmin/system/defaultTrashCalendar"/> 
     4810            <xsl:variable name="defaultTrashCalendar" select="/bedework/system/defaultTrashCalendar"/> 
    48114811            <input value="{$defaultTrashCalendar}" name="defaultTrashCalendar" /> 
    48124812            <div class="desc"> 
     
    48184818          <th>User Inbox Default name:</th> 
    48194819          <td> 
    4820             <xsl:variable name="userInbox" select="/bedeworkadmin/system/userInbox"/> 
     4820            <xsl:variable name="userInbox" select="/bedework/system/userInbox"/> 
    48214821            <input value="{$userInbox}" name="userInbox" /> 
    48224822            <div class="desc"> 
     
    48284828          <th>User Outbox Default name:</th> 
    48294829          <td> 
    4830             <xsl:variable name="userOutbox" select="/bedeworkadmin/system/userOutbox"/> 
     4830            <xsl:variable name="userOutbox" select="/bedework/system/userOutbox"/> 
    48314831            <input value="{$userOutbox}" name="userOutbox" /> 
    48324832            <div class="desc"> 
     
    48384838          <th>User Deleted Calendar Default name:</th> 
    48394839          <td> 
    4840             <xsl:variable name="deletedCalendar" select="/bedeworkadmin/system/deletedCalendar"/> 
     4840            <xsl:variable name="deletedCalendar" select="/bedework/system/deletedCalendar"/> 
    48414841            <input value="{$deletedCalendar}" name="deletedCalendar" /> 
    48424842            <div class="desc"> 
     
    48484848          <th>User Busy Calendar Default name:</th> 
    48494849          <td> 
    4850             <xsl:variable name="busyCalendar" select="/bedeworkadmin/system/busyCalendar"/> 
     4850            <xsl:variable name="busyCalendar" select="/bedework/system/busyCalendar"/> 
    48514851            <input value="{$busyCalendar}" name="busyCalendar" /> 
    48524852            <div class="desc"> 
     
    48584858          <th>Default user view name:</th> 
    48594859          <td> 
    4860             <xsl:variable name="defaultViewName" select="/bedeworkadmin/system/defaultUserViewName"/> 
     4860            <xsl:variable name="defaultViewName" select="/bedework/system/defaultUserViewName"/> 
    48614861            <input value="{$defaultViewName}" name="defaultUserViewName" /> 
    48624862            <div class="desc"> 
     
    48684868          <th>Http connections per user:</th> 
    48694869          <td> 
    4870             <xsl:variable name="httpPerUser" select="/bedeworkadmin/system/httpConnectionsPerUser"/> 
     4870            <xsl:variable name="httpPerUser" select="/bedework/system/httpConnectionsPerUser"/> 
    48714871            <input value="{$httpPerUser}" name="httpConnectionsPerUser" /> 
    48724872            <div class="desc"> 
     
    48774877          <th>Http connections per host:</th> 
    48784878          <td> 
    4879             <xsl:variable name="httpPerHost" select="/bedeworkadmin/system/httpConnectionsPerHost"/> 
     4879            <xsl:variable name="httpPerHost" select="/bedework/system/httpConnectionsPerHost"/> 
    48804880            <input value="{$httpPerHost}" name="httpConnectionsPerHost" /> 
    48814881            <div class="desc"> 
     
    48864886          <th>Total http connections:</th> 
    48874887          <td> 
    4888             <xsl:variable name="httpTotal" select="/bedeworkadmin/system/httpConnections"/> 
     4888            <xsl:variable name="httpTotal" select="/bedework/system/httpConnections"/> 
    48894889            <input value="{$httpTotal}" name="httpConnections" /> 
    48904890            <div class="desc"> 
     
    48954895          <th>Maximum length of public event description:</th> 
    48964896          <td> 
    4897             <xsl:variable name="maxPublicDescriptionLength" select="/bedeworkadmin/system/maxPublicDescriptionLength"/> 
     4897            <xsl:variable name="maxPublicDescriptionLength" select="/bedework/system/maxPublicDescriptionLength"/> 
    48984898            <input value="{$maxPublicDescriptionLength}" name="maxPublicDescriptionLength" /> 
    48994899            <div class="desc"> 
     
    49044904          <th>Maximum length of user event description:</th> 
    49054905          <td> 
    4906             <xsl:variable name="maxUserDescriptionLength" select="/bedeworkadmin/system/maxUserDescriptionLength"/> 
     4906            <xsl:variable name="maxUserDescriptionLength" select="/bedework/system/maxUserDescriptionLength"/> 
    49074907            <input value="{$maxUserDescriptionLength}" name="maxUserDescriptionLength" /> 
    49084908            <div class="desc"> 
     
    49134913          <th>Maximum size of a user entity:</th> 
    49144914          <td> 
    4915             <xsl:variable name="maxUserEntitySize" select="/bedeworkadmin/system/maxUserEntitySize"/> 
     4915            <xsl:variable name="maxUserEntitySize" select="/bedework/system/maxUserEntitySize"/> 
    49164916            <input value="{$maxUserEntitySize}" name="maxUserEntitySize" /> 
    49174917            <div class="desc"> 
     
    49224922          <th>Default user quota:</th> 
    49234923          <td> 
    4924             <xsl:variable name="defaultUserQuota" select="/bedeworkadmin/system/defaultUserQuota"/> 
     4924            <xsl:variable name="defaultUserQuota" select="/bedework/system/defaultUserQuota"/> 
    49254925            <input value="{$defaultUserQuota}" name="defaultUserQuota" /> 
    49264926            <div class="desc"> 
     
    49314931          <th>Max recurring instances:</th> 
    49324932          <td> 
    4933             <xsl:variable name="maxInstances" select="/bedeworkadmin/system/maxInstances"/> 
     4933            <xsl:variable name="maxInstances" select="/bedework/system/maxInstances"/> 
    49344934            <input value="{$maxInstances}" name="maxInstances" /> 
    49354935            <div class="desc"> 
     
    49414941          <th>Max recurring years:</th> 
    49424942          <td> 
    4943             <xsl:variable name="maxYears" select="/bedeworkadmin/system/maxYears"/> 
     4943            <xsl:variable name="maxYears" select="/bedework/system/maxYears"/> 
    49444944            <input value="{$maxYears}" name="maxYears" /> 
    49454945            <div class="desc"> 
     
    49514951          <th>User authorisation class:</th> 
    49524952          <td> 
    4953             <xsl:variable name="userauthClass" select="/bedeworkadmin/system/userauthClass"/> 
     4953            <xsl:variable name="userauthClass" select="/bedework/system/userauthClass"/> 
    49544954            <input value="{$userauthClass}" name="userauthClass" class="wide"/> 
    49554955            <div class="desc"> 
     
    49624962          <th>Mailer class:</th> 
    49634963          <td> 
    4964             <xsl:variable name="mailerClass" select="/bedeworkadmin/system/mailerClass"/> 
     4964            <xsl:variable name="mailerClass" select="/bedework/system/mailerClass"/> 
    49654965            <input value="{$mailerClass}" name="mailerClass" class="wide"/> 
    49664966            <div class="desc"> 
     
    49724972          <th>Admin groups class:</th> 
    49734973          <td> 
    4974             <xsl:variable name="admingroupsClass" select="/bedeworkadmin/system/admingroupsClass"/> 
     4974            <xsl:variable name="admingroupsClass" select="/bedework/system/admingroupsClass"/> 
    49754975            <input value="{$admingroupsClass}" name="admingroupsClass" class="wide"/> 
    49764976            <div class="desc"> 
     
    49834983          <th>User groups class:</th> 
    49844984          <td> 
    4985             <xsl:variable name="usergroupsClass" select="/bedeworkadmin/system/usergroupsClass"/> 
     4985            <xsl:variable name="usergroupsClass" select="/bedework/system/usergroupsClass"/> 
    49864986            <input value="{$usergroupsClass}" name="usergroupsClass" class="wide"/> 
    49874987            <div class="desc"> 
     
    49944994          <th>Directory browsing disallowed:</th> 
    49954995          <td> 
    4996             <xsl:variable name="directoryBrowsingDisallowed" select="/bedeworkadmin/system/directoryBrowsingDisallowed"/> 
     4996            <xsl:variable name="directoryBrowsingDisallowed" select="/bedework/system/directoryBrowsingDisallowed"/> 
    49974997            <input value="{$directoryBrowsingDisallowed}" name="directoryBrowsingDisallowed" /> 
    49984998            <div class="desc"> 
     
    50045004          <th>Index root:</th> 
    50055005          <td> 
    5006             <xsl:variable name="indexRoot" select="/bedeworkadmin/system/indexRoot"/> 
     5006            <xsl:variable name="indexRoot" select="/bedework/system/indexRoot"/> 
    50075007            <input value="{$indexRoot}" name="indexRoot" class="wide"/> 
    50085008            <div class="desc"> 
     
    51615161      <xsl:variable name="calPath" select="path"/> 
    51625162      <xsl:variable name="encodedCalPath" select="encodedPath"/> 
    5163       <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     5163      <xsl:if test="currentAccess/current-user-privilege-set/privilege/read-acl or /bedework/userInfo/superUser='true'"> 
    51645164        <h3>Manage suite administrators</h3> 
    51655165        <table class="common" id="sharing"> 
     
    51945194                </xsl:if> 
    51955195                <xsl:choose> 
    5196                   <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"> 
     5196                  <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"> 
    51975197                    <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
    5198                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/> 
     5198                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/> 
    51995199                  </xsl:when> 
    5200                   <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"> 
     5200                  <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"> 
    52015201                    <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> 
    5202                     <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/> 
     5202                    <xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/> 
    52035203                  </xsl:when> 
    52045204                  <xsl:when test="invert and $who='owner'"> 
     
    52395239                    <xsl:variable name="whoType"> 
    52405240                      <xsl:choose> 
    5241                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)">user</xsl:when> 
    5242                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)">group</xsl:when> 
     5241                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)">user</xsl:when> 
     5242                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)">group</xsl:when> 
    52435243                        <xsl:when test="$who='authenticated'">auth</xsl:when> 
    52445244                        <xsl:when test="$who='unauthenticated'">unauth</xsl:when> 
     
    52515251                    <xsl:variable name="shortWho"> 
    52525252                      <xsl:choose> 
    5253                         <xsl:when test="contains($who,/bedeworkadmin/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
    5254                         <xsl:when test="contains($who,/bedeworkadmin/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedeworkadmin/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
     5253                        <xsl:when test="contains($who,/bedework/syspars/userPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/userPrincipalRoot)),'/')"/></xsl:when> 
     5254                        <xsl:when test="contains($who,/bedework/syspars/groupPrincipalRoot)"><xsl:value-of select="substring-after(substring-after($who,normalize-space(/bedework/syspars/groupPrincipalRoot)),'/')"/></xsl:when> 
    52555255                        <xsl:otherwise></xsl:otherwise> 
    52565256                      </xsl:choose> 
     
    52765276      </xsl:if> 
    52775277 
    5278       <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedeworkadmin/userInfo/superUser='true'"> 
     5278      <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-acl or /bedework/userInfo/superUser='true'"> 
    52795279        <form name="calsuiteShareForm" action="{$calsuite-setAccess}" id="shareForm" method="post"> 
    52805280          <input type="hidden" name="calSuiteName" value="{$calSuiteName}"/> 
     
    53525352          </td> 
    53535353          <td> 
    5354             <xsl:value-of select="/bedeworkadmin/currentCalSuite/name"/> 
     5354            <xsl:value-of select="/bedework/currentCalSuite/name"/> 
    53555355          </td> 
    53565356        </tr> 
     
    53605360          </td> 
    53615361          <td> 
    5362             <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
     5362            <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/> 
    53635363            <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 
    53645364          </td> 
     
    53695369          </td> 
    53705370          <td> 
    5371             <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 
     5371            <xsl:variable name="preferredViewPeriod" select="/bedework/prefs/preferredViewPeriod"/> 
    53725372            <select name="viewPeriod"> 
    53735373              <!-- picking the selected item could be done with javascript. for 
     
    54215421          </td> 
    54225422          <td> 
    5423             <xsl:variable name="skinName" select="/bedeworkadmin/prefs/skinName"/> 
     5423            <xsl:variable name="skinName" select="/bedework/prefs/skinName"/> 
    54245424            <input type="text" name="skin" value="{$skinName}" size="40"/> 
    54255425          </td> 
     
    54305430          </td> 
    54315431          <td> 
    5432             <xsl:variable name="skinStyle" select="/bedeworkadmin/prefs/skinStyle"/> 
     5432            <xsl:variable name="skinStyle" select="/bedework/prefs/skinStyle"/> 
    54335433            <input type="text" name="skinStyle" value="{$skinStyle}" size="40"/> 
    54345434          </td> 
     
    54795479      </tr> 
    54805480 
    5481       <xsl:for-each select="bedeworkadmin/authUsers/authUser"> 
     5481      <xsl:for-each select="/bedework/authUsers/authUser"> 
    54825482        <!--<xsl:sort select="account" order="ascending" case-order="upper-first"/>--> 
    54835483        <tr> 
     
    55095509  <xsl:template name="modAuthUser"> 
    55105510    <h2>Update Administrator</h2> 
    5511     <xsl:variable name="modAuthUserAction" select="/bedeworkadmin/formElements/form/@action"/> 
     5511    <xsl:variable name="modAuthUserAction" select="/bedework/formElements/form/@action"/> 
    55125512    <form action="{$modAuthUserAction}" method="post"> 
    55135513      <table id="eventFormTable"> 
     
    55175517          </td> 
    55185518          <td> 
    5519             <xsl:value-of select="/bedeworkadmin/formElements/form/account"/> 
     5519            <xsl:value-of select="/bedework/formElements/form/account"/> 
    55205520          </td> 
    55215521        </tr> 
     
    55255525          </td> 
    55265526          <td> 
    5527             <xsl:copy-of select="/bedeworkadmin/formElements/form/alerts/*"/> 
     5527            <xsl:copy-of select="/bedework/formElements/form/alerts/*"/> 
    55285528          </td> 
    55295529        </tr> 
     
    55335533          </td> 
    55345534          <td> 
    5535             <xsl:copy-of select="/bedeworkadmin/formElements/form/publicEvents/*"/> 
     5535            <xsl:copy-of select="/bedework/formElements/form/publicEvents/*"/> 
    55365536          </td> 
    55375537        </tr> 
     
    55415541          </td> 
    55425542          <td> 
    5543             <xsl:copy-of select="/bedeworkadmin/formElements/form/superUser/*"/> 
     5543            <xsl:copy-of select="/bedework/formElements/form/superUser/*"/> 
    55445544          </td> 
    55455545        </tr> 
     
    55495549          </td> 
    55505550          <td> 
    5551             <xsl:copy-of select="/bedeworkadmin/formElements/form/email/*"/> 
     5551            <xsl:copy-of select="/bedework/formElements/form/email/*"/> 
    55525552            <span class="fieldInfo"></span> 
    55535553          </td> 
     
    55585558          </td> 
    55595559          <td> 
    5560             <xsl:copy-of select="/bedeworkadmin/formElements/form/phone/*"/> 
     5560            <xsl:copy-of select="/bedework/formElements/form/phone/*"/> 
    55615561            <span class="fieldInfo"></span> 
    55625562          </td> 
     
    55675567          </td> 
    55685568          <td> 
    5569             <xsl:copy-of select="/bedeworkadmin/formElements/form/dept/*"/> 
     5569            <xsl:copy-of select="/bedework/formElements/form/dept/*"/> 
    55705570            <span class="fieldInfo"></span> 
    55715571          </td> 
     
    55765576          </td> 
    55775577          <td> 
    5578             <xsl:copy-of select="/bedeworkadmin/formElements/form/lastName/*"/> 
     5578            <xsl:copy-of select="/bedework/formElements/form/lastName/*"/> 
    55795579            <span class="fieldInfo"></span> 
    55805580          </td> 
     
    55855585          </td> 
    55865586          <td> 
    5587             <xsl:copy-of select="/bedeworkadmin/formElements/form/firstName/*"/> 
     5587            <xsl:copy-of select="/bedework/formElements/form/firstName/*"/> 
    55885588            <span class="fieldInfo"></span> 
    55895589          </td> 
     
    56085608          </td> 
    56095609          <td> 
    5610             <xsl:value-of select="/bedeworkadmin/prefs/user"/> 
    5611             <xsl:variable name="user" select="/bedeworkadmin/prefs/user"/> 
     5610            <xsl:value-of select="/bedework/prefs/user"/> 
     5611            <xsl:variable name="user" select="/bedework/prefs/user"/> 
    56125612            <input type="hidden" name="user" value="{$user}"/> 
    56135613          </td> 
     
    56185618          </td> 
    56195619          <td> 
    5620             <xsl:variable name="preferredView" select="/bedeworkadmin/prefs/preferredView"/> 
     5620            <xsl:variable name="preferredView" select="/bedework/prefs/preferredView"/> 
    56215621            <input type="text" name="preferredView" value="{$preferredView}" size="40"/> 
    56225622          </td> 
     
    56275627          </td> 
    56285628          <td> 
    5629             <xsl:variable name="preferredViewPeriod" select="/bedeworkadmin/prefs/preferredViewPeriod"/> 
     5629            <xsl:variable name="preferredViewPeriod" select="/bedework/prefs/preferredViewPeriod"/> 
    56305630            <select name="viewPeriod"> 
    56315631              <!-- picking the selected item could be done with javascript. for 
     
    56795679          </td> 
    56805680          <td> 
    5681             <xsl:variable name="skinName" select="/bedeworkadmin/prefs/skinName"/> 
     5681            <xsl:variable name="skinName" select="/bedework/prefs/skinName"/> 
    56825682            <input type="text" name="skin" value="{$skinName}" size="40"/> 
    56835683          </td> 
     
    56885688          </td> 
    56895689          <td> 
    5690             <xsl:variable name="skinStyle" select="/bedeworkadmin/prefs/skinStyle"/> 
     5690            <xsl:variable name="skinStyle" select="/bedework/prefs/skinStyle"/> 
    56915691            <input type="text" name="skinStyle" value="{$skinStyle}" size="40"/> 
    56925692          </td> 
     
    57065706    <form name="adminGroupMembersForm" method="post" action="{$admingroup-initUpdate}"> 
    57075707      <xsl:choose> 
    5708         <xsl:when test="/bedeworkadmin/groups/showMembers='true'"> 
     5708        <xsl:when test="/bedework/groups/showMembers='true'"> 
    57095709          <input type="radio" name="showAgMembers" value="false" onclick="document.adminGroupMembersForm.submit();"/> 
    57105710          Hide members 
     
    57305730        <th>Name</th> 
    57315731        <th>Description</th> 
    5732         <xsl:if test="/bedeworkadmin/groups/showMembers='true'"> 
     5732        <xsl:if test="/bedework/groups/showMembers='true'"> 
    57335733          <th>Members</th> 
    57345734        </xsl:if> 
    57355735        <th></th> 
    57365736      </tr> 
    5737       <xsl:for-each select="/bedeworkadmin/groups/group"> 
     5737      <xsl:for-each select="/bedework/groups/group"> 
    57385738        <!--<xsl:sort select="name" order="ascending" case-order="upper-first"/>--> 
    57395739        <xsl:variable name="groupName" select="name"/> 
     
    57475747            <xsl:value-of select="desc"/> 
    57485748          </td> 
    5749           <xsl:if test="/bedeworkadmin/groups/showMembers='true'"> 
     5749          <xsl:if test="/bedework/groups/showMembers='true'"> 
    57505750            <td> 
    57515751              <xsl:for-each select="members/member/account"> 
     
    57945794  <xsl:template name="modAdminGroup"> 
    57955795    <xsl:choose> 
    5796       <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     5796      <xsl:when test="/bedework/creating = 'true'"> 
    57975797        <h2>Add Group</h2> 
    57985798      </xsl:when> 
     
    58095809          <td> 
    58105810            <xsl:choose> 
    5811               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
    5812                 <xsl:copy-of select="/bedeworkadmin/formElements/form/name/*"/> 
     5811              <xsl:when test="/bedework/creating = 'true'"> 
     5812                <xsl:copy-of select="/bedework/formElements/form/name/*"/> 
    58135813              </xsl:when> 
    58145814              <xsl:otherwise> 
    5815                 <xsl:value-of select="/bedeworkadmin/formElements/form/name"/> 
     5815                <xsl:value-of select="/bedework/formElements/form/name"/> 
    58165816              </xsl:otherwise> 
    58175817            </xsl:choose> 
     
    58235823          </td> 
    58245824          <td> 
    5825             <xsl:copy-of select="/bedeworkadmin/formElements/form/desc/*"/> 
     5825            <xsl:copy-of select="/bedework/formElements/form/desc/*"/> 
    58265826          </td> 
    58275827        </tr> 
     
    58315831          </td> 
    58325832          <td> 
    5833             <xsl:copy-of select="/bedeworkadmin/formElements/form/groupOwner/*"/> 
     5833            <xsl:copy-of select="/bedework/formElements/form/groupOwner/*"/> 
    58345834          </td> 
    58355835        </tr> 
     
    58405840          <td> 
    58415841           <xsl:choose> 
    5842               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
    5843                 <xsl:copy-of select="/bedeworkadmin/formElements/form/eventsOwner/*"/> 
     5842              <xsl:when test="/bedework/creating = 'true'"> 
     5843                <xsl:copy-of select="/bedework/formElements/form/eventsOwner/*"/> 
    58445844              </xsl:when> 
    58455845              <xsl:otherwise> 
    5846                 <xsl:value-of select="/bedeworkadmin/formElements/form/eventsOwner/input/@value"/> 
     5846                <xsl:value-of select="/bedework/formElements/form/eventsOwner/input/@value"/> 
    58475847              </xsl:otherwise> 
    58485848            </xsl:choose> 
     
    58545854          <td> 
    58555855            <xsl:choose> 
    5856               <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     5856              <xsl:when test="/bedework/creating = 'true'"> 
    58575857                <input type="submit" name="updateAdminGroup" value="Add Admin Group"/> 
    58585858                <input type="submit" name="cancelled" value="Cancel"/> 
     
    58675867          </td> 
    58685868          <td align="right"> 
    5869             <xsl:if test="/bedeworkadmin/creating = 'false'"> 
     5869            <xsl:if test="/bedework/creating = 'false'"> 
    58705870              <input type="submit" name="delete" value="Delete"/> 
    58715871            </xsl:if> 
     
    58995899        </td> 
    59005900        <td> 
    5901           <xsl:value-of select="/bedeworkadmin/adminGroup/name"/> 
     5901          <xsl:value-of select="/bedework/adminGroup/name"/> 
    59025902        </td> 
    59035903      </tr> 
     
    59085908        <td> 
    59095909          <table id="memberAccountList"> 
    5910             <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
     5910            <xsl:for-each select="/bedework/adminGroup/members/member"> 
    59115911              <xsl:choose> 
    59125912                <xsl:when test="kind='0'"><!-- kind = user --> 
     
    59635963    <p> 
    59645964      <strong> 
    5965         <xsl:value-of select="/bedeworkadmin/groups/group/name"/> 
     5965        <xsl:value-of select="/bedework/groups/group/name"/> 
    59665966      </strong>: 
    5967       <xsl:value-of select="/bedeworkadmin/groups/group/desc"/> 
     5967      <xsl:value-of select="/bedework/groups/group/desc"/> 
    59685968    </p> 
    59695969    <form name="adminGroupDelete" method="post" action="{$admingroup-delete}"> 
     
    60256025          Search: 
    60266026          <input type="text" name="query" size="15"> 
    6027             <xsl:attribute name="value"><xsl:value-of select="/bedeworkadmin/searchResults/query"/></xsl:attribute> 
     6027            <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute> 
    60286028          </input> 
    60296029          <input type="submit" name="submit" value="go"/> 
    60306030          Limit: 
    60316031          <xsl:choose> 
    6032             <xsl:when test="/bedeworkadmin/searchResults/searchLimits = 'beforeToday'"> 
     6032            <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'"> 
    60336033              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
    60346034              <input type="radio" name="searchLimits" value="beforeToday" checked="checked"/>past dates 
    60356035              <input type="radio" name="searchLimits" value="none"/>all dates 
    60366036            </xsl:when> 
    6037             <xsl:when test="/bedeworkadmin/searchResults/searchLimits = 'none'"> 
     6037            <xsl:when test="/bedework/searchResults/searchLimits = 'none'"> 
    60386038              <input type="radio" name="searchLimits" value="fromToday"/>today forward 
    60396039              <input type="radio" name="searchLimits" value="beforeToday"/>past dates 
     
    60536053      <tr> 
    60546054        <th colspan="5"> 
    6055           <xsl:if test="/bedeworkadmin/searchResults/numPages &gt; 1"> 
    6056             <xsl:variable name="curPage" select="/bedeworkadmin/searchResults/curPage"/> 
     6055          <xsl:if test="/bedework/searchResults/numPages &gt; 1"> 
     6056            <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
    60576057            <div id="searchPageForm"> 
    60586058              page: 
    6059               <xsl:if test="/bedeworkadmin/searchResults/curPage != 1"> 
     6059              <xsl:if test="/bedework/searchResults/curPage != 1"> 
    60606060                <xsl:variable name="prevPage" select="number($curPage) - 1"/> 
    60616061                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a> 
     
    60746074              <xsl:text> </xsl:text> 
    60756075              <xsl:choose> 
    6076                 <xsl:when test="$curPage != /bedeworkadmin/searchResults/numPages"> 
     6076                <xsl:when test="$curPage != /bedework/searchResults/numPages"> 
    60776077                  <xsl:variable name="nextPage" select="number($curPage) + 1"/> 
    60786078                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt; 
     
    60846084            </div> 
    60856085          </xsl:if> 
    6086           <xsl:value-of select="/bedeworkadmin/searchResults/resultSize"/> 
    6087           result<xsl:if test="/bedeworkadmin/searchResults/resultSize != 1">s</xsl:if> returned 
    6088           for <em><xsl:value-of select="/bedeworkadmin/searchResults/query"/></em> 
     6086          <xsl:value-of select="/bedework/searchResults/resultSize"/> 
     6087          result<xsl:if test="/bedework/searchResults/resultSize != 1">s</xsl:if> returned 
     6088          for <em><xsl:value-of select="/bedework/searchResults/query"/></em> 
    60896089        </th> 
    60906090      </tr> 
    6091       <xsl:if test="/bedeworkadmin/searchResults/searchResult"> 
     6091      <xsl:if test="/bedework/searchResults/searchResult"> 
    60926092        <tr class="fieldNames"> 
    60936093          <td> 
     
    61086108        </tr> 
    61096109      </xsl:if> 
    6110       <xsl:for-each select="/bedeworkadmin/searchResults/searchResult"> 
     6110      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    61116111        <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    61126112        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
     
    61536153  <xsl:template name="searchResultPageNav"> 
    61546154    <xsl:param name="page">1</xsl:param> 
    6155     <xsl:variable name="curPage" select="/bedeworkadmin/searchResults/curPage"/> 
    6156     <xsl:variable name="numPages" select="/bedeworkadmin/searchResults/numPages"/> 
     6155    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/> 
     6156    <xsl:variable name="numPages" select="/bedework/searchResults/numPages"/> 
    61576157    <xsl:variable name="endPage"> 
    61586158      <xsl:choose>