Changeset 1703

Show
Ignore:
Timestamp:
01/17/08 21:16:26
Author:
johnsa
Message:

web clients: correct end date in search results listing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.4/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1567 r1703  
    6666       set to the application root --> 
    6767  <xsl:variable name="resourcesRoot" select="/bedework/approot"/> 
    68    
     68 
    6969  <!-- URL of the XSL template directory --> 
    7070  <!-- The approot is an appropriate place to put 
    …… 
    15151515            <xsl:choose> 
    15161516              <xsl:when test="event/start/longdate != event/end/longdate"> 
    1517                 - <xsl:value-of select="event/start/longdate"/> 
     1517                - <xsl:value-of select="event/end/longdate"/> 
    15181518                <xsl:text> </xsl:text> 
    15191519                <xsl:value-of select="event/end/time"/> 

  • releases/bedework-3.4/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

    r1535 r1703  
    158158          </xsl:when> 
    159159          <xsl:when test="/bedework/page='displayCalendarForExport'"> 
    160             <!-- page for calendar export (can optionally be replaced by  
     160            <!-- page for calendar export (can optionally be replaced by 
    161161                 a pop-up widget; see the calendars template) --> 
    162162            <xsl:apply-templates select="/bedework/currentCalendar" mode="export"/> 
    …… 
    12581258 
    12591259  <!--==== CALENDARS ====--> 
    1260    
     1260 
    12611261  <!-- list of available calendars --> 
    12621262  <xsl:template match="calendars"> 
    …… 
    12741274          </p> 
    12751275          <!-- Uncomment this block, and change the links on the download calendar 
    1276                icon (in the following template) to use a dojo floating  
     1276               icon (in the following template) to use a dojo floating 
    12771277               widget instead of a separate page 
    1278                for downloading whole calendars (this method does not work  
    1279                portal-agnostically: it is not intended for use in portals).  
    1280                 
     1278               for downloading whole calendars (this method does not work 
     1279               portal-agnostically: it is not intended for use in portals). 
     1280 
    12811281          <div dojoType="FloatingPane" id="bwCalendarExportWidget" 
    12821282               title="Export Calendar as iCal" toggle="plain" 
    …… 
    13401340        <xsl:variable name="calPath" select="path"/> 
    13411341        <span class="exportCalLink"> 
    1342           <!-- To use the dojo floating widget from the template above, uncomment  
     1342          <!-- To use the dojo floating widget from the template above, uncomment 
    13431343               this block: 
    13441344          <xsl:variable name="name" select="name"/> 
    …… 
    13591359    </li> 
    13601360  </xsl:template> 
    1361    
     1361 
    13621362  <!-- calendar export page --> 
    13631363  <xsl:template match="currentCalendar" mode="export"> 
    …… 
    15181518            <xsl:choose> 
    15191519              <xsl:when test="event/start/longdate != event/end/longdate"> 
    1520                 - <xsl:value-of select="event/start/longdate"/> 
     1520                - <xsl:value-of select="event/end/longdate"/> 
    15211521                <xsl:text> </xsl:text> 
    15221522                <xsl:value-of select="event/end/time"/> 

  • releases/bedework-3.4/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1591 r1703  
    11141114    <xsl:if test="owner != /bedework/userid and public='true'"> 
    11151115            <!-- provide this link for public subscriptions; subscriptions to user calendars are 
    1116                  currently too confusing since the current user may be able to add events to the  
     1116                 currently too confusing since the current user may be able to add events to the 
    11171117                 other calendar, making the ownership test a bad test --> 
    11181118      <xsl:variable name="subname" select="subscription/name"/> 
    …… 
    15161516            <xsl:if test="owner != /bedework/userid and public='true'"> 
    15171517            <!-- provide this link for public subscriptions; subscriptions to user calendars are 
    1518                  currently too confusing since the current user may be able to add events to the  
     1518                 currently too confusing since the current user may be able to add events to the 
    15191519                 other calendar, making the ownership test a bad test --> 
    15201520              | 
    …… 
    24872487          </tr> 
    24882488        </xsl:if> 
    2489          
     2489 
    24902490        <!--  Transparency  --> 
    24912491        <tr> 
    …… 
    25002500            </input> 
    25012501            yes <span class="note">(opaque: event status affects your free/busy)</span><br/> 
    2502              
     2502 
    25032503            <input type="radio" value="TRANSPARENT" name="transparency"> 
    25042504              <xsl:if test="form/transparency = 'TRANSPARENT'"> 
    …… 
    32133213                  <tr><td>No recurrence dates</td></tr> 
    32143214                </table> 
    3215    
     3215 
    32163216                <!-- if there are recurrence dates, the following table will show --> 
    32173217                <table cellspacing="0" class="invisible" id="bwCurrentRdates"> 
    …… 
    32263226                  </tr> 
    32273227                </table> 
    3228    
     3228 
    32293229                <input type="hidden" name="exdates" value="" id="bwExdatesField" /> 
    32303230                <!-- if there are no exception dates, the following table will show --> 
    …… 
    32333233                  <tr><td>No exception dates</td></tr> 
    32343234                </table> 
    3235    
     3235 
    32363236                <!-- if there are exception dates, the following table will show --> 
    32373237                <table cellspacing="0" class="invisible" id="bwCurrentExdates"> 
    …… 
    40704070      </form> 
    40714071      <xsl:apply-templates select="." mode="freeBusyGrid"> 
    4072         <xsl:with-param name="type">normal</xsl:with-param>  
     4072        <xsl:with-param name="type">normal</xsl:with-param> 
    40734073      </xsl:apply-templates> 
    40744074    </div> 
    …… 
    78717871            <xsl:choose> 
    78727872              <xsl:when test="event/start/longdate != event/end/longdate"> 
    7873                 - <xsl:value-of select="event/start/longdate"/> 
     7873                - <xsl:value-of select="event/end/longdate"/> 
    78747874                <xsl:text> </xsl:text> 
    78757875                <xsl:value-of select="event/end/time"/>