Changeset 105

Show
Ignore:
Timestamp:
02/07/06 12:34:10
Author:
johnsa
Message:

correctly set urlprefix in header.jsp for setViewPeriod action

********************
changed root xml element from /ucalendar to /bedework and updated demo stylesheet
********************

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r104 r105  
    4242       reference it explicitly.  It is not used in this stylesheet, however, 
    4343       and can be safely removed if you so choose. --> 
    44   <xsl:variable name="appRoot" select="/ucalendar/approot"/> 
     44  <xsl:variable name="appRoot" select="/bedework/approot"/> 
    4545 
    4646  <!-- URL of html resources (images, css, other html); by default this is 
    4747       set to the application root --> 
    48   <xsl:variable name="resourcesRoot" select="/ucalendar/approot"/> 
     48  <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    4949 
    5050  <!-- Properly encoded prefixes to the application actions; use these to build 
    5151       urls; allows the application to be used without cookies or within a portal. --> 
    52   <xsl:variable name="setup" select="/ucalendar/urlPrefixes/setup"/> 
    53   <xsl:variable name="setSelection" select="/ucalendar/urlPrefixes/setSelection"/> 
    54   <xsl:variable name="fetchPublicCalendars" select="/ucalendar/urlPrefixes/fetchPublicCalendars"/> 
    55   <xsl:variable name="setViewPeriod" select="/ucalendar/urlPrefixes/setViewPeriod"/> 
    56   <xsl:variable name="eventView" select="/ucalendar/urlPrefixes/eventView"/> 
    57   <xsl:variable name="addEventRef" select="/ucalendar/urlPrefixes/addEventRef"/> 
    58   <xsl:variable name="export" select="/ucalendar/urlPrefixes/export"/> 
    59   <xsl:variable name="mailEvent" select="/ucalendar/urlPrefixes/mailEvent"/> 
    60   <xsl:variable name="showPage" select="/ucalendar/urlPrefixes/showPage"/> 
     52  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/> 
     53  <xsl:variable name="setSelection" select="/bedework/urlPrefixes/setSelection"/> 
     54  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
     55  <xsl:variable name="setViewPeriod" select="/bedework/urlPrefixes/setViewPeriod"/> 
     56  <xsl:variable name="eventView" select="/bedework/urlPrefixes/eventView"/> 
     57  <xsl:variable name="addEventRef" select="/bedework/urlPrefixes/addEventRef"/> 
     58  <xsl:variable name="export" select="/bedework/urlPrefixes/export"/> 
     59  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mailEvent"/> 
     60  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
    6161 
    6262  <!-- Other generally useful global variables --> 
    6363  <xsl:variable name="privateCal">/ucal</xsl:variable> 
    64   <xsl:variable name="prevdate" select="/ucalendar/previousdate"/> 
    65   <xsl:variable name="nextdate" select="/ucalendar/nextdate"/> 
    66   <xsl:variable name="curdate" select="/ucalendar/currentdate/date"/> 
     64  <xsl:variable name="prevdate" select="/bedework/previousdate"/> 
     65  <xsl:variable name="nextdate" select="/bedework/nextdate"/> 
     66  <xsl:variable name="curdate" select="/bedework/currentdate/date"/> 
    6767  <xsl:variable name="skin">default</xsl:variable> 
    6868 
    …… 
    7272       strings; the latter are needed for proper behavior in portal environments 
    7373       or if users have cookies turned off, etc. 
    74   <xsl:variable name="urlPattern" select="/ucalendar/urlpattern"/> --> 
     74  <xsl:variable name="urlPattern" select="/bedework/urlpattern"/> --> 
    7575 
    7676  <!-- All values that follow DUMMYACTION.do in the urlPattern; may include 
    …… 
    9494       value was originally prepended to all URLs generated in this stylesheet 
    9595       but will probably be deprecated in favor of relative references 
    96   <xsl:variable name="urlPrefix" select="/ucalendar/urlprefix"/>  --> 
     96  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/>  --> 
    9797  <!--========= END DEPRECATED VARIABLES =========--> 
    9898 
    …… 
    104104        <title>Calendar of Events</title> 
    105105        <xsl:choose> 
    106           <xsl:when test="/ucalendar/appvar[key='style']/value='red'"> 
     106          <xsl:when test="/bedework/appvar[key='style']/value='red'"> 
    107107            <link rel="stylesheet" href="{$resourcesRoot}/default/default/red.css"/> 
    108108          </xsl:when> 
    109           <xsl:when test="/ucalendar/appvar[key='style']/value='green'"> 
     109          <xsl:when test="/bedework/appvar[key='style']/value='green'"> 
    110110            <link rel="stylesheet" href="{$resourcesRoot}/default/default/green.css"/> 
    111111          </xsl:when> 
    …… 
    118118      <body> 
    119119        <xsl:call-template name="headBar"/> 
    120         <xsl:if test="/ucalendar/error"> 
     120        <xsl:if test="/bedework/error"> 
    121121          <div id="errors"> 
    122             <p><xsl:apply-templates select="/ucalendar/error"/></p> 
     122            <p><xsl:apply-templates select="/bedework/error"/></p> 
    123123          </div> 
    124124        </xsl:if> 
    …… 
    126126        <xsl:call-template name="tabs"/> 
    127127        <xsl:choose> 
    128           <xsl:when test="/ucalendar/page='event'"> 
     128          <xsl:when test="/bedework/page='event'"> 
    129129            <!-- show an event --> 
    130             <xsl:apply-templates select="/ucalendar/event"/> 
     130            <xsl:apply-templates select="/bedework/event"/> 
    131131          </xsl:when> 
    132           <xsl:when test="/ucalendar/page='calendars'"> 
     132          <xsl:when test="/bedework/page='calendars'"> 
    133133            <!-- show a list of all calendars --> 
    134             <xsl:apply-templates select="/ucalendar/calendars"/> 
     134            <xsl:apply-templates select="/bedework/calendars"/> 
    135135          </xsl:when> 
    136           <xsl:when test="/ucalendar/page='emailOptions'"> 
     136          <xsl:when test="/bedework/page='emailOptions'"> 
    137137            <xsl:call-template name="emailOptions" /> 
    138138          </xsl:when> 
    …… 
    140140            <!-- otherwise, show the eventsCalendar --> 
    141141            <xsl:call-template name="navigation"/> 
    142             <xsl:if test="/ucalendar/periodname!='Year'"> 
     142            <xsl:if test="/bedework/periodname!='Year'"> 
    143143              <xsl:call-template name="searchBar"/> 
    144144            </xsl:if> 
    145145            <!-- main eventCalendar content --> 
    146146            <xsl:choose> 
    147               <xsl:when test="/ucalendar/periodname='Day'"> 
     147              <xsl:when test="/bedework/periodname='Day'"> 
    148148                <xsl:call-template name="listView"/> 
    149149              </xsl:when> 
    150               <xsl:when test="/ucalendar/periodname='Week' or /ucalendar/periodname=''"> 
     150              <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    151151                <xsl:choose> 
    152                   <xsl:when test="/ucalendar/appvar[key='weekViewMode']/value='list'"> 
     152                  <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
    153153                    <xsl:call-template name="listView"/> 
    154154                  </xsl:when> 
    …… 
    158158                </xsl:choose> 
    159159              </xsl:when> 
    160               <xsl:when test="/ucalendar/periodname='Month'"> 
     160              <xsl:when test="/bedework/periodname='Month'"> 
    161161                <xsl:choose> 
    162                   <xsl:when test="/ucalendar/appvar[key='monthViewMode']/value='list'"> 
     162                  <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
    163163                    <xsl:call-template name="listView"/> 
    164164                  </xsl:when> 
    …… 
    301301    <table id="listTable" border="0" cellpadding="0" cellspacing="0"> 
    302302      <xsl:choose> 
    303         <xsl:when test="count(/ucalendar/eventscalendar/year/month/week/day/event)=0"> 
     303        <xsl:when test="count(/bedework/eventscalendar/year/month/week/day/event)=0"> 
    304304          <tr> 
    305305            <td class="noEventsCell"> 
    306306              There are no events posted 
    307307              <xsl:choose> 
    308                 <xsl:when test="/ucalendar/periodname='Day'"> 
    309                   today<xsl:if test="/ucalendar/title!=''"> for <strong><xsl:value-of select="/ucalendar/title"/></strong></xsl:if><xsl:if test="/ucalendar/search!=''"> for search term <strong>"<xsl:value-of select="/ucalendar/search"/>"</strong></xsl:if>. 
     308                <xsl:when test="/bedework/periodname='Day'"> 
     309                  today<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    310310                </xsl:when> 
    311                 <xsl:when test="/ucalendar/periodname='Month'"> 
    312                   this month<xsl:if test="/ucalendar/title!=''"> for <strong><xsl:value-of select="/ucalendar/title"/></strong></xsl:if><xsl:if test="/ucalendar/search!=''"> for search term <strong>"<xsl:value-of select="/ucalendar/search"/>"</strong></xsl:if>. 
     311                <xsl:when test="/bedework/periodname='Month'"> 
     312                  this month<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    313313                </xsl:when> 
    314314                <xsl:otherwise> 
    315                   this week<xsl:if test="/ucalendar/title!=''"> for <strong><xsl:value-of select="/ucalendar/title"/></strong></xsl:if><xsl:if test="/ucalendar/search!=''"> for search term <strong>"<xsl:value-of select="/ucalendar/search"/>"</strong></xsl:if>. 
     315                  this week<xsl:if test="/bedework/title!=''"> for <strong><xsl:value-of select="/bedework/title"/></strong></xsl:if><xsl:if test="/bedework/search!=''"> for search term <strong>"<xsl:value-of select="/bedework/search"/>"</strong></xsl:if>. 
    316316                </xsl:otherwise> 
    317317              </xsl:choose> 
    …… 
    320320        </xsl:when> 
    321321        <xsl:otherwise> 
    322           <xsl:for-each select="/ucalendar/eventscalendar/year/month/week/day[count(event)!=0]"> 
    323             <xsl:if test="/ucalendar/periodname='Week' or /ucalendar/periodname='Month' or /ucalendar/periodname=''"> 
     322          <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[count(event)!=0]"> 
     323            <xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''"> 
    324324              <tr> 
    325325                <td colspan="5" class="dateRow"> 
    …… 
    413413                <td class="{$descriptionClass}"> 
    414414                  <xsl:choose> 
    415                     <xsl:when test="/ucalendar/appvar[key='summaryMode']/value='details'"> 
     415                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    416416                      <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    417417                        <strong><xsl:value-of select="summary"/>: </strong> 
    …… 
    443443                </td> 
    444444                <td class="icons"> 
    445                   <variable name="confId" select="/ucalendar/confirmationid"/> 
     445                  <variable name="confId" select="/bedework/confirmationid"/> 
    446446                  <a href="{$privateCal}/addEventRef.do?eventId={$id}" title="Add event to MyCalendar" target="myCalendar"> 
    447447                    <img class="addref" src="{$resourcesRoot}/images/demo/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    …… 
    464464    <table id="monthCalendarTable" border="0" cellpadding="0" cellspacing="0"> 
    465465      <tr> 
    466         <xsl:for-each select="/ucalendar/daynames/val"> 
     466        <xsl:for-each select="/bedework/daynames/val"> 
    467467          <th class="dayHeading"><xsl:value-of select="."/></th> 
    468468        </xsl:for-each> 
    469469      </tr> 
    470470      <tr> 
    471         <xsl:for-each select="/ucalendar/eventscalendar/year/month/week/day"> 
     471        <xsl:for-each select="/bedework/eventscalendar/year/month/week/day"> 
    472472          <xsl:variable name="dayPos" select="position()"/> 
    473473          <xsl:if test="filler='false'"> 
    …… 
    493493    <table id="monthCalendarTable" border="0" cellpadding="0" cellspacing="0"> 
    494494      <tr> 
    495         <xsl:for-each select="/ucalendar/daynames/val"> 
     495        <xsl:for-each select="/bedework/daynames/val"> 
    496496          <th class="dayHeading"><xsl:value-of select="."/></th> 
    497497        </xsl:for-each> 
    498498      </tr> 
    499       <xsl:for-each select="/ucalendar/eventscalendar/year/month/week"> 
     499      <xsl:for-each select="/bedework/eventscalendar/year/month/week"> 
    500500        <tr> 
    501501          <xsl:for-each select="day"> 
    …… 
    533533      <xsl:choose> 
    534534        <!-- Special styles for the month grid --> 
    535         <xsl:when test="contains(summary,'CANCELLED')">eventCancelled</xsl:when> 
     535        <xsl:when test="status='cancelled'">eventCancelled</xsl:when> 
    536536        <xsl:when test="calendar/name='Holidays'">holiday</xsl:when> 
    537537        <!-- Alternating colors for all standard events --> 
    …… 
    571571    <table id="yearCalendarTable" border="0" cellpadding="0" cellspacing="0"> 
    572572      <tr> 
    573         <xsl:apply-templates select="/ucalendar/eventscalendar/year/month[position() &lt;= 3]"/> 
    574       </tr> 
    575       <tr> 
    576         <xsl:apply-templates select="/ucalendar/eventscalendar/year/month[(position() &gt; 3) and (position() &lt;= 6)]"/> 
    577       </tr> 
    578       <tr> 
    579         <xsl:apply-templates select="/ucalendar/eventscalendar/year/month[(position() &gt; 6) and (position() &lt;= 9)]"/> 
    580       </tr> 
    581       <tr> 
    582         <xsl:apply-templates select="/ucalendar/eventscalendar/year/month[position() &gt; 9]"/> 
     573        <xsl:apply-templates select="/bedework/eventscalendar/year/month[position() &lt;= 3]"/> 
     574      </tr> 
     575      <tr> 
     576        <xsl:apply-templates select="/bedework/eventscalendar/year/month[(position() &gt; 3) and (position() &lt;= 6)]"/> 
     577      </tr> 
     578      <tr> 
     579        <xsl:apply-templates select="/bedework/eventscalendar/year/month[(position() &gt; 6) and (position() &lt;= 9)]"/> 
     580      </tr> 
     581      <tr> 
     582        <xsl:apply-templates select="/bedework/eventscalendar/year/month[position() &gt; 9]"/> 
    583583      </tr> 
    584584    </table> 
    …… 
    599599        <tr> 
    600600          <th>&#160;</th> 
    601           <xsl:for-each select="/ucalendar/shortdaynames/val"> 
     601          <xsl:for-each select="/bedework/shortdaynames/val"> 
    602602            <th><xsl:value-of select="."/></th> 
    603603          </xsl:for-each> 
    …… 
    634634  <!--==== CALENDARS PAGE ====--> 
    635635  <xsl:template match="calendars"> 
    636     <xsl:variable name="topLevelCalCount" select="count(/ucalendar/calendars/calendar/calendar)"/> 
     636    <xsl:variable name="topLevelCalCount" select="count(/bedework/calendars/calendar/calendar)"/> 
    637637    <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
    638638      <tr> 
    …… 
    683683          </td> 
    684684          <td align="left"> 
    685             <xsl:copy-of select="/ucalendar/emailoptionsform/form/email/*"/> 
     685            <xsl:copy-of select="/bedework/emailoptionsform/form/email/*"/> 
    686686          </td> 
    687687        </tr> 
    …… 
    691691          </td> 
    692692          <td align="left"> 
    693             <xsl:copy-of select="/ucalendar/emailoptionsform/form/subject/*"/> 
     693            <xsl:copy-of select="/bedework/emailoptionsform/form/subject/*"/> 
    694694          </td> 
    695695        </tr> 
    …… 
    744744        <td width="50" class="imgCell"><img alt="*" src="{$resourcesRoot}/images/demo/spacer.gif" width="50" height="14" border="0"/></td> 
    745745        <td align="center" width="100%"> 
    746           <xsl:value-of select="/ucalendar/firstday/longdate"/> 
    747           <xsl:if test="/ucalendar/periodname!='Day'"> 
     746          <xsl:value-of select="/bedework/firstday/longdate"/> 
     747          <xsl:if test="/bedework/periodname!='Day'"> 
    748748            - 
    749             <xsl:value-of select="/ucalendar/lastday/longdate"/> 
     749            <xsl:value-of select="/bedework/lastday/longdate"/> 
    750750          </xsl:if> 
    751751        </td> 
    …… 
    757757          <xsl:variable name="calcategory"> 
    758758            <xsl:choose> 
    759               <xsl:when test="/ucalendar/title=''">all</xsl:when> 
    760               <xsl:otherwise><xsl:value-of select="translate(/ucalendar/title,' ','')"/></xsl:otherwise> 
     759              <xsl:when test="/bedework/title=''">all</xsl:when> 
     760              <xsl:otherwise><xsl:value-of select="translate(/bedework/title,' ','')"/></xsl:otherwise> 
    761761            </xsl:choose> 
    762762          </xsl:variable> 
    763763          <!--<xsl:variable name="icalName" 
    764                         select="concat('ucal',$curdate,/ucalendar/periodname,$calcategory,'.ics')"/> 
     764                        select="concat('ucal',$curdate,/bedework/periodname,$calcategory,'.ics')"/> 
    765765          <a class="rss" href="{$export}?nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$icalName}" title="Download all events currently displayed as iCal - for multiple events, save to disk and import">iCal</a> 
    766766          --> 
    …… 
    772772  <xsl:template name="tabs"> 
    773773    <xsl:choose> 
    774       <xsl:when test="/ucalendar/page='eventscalendar'"> 
     774      <xsl:when test="/bedework/page='eventscalendar'"> 
    775775        <table border="0" cellpadding="0" cellspacing="0" id="tabsTable"> 
    776776          <tr> 
    777777            <td> 
    778778              <xsl:choose> 
    779                 <xsl:when test="/ucalendar/periodname='Day'"> 
     779                <xsl:when test="/bedework/periodname='Day'"> 
    780780                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/demo/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    781781                </xsl:when> 
    …… 
    787787            <td> 
    788788              <xsl:choose> 
    789                 <xsl:when test="/ucalendar/periodname='Week' or /ucalendar/periodname=''"> 
     789                <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    790790                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/demo/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    791791                 </xsl:when> 
    …… 
    797797            <td> 
    798798              <xsl:choose> 
    799                 <xsl:when test="/ucalendar/periodname='Month'"> 
     799                <xsl:when test="/bedework/periodname='Month'"> 
    800800                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/demo/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    801801                </xsl:when> 
    …… 
    807807            <td> 
    808808              <xsl:choose> 
    809                 <xsl:when test="/ucalendar/periodname='Year'"> 
     809                <xsl:when test="/bedework/periodname='Year'"> 
    810810                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/demo/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    811811                </xsl:when> 
    …… 
    821821            <td> 
    822822              <xsl:choose> 
    823                 <xsl:when test="/ucalendar/periodname='Day'"> 
     823                <xsl:when test="/bedework/periodname='Day'"> 
    824824                  <img src="{$resourcesRoot}/images/demo/std-button-listview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    825825                </xsl:when> 
    826                 <xsl:when test="/ucalendar/periodname='Year'"> 
     826                <xsl:when test="/bedework/periodname='Year'"> 
    827827                  <img src="{$resourcesRoot}/images/demo/std-button-calview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    828828                </xsl:when> 
    829                 <xsl:when test="/ucalendar/periodname='Month'"> 
     829                <xsl:when test="/bedework/periodname='Month'"> 
    830830                  <xsl:choose> 
    831                     <xsl:when test="/ucalendar/appvar[key='monthViewMode']/value='list'"> 
     831                    <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
    832832                      <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
    833833                        <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    …… 
    843843                <xsl:otherwise> 
    844844                  <xsl:choose> 
    845                     <xsl:when test="/ucalendar/appvar[key='weekViewMode']/value='list'"> 
     845                    <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
    846846                      <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
    847847                        <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    …… 
    859859            <td class="rightCell"> 
    860860              <xsl:choose> 
    861                 <xsl:when test="/ucalendar/periodname='Year' or 
    862                                 (/ucalendar/periodname='Month' and 
    863                                 (/ucalendar/appvar[key='monthViewMode']/value='cal' or 
    864                                  count(/ucalendar/appvar[key='monthViewMode'])=0)) or 
    865                                 (/ucalendar/periodname='Week' and 
    866                                 (/ucalendar/appvar[key='weekViewMode']/value='cal' or 
    867                                  count(/ucalendar/appvar[key='weekViewMode'])=0))"> 
     861                <xsl:when test="/bedework/periodname='Year' or 
     862                                (/bedework/periodname='Month' and 
     863                                (/bedework/appvar[key='monthViewMode']/value='cal' or 
     864                                 count(/bedework/appvar[key='monthViewMode'])=0)) or 
     865                                (/bedework/periodname='Week' and 
     866                                (/bedework/appvar[key='weekViewMode']/value='cal' or 
     867                                 count(/bedework/appvar[key='weekViewMode'])=0))"> 
    868868                  <xsl:choose> 
    869                     <xsl:when test="/ucalendar/appvar[key='summaryMode']/value='details'"> 
     869                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    870870                      <img src="{$resourcesRoot}/images/demo/std-button-summary-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/> 
    871871                    </xsl:when> 
    …… 
    877877                <xsl:otherwise> 
    878878                  <xsl:choose> 
    879                     <xsl:when test="/ucalendar/appvar[key='summaryMode']/value='details'"> 
     879                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    880880                      <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
    881881                        <img src="{$resourcesRoot}/images/demo/std-button-summary.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/> 
    …… 
    938938          <a href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/demo/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
    939939          <xsl:choose> 
    940             <xsl:when test="/ucalendar/periodname='Day'"> 
    941               <xsl:value-of select="substring(/ucalendar/eventscalendar/year/month/week/day/name,1,3)"/>, <xsl:value-of select="/ucalendar/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/ucalendar/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/ucalendar/eventscalendar/year/value"/> 
     940            <xsl:when test="/bedework/periodname='Day'"> 
     941              <xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day/name,1,3)"/>, <xsl:value-of select="/bedework/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/bedework/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
    942942            </xsl:when> 
    943             <xsl:when test="/ucalendar/periodname='Week' or /ucalendar/periodname=''"> 
    944               Week of <xsl:value-of select="/ucalendar/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/ucalendar/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/ucalendar/eventscalendar/year/value"/> 
     943            <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
     944              Week of <xsl:value-of select="/bedework/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/bedework/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
    945945            </xsl:when> 
    946             <xsl:when test="/ucalendar/periodname='Month'"> 
    947               <xsl:value-of select="/ucalendar/eventscalendar/year/month/longname"/>, <xsl:value-of select="/ucalendar/eventscalendar/year/value"/> 
     946            <xsl:when test="/bedework/periodname='Month'"> 
     947              <xsl:value-of select="/bedework/eventscalendar/year/month/longname"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
    948948            </xsl:when> 
    949949            <xsl:otherwise> 
    950               <xsl:value-of select="/ucalendar/eventscalendar/year/value"/> 
     950              <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
    951951            </xsl:otherwise> 
    952952          </xsl:choose> 
    …… 
    956956             <table border="0" cellpadding="0" cellspacing="0"> 
    957957              <tr> 
    958                 <xsl:if test="/ucalendar/periodname!='Year'"> 
     958                <xsl:if test="/bedework/periodname!='Year'"> 
    959959                  <td> 
    960960                    <select name="viewStartDate.month"> 
    961                       <xsl:for-each select="/ucalendar/monthvalues/val"> 
     961                      <xsl:for-each select="/bedework/monthvalues/val"> 
    962962                        <xsl:variable name="temp" select="."/> 
    963963                        <xsl:variable name="pos" select="position()"/> 
    964964                        <xsl:choose> 
    965                           <xsl:when test="/ucalendar/monthvalues[start=$temp]"> 
     965                          <xsl:when test="/bedework/monthvalues[start=$temp]"> 
    966966                            <option value="{$temp}" selected="selected"> 
    967                               <xsl:value-of select="/ucalendar/monthlabels/val[position()=$pos]"/> 
     967                              <xsl:value-of select="/bedework/monthlabels/val[position()=$pos]"/> 
    968968                            </option> 
    969969                          </xsl:when> 
    970970                          <xsl:otherwise> 
    971971                            <option value="{$temp}"> 
    972                               <xsl:value-of select="/ucalendar/monthlabels/val[position()=$pos]"/> 
     972                              <xsl:value-of select="/bedework/monthlabels/val[position()=$pos]"/> 
    973973                            </option> 
    974974                          </xsl:otherwise> 
    …… 
    977977                    </select> 
    978978                  </td> 
    979                   <xsl:if test="/ucalendar/periodname!='Month'"> 
     979                  <xsl:if test="/bedework/periodname!='Month'"> 
    980980                    <td> 
    981981                      <select name="viewStartDate.day"> 
    982                         <xsl:for-each select="/ucalendar/dayvalues/val"> 
     982                        <xsl:for-each select="/bedework/dayvalues/val"> 
    983983                          <xsl:variable name="temp" select="."/> 
    984984                          <xsl:variable name="pos" select="position()"/> 
    985985                          <xsl:choose> 
    986                             <xsl:when test="/ucalendar/dayvalues[start=$temp]"> 
     986                            <xsl:when test="/bedework/dayvalues[start=$temp]"> 
    987987                              <option value="{$temp}" selected="selected"> 
    988                                 <xsl:value-of select="/ucalendar/daylabels/val[position()=$pos]"/> 
     988                                <xsl:value-of select="/bedework/daylabels/val[position()=$pos]"/> 
    989989                              </option> 
    990990                            </xsl:when> 
    991991                            <xsl:otherwise> 
    992992                              <option value="{$temp}"> 
    993                                 <xsl:value-of select="/ucalendar/daylabels/val[position()=$pos]"/> 
     993                                <xsl:value-of select="/bedework/daylabels/val[position()=$pos]"/> 
    994994                              </option> 
    995995                            </xsl:otherwise> 
    …… 
    10011001                </xsl:if> 
    10021002                <td> 
    1003                   <xsl:variable name="temp" select="/ucalendar/yearvalues/start"/> 
     1003                  <xsl:variable name="temp" select="/bedework/yearvalues/start"/> 
    10041004                  <input type="text" name="viewStartDate.year" maxlength="4" size="4" value="{$temp}"/> 
    10051005                </td> 
    …… 
    10271027         <td class="leftCell"> 
    10281028           <xsl:choose> 
    1029              <xsl:when test="/ucalendar/name!=''"> 
     1029             <xsl:when test="/bedework/name!=''"> 
    10301030               View: 
    10311031               <form name="selectViewForm" method="get" action="{$setSelection}"> 
    10321032                <select name="viewName" onChange="submit()" > 
    1033                   <xsl:for-each select="/ucalendar/views/view"> 
     1033                  <xsl:for-each select="/bedework/views/view"> 
    10341034                    <xsl:variable name="name" select="name"/> 
    10351035                    <xsl:choose> 
    1036                       <xsl:when test="name=/ucalendar/name"> 
     1036                      <xsl:when test="name=/bedework/name"> 
    10371037                        <option value="{$name}" selected="selected"><xsl:value-of select="name"/></option> 
    10381038                      </xsl:when> 
    …… 
    10461046              <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
    10471047             </xsl:when> 
    1048              <xsl:when test="/ucalendar/search!=''"> 
    1049                Current search: <xsl:value-of select="/ucalendar/search"/> 
     1048             <xsl:when test="/bedework/search!=''"> 
     1049               Current search: <xsl:value-of select="/bedework/search"/> 
    10501050               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    10511051             </xsl:when> 

  • trunk/calendar3/webclient/war/docs/footer.jsp

    r31 r105  
    7474    <start><bean:write name="calForm" property="viewStartDate.ampm"/></start> 
    7575  </ampmvalues> 
    76 </ucalendar> 
     76</bedework> 
    7777<% 
    7878} catch (Throwable t) { 

  • trunk/calendar3/webclient/war/docs/header.jsp

    r104 r105  
    1111%> 
    1212 
    13 <ucalendar> 
     13<bedework> 
    1414  <now><%-- The actual date right "now" - this may not be the same as currentdate --%> 
    1515    <date><bean:write name="calForm" property="today.dateDigits"/></date><%-- 
    …… 
    132132    <%-- action urls --%> 
    133133    <setup><genurl:rewrite action="setup.do"/></setup> 
    134     <selectViewPeriod><genurl:rewrite action="selectViewPeriod.do"/></selectViewPeriod> 
    135     <setView><genurl:rewrite action="setView.do"/></setView> 
     134    <setSelection><genurl:rewrite action="setSelection.do"/></setSelection> 
     135    <setViewPeriod><genurl:rewrite action="setViewPeriod.do"/></setViewPeriod> 
    136136    <eventView><genurl:rewrite action="eventView.do"/></eventView> 
    137137    <initEvent><genurl:rewrite action="initEvent.do"/></initEvent>