Changeset 598

Show
Ignore:
Timestamp:
06/19/06 01:10:49
Author:
douglm
Message:

Fix header and stylesheet so that eventView link works in portlet

Also fix up b=de v be=d confusion in header.jsp and Rewrite tag


Files:

Legend:

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

    r572 r598  
    1919     For detailed instructions on how to work with the XSLT 
    2020     stylesheets included with this distribution, please see the 
    21                 Bedework Design Guide at 
     21    Bedework Design Guide at 
    2222     http://www.bedework.org/bedework/update.do?artcenterkey=24 
    2323 
     
    577577        <th class="icalIcon" rowspan="2"> 
    578578          <div id="eventIcons"> 
    579                                                <xsl:variable name="id" select="id"/> 
    580                                                <xsl:variable name="subscriptionId" select="subscription/id"/> 
    581                                                <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    582                                                <xsl:variable name="guid" select="guid"/> 
    583                                                <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    584                                                <a href="{$privateCal}/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    585                                                        <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    586                                                add to my calendar</a> 
    587                                                <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    588                                                <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    589                                                        <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    590                                                 download</a> 
    591                                        </div> 
     579            <xsl:variable name="id" select="id"/> 
     580            <xsl:variable name="subscriptionId" select="subscription/id"/> 
     581            <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     582            <xsl:variable name="guid" select="guid"/> 
     583            <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     584            <a href="{$privateCal}/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     585              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
     586            add to my calendar</a> 
     587            <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
     588            <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     589              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
     590            download</a> 
     591          </div> 
    592592        </th> 
    593593      </tr> 
     
    741741                                  start/time = end/time"> 
    742742                    <td class="{$dateRangeStyle} center" colspan="3"> 
    743                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     743                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    744744                        <xsl:value-of select="start/time"/> 
    745745                      </a> 
     
    748748                  <xsl:otherwise> 
    749749                    <td class="{$dateRangeStyle} right"> 
    750                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     750                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    751751                      <xsl:choose> 
    752752                        <xsl:when test="start/allday = 'true' and 
     
    765765                    </td> 
    766766                    <td class="{$dateRangeStyle} center"> 
    767                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
     767                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    768768                    </td> 
    769769                    <td class="{$dateRangeStyle} left"> 
    770                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     770                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    771771                      <xsl:choose> 
    772772                        <xsl:when test="end/allday = 'true' and 
     
    797797                  <xsl:choose> 
    798798                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    799                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     799                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    800800                        <strong> 
    801801                          <xsl:value-of select="summary"/>: 
     
    821821                    </xsl:when> 
    822822                    <xsl:otherwise> 
    823                       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     823                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    824824                        <xsl:value-of select="summary"/> 
    825825                        <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
     
    929929    </xsl:variable> 
    930930    <li> 
    931       <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
     931      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
    932932        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    933933        <xsl:value-of select="summary"/> 
  • trunk/calendar3/uportal/src/ca/mun/portal/strutsbridge/taglib/CalRewriteTag.java

    r594 r598  
    114114  } 
    115115 
    116   /* bedework dummy request parameter - it's an encoded form of ?be=d */ 
    117   private static final String bedeworkDummyPar = "%3Fbe%3Dd"; 
     116  /* bedework dummy request parameter - it's an encoded form of ?b=de */ 
     117  private static final String bedeworkDummyPar = "%3Fb%3Dde"; 
    118118 
    119119  /** Generates a PortletURL or a ResourceURL for the link when in the context of a 
  • trunk/calendar3/webclient/war/docs/header.jsp

    r519 r598  
    123123    <setSelection><genurl:rewrite action="setSelection.do"/></setSelection> 
    124124    <setViewPeriod><genurl:rewrite action="setViewPeriod.do"/></setViewPeriod> 
    125     <eventView><genurl:rewrite action="eventView.do"/></eventView> 
     125    <eventView><genurl:rewrite action="eventView.do?b=de"/></eventView> 
    126126    <mailEvent><genurl:rewrite action="mailEvent.do"/></mailEvent> 
    127127    <showPage><genurl:rewrite action="showPage.do"/></showPage> 
    128128 
    129129    <export><genurl:rewrite action="export.do"/></export> 
    130     <stats><genurl:rewrite action="stats.do?be=d"/></stats> 
     130    <stats><genurl:rewrite action="stats.do?b=de"/></stats> 
    131131 
    132132    <fetchPublicCalendars><genurl:rewrite action="fetchPublicCalendars"/></fetchPublicCalendars>