Changeset 629

Show
Ignore:
Timestamp:
06/22/06 14:29:22
Author:
johnsa
Message:

stylesheet changes - partially working uportal skins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r625 r629  
    7171 
    7272  <!-- Properly encoded prefixes to the application actions; use these to build 
    73        urls; allows the application to be used without cookies or within a portal. --> 
     73       urls; allows the application to be used without cookies or within a portal. 
     74       These urls are rewritten in header.jsp and simply passed through for use 
     75       here. Every url includes a query string (either ?b=de or a real query 
     76       string) so that all links constructed in this stylesheet may begin the 
     77       query string with an ampersand. --> 
    7478  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    7579  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

    r618 r629  
    7171 
    7272  <!-- Properly encoded prefixes to the application actions; use these to build 
    73        urls; allows the application to be used without cookies or within a portal. --> 
     73       urls; allows the application to be used without cookies or within a portal. 
     74       These urls are rewritten in header.jsp and simply passed through for use 
     75       here. Every url includes a query string (either ?b=de or a real query 
     76       string) so that all links constructed in this stylesheet may begin the 
     77       query string with an ampersand. --> 
    7478  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    7579  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl

    r625 r629  
    8282 
    8383  <!-- Properly encoded prefixes to the application actions; use these to build 
    84        urls; allows the application to be used without cookies or within a portal. --> 
     84       urls; allows the application to be used without cookies or within a portal. 
     85       These urls are rewritten in header.jsp and simply passed through for use 
     86       here. Every url includes a query string (either ?b=de or a real query 
     87       string) so that all links constructed in this stylesheet may begin the 
     88       query string with an ampersand. --> 
    8589  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    8690  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
  • trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl

    r625 r629  
    6161 
    6262        <!-- Properly encoded prefixes to the application actions; use these to build 
    63                          urls; allows the application to be used without cookies or within a portal. --> 
     63                         urls; allows the application to be used without cookies or within a portal. 
     64       These urls are rewritten in header.jsp and simply passed through for use 
     65       here. Every url includes a query string (either ?b=de or a real query 
     66       string) so that all links constructed in this stylesheet may begin the 
     67       query string with an ampersand. --> 
    6468        <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    6569        <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
     
    6872        <xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/> 
    6973        <xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/> 
    70         <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/
    71         <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/> 
    72         <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/> 
    73         <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
     74        <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable
     75        <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/> 
     76        <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/> 
     77        <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/> 
    7478        <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/> 
    7579        <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/> 
     
    8690        <xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/> 
    8791        <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    88         <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/> 
    89         <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/> 
     92        <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/> 
     93        <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/> 
    9094        <!-- calendars --> 
    9195        <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    92         <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used --> 
    93         <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used --> 
    94         <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used --> 
    95         <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
    96         <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
    97         <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
    98         <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
    99         <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
     96        <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used --> 
     97        <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used --> 
     98        <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used --> 
     99        <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/> 
     100        <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/> 
     101        <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used --> 
     102        <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used --> 
     103        <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/> 
    100104        <!-- subscriptions --> 
    101         <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
    102         <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    103         <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/> 
    104         <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/> 
    105         <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    106         <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
     105        <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/> 
     106        <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/> 
     107        <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/> 
     108        <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/> 
     109        <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/> 
     110        <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/> 
    107111        <!-- preferences --> 
    108         <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
    109         <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
     112        <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/> 
     113        <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/> 
    110114 
    111115        <!-- URL of the web application - includes web context 
  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r625 r629  
    6161 
    6262        <!-- Properly encoded prefixes to the application actions; use these to build 
    63                          urls; allows the application to be used without cookies or within a portal. --> 
     63                         urls; allows the application to be used without cookies or within a portal. 
     64       These urls are rewritten in header.jsp and simply passed through for use 
     65       here. Every url includes a query string (either ?b=de or a real query 
     66       string) so that all links constructed in this stylesheet may begin the 
     67       query string with an ampersand. --> 
    6468        <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
    6569        <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
     
    6872        <xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/> 
    6973        <xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/> 
    70         <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/
    71         <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/> 
    72         <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/> 
    73         <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
     74        <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable
     75        <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/> 
     76        <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/> 
     77        <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/> 
    7478        <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/> 
    7579        <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/> 
     
    8690        <xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/> 
    8791        <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    88         <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/> 
    89         <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/> 
     92        <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/> 
     93        <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/> 
    9094        <!-- calendars --> 
    9195        <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    92         <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used --> 
    93         <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used --> 
    94         <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used --> 
    95         <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
    96         <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
    97         <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
    98         <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
    99         <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
     96        <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used --> 
     97        <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used --> 
     98        <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used --> 
     99        <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/> 
     100        <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/> 
     101        <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used --> 
     102        <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used --> 
     103        <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/> 
    100104        <!-- subscriptions --> 
    101         <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
    102         <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    103         <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/> 
    104         <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/> 
    105         <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    106         <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
     105        <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/> 
     106        <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/> 
     107        <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/> 
     108        <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/> 
     109        <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/> 
     110        <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/> 
    107111        <!-- preferences --> 
    108         <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
    109         <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
     112        <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/> 
     113        <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/> 
    110114 
    111115        <!-- URL of the web application - includes web context 
  • trunk/calendar3/webclient/war/docs/header.jsp

    r625 r629  
    141141      <delEvent><genurl:rewrite action="delEvent.do?b=de"/></delEvent> 
    142142      <event> 
    143         <setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess> 
    144         <addEventRefComplete><genurl:link page="/event/addEventRefComplete.do?b=de"/></addEventRefComplete> 
    145         <selectCalForEvent><genurl:link page="/event/selectCalForEvent.do?b=de"/></selectCalForEvent> 
     143        <setAccess><genurl:rewrite action="/event/setAccess.do?b=de"/></setAccess> 
     144        <addEventRefComplete><genurl:rewrite action="/event/addEventRefComplete.do?b=de"/></addEventRefComplete> 
     145        <selectCalForEvent><genurl:rewrite action="/event/selectCalForEvent.do?b=de"/></selectCalForEvent> 
    146146      </event> 
    147147 
    148148      <freeBusy> 
    149         <fetch><genurl:link page="/freeBusy/getFreeBusy.do?b=de"/></fetch> 
    150         <setAccess><genurl:link page="/freeBusy/setAccess.do?b=de"/></setAccess> 
     149        <fetch><genurl:rewrite action="/freeBusy/getFreeBusy.do?b=de"/></fetch> 
     150        <setAccess><genurl:rewrite action="/freeBusy/setAccess.do?b=de"/></setAccess> 
    151151      </freeBusy> 
    152152 
    153153      <calendar> 
    154         <fetch><genurl:link page="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep --> 
    155         <fetchDescriptions><genurl:link page="/calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep --> 
    156         <initAdd><genurl:link page="/calendar/initAdd.do?b=de"/></initAdd><!-- keep --> 
    157         <delete><genurl:link page="/calendar/delete.do?b=de"/></delete> 
    158         <fetchForDisplay><genurl:link page="/calendar/fetchForDisplay.do?b=de"/></fetchForDisplay> 
    159         <fetchForUpdate><genurl:link page="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep --> 
    160         <update><genurl:link page="/calendar/update.do?b=de"/></update><!-- keep --> 
    161         <setAccess><genurl:link page="/calendar/setAccess.do?b=de"/></setAccess> 
     154        <fetch><genurl:rewrite action="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep --> 
     155        <fetchDescriptions><genurl:rewrite action="/calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep --> 
     156        <initAdd><genurl:rewrite action="/calendar/initAdd.do?b=de"/></initAdd><!-- keep --> 
     157        <delete><genurl:rewrite action="/calendar/delete.do?b=de"/></delete> 
     158        <fetchForDisplay><genurl:rewrite action="/calendar/fetchForDisplay.do?b=de"/></fetchForDisplay> 
     159        <fetchForUpdate><genurl:rewrite action="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep --> 
     160        <update><genurl:rewrite action="/calendar/update.do?b=de"/></update><!-- keep --> 
     161        <setAccess><genurl:rewrite action="/calendar/setAccess.do?b=de"/></setAccess> 
    162162      </calendar> 
    163163 
    164164      <subscriptions> <!-- only those listed are used here (no need to clean up) --> 
    165         <fetch><genurl:link page="/subs/fetch.do?b=de"/></fetch> 
    166         <fetchForUpdate><genurl:link page="/subs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
    167         <addSubByUri><genurl:link page="/subs/showAddByUriForm.rdo?b=de"/></addSubByUri> 
    168         <subscribeByUri><genurl:link page="/subs/subscribeByUri.do?b=de"/></subscribeByUri> 
    169         <initAdd><genurl:link page="/subs/initAdd.do?b=de"/></initAdd> 
    170         <subscribe><genurl:link page="/subs/subscribe.do?b=de"/></subscribe> 
     165        <fetch><genurl:rewrite action="subs/fetch.do?b=de"/></fetch> 
     166        <fetchForUpdate><genurl:rewrite action="subs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
     167        <addSubByUri><genurl:rewrite action="subs/showAddByUriForm.rdo?b=de"/></addSubByUri> 
     168        <subscribeByUri><genurl:rewrite action="subs/subscribeByUri.do?b=de"/></subscribeByUri> 
     169        <initAdd><genurl:rewrite action="subs/initAdd.do?b=de"/></initAdd> 
     170        <subscribe><genurl:rewrite action="subs/subscribe.do?b=de"/></subscribe> 
    171171      </subscriptions> 
    172172 
     
    177177 
    178178      <prefs> 
    179         <fetchForUpdate><genurl:link page="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
    180         <update><genurl:link page="/prefs/update.do?b=de"/></update> 
     179        <fetchForUpdate><genurl:rewrite action="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
     180        <update><genurl:rewrite action="/prefs/update.do?b=de"/></update> 
    181181      </prefs> 
    182182