[Bedework-commit] bedework r1704 - in
releases/bedework-3.4.1/deployment:
webpublic/webapp/resources/demoskins/MainCampus/default/default
webpublic/webapp/resources/demoskins/SoEDepartmental/default/default
webuser/webapp/resources/demoskins/default/default
svnadmin at bedework.org
svnadmin at bedework.org
Thu Jan 17 21:17:08 EST 2008
Author: johnsa
Date: 2008-01-17 21:17:03 -0500 (Thu, 17 Jan 2008)
New Revision: 1704
Modified:
releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
web clients: correct end date in search results listing
Modified: releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-01-18 02:16:26 UTC (rev 1703)
+++ releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl 2008-01-18 02:17:03 UTC (rev 1704)
@@ -1517,7 +1517,7 @@
<xsl:value-of select="event/start/time"/>
<xsl:choose>
<xsl:when test="event/start/longdate != event/end/longdate">
- - <xsl:value-of select="event/start/longdate"/>
+ - <xsl:value-of select="event/end/longdate"/>
<xsl:text> </xsl:text>
<xsl:value-of select="event/end/time"/>
</xsl:when>
Modified: releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2008-01-18 02:16:26 UTC (rev 1703)
+++ releases/bedework-3.4.1/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl 2008-01-18 02:17:03 UTC (rev 1704)
@@ -157,7 +157,7 @@
<xsl:apply-templates select="/bedework/calendars"/>
</xsl:when>
<xsl:when test="/bedework/page='displayCalendarForExport'">
- <!-- page for calendar export (can optionally be replaced by
+ <!-- page for calendar export (can optionally be replaced by
a pop-up widget; see the calendars template) -->
<xsl:apply-templates select="/bedework/currentCalendar" mode="export"/>
</xsl:when>
@@ -1257,7 +1257,7 @@
</xsl:template>
<!--==== CALENDARS ====-->
-
+
<!-- list of available calendars -->
<xsl:template match="calendars">
<xsl:variable name="topLevelCalCount" select="count(calendar/calendar)"/>
@@ -1273,11 +1273,11 @@
Select a calendar from the list below to see only that calendar's events.
</p>
<!-- Uncomment this block, and change the links on the download calendar
- icon (in the following template) to use a dojo floating
+ icon (in the following template) to use a dojo floating
widget instead of a separate page
- for downloading whole calendars (this method does not work
- portal-agnostically: it is not intended for use in portals).
-
+ for downloading whole calendars (this method does not work
+ portal-agnostically: it is not intended for use in portals).
+
<div dojoType="FloatingPane" id="bwCalendarExportWidget"
title="Export Calendar as iCal" toggle="plain"
windowState="minimized" hasShadow="true"
@@ -1339,7 +1339,7 @@
<xsl:if test="calendarCollection='true'">
<xsl:variable name="calPath" select="path"/>
<span class="exportCalLink">
- <!-- To use the dojo floating widget from the template above, uncomment
+ <!-- To use the dojo floating widget from the template above, uncomment
this block:
<xsl:variable name="name" select="name"/>
<xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/>
@@ -1358,7 +1358,7 @@
</xsl:if>
</li>
</xsl:template>
-
+
<!-- calendar export page -->
<xsl:template match="currentCalendar" mode="export">
<h2 class="bwStatusConfirmed">Export Calendar</h2>
@@ -1517,7 +1517,7 @@
<xsl:value-of select="event/start/time"/>
<xsl:choose>
<xsl:when test="event/start/longdate != event/end/longdate">
- - <xsl:value-of select="event/start/longdate"/>
+ - <xsl:value-of select="event/end/longdate"/>
<xsl:text> </xsl:text>
<xsl:value-of select="event/end/time"/>
</xsl:when>
Modified: releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-01-18 02:16:26 UTC (rev 1703)
+++ releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2008-01-18 02:17:03 UTC (rev 1704)
@@ -7671,7 +7671,7 @@
<xsl:value-of select="event/start/time"/>
<xsl:choose>
<xsl:when test="event/start/longdate != event/end/longdate">
- - <xsl:value-of select="event/start/longdate"/>
+ - <xsl:value-of select="event/end/longdate"/>
<xsl:text> </xsl:text>
<xsl:value-of select="event/end/time"/>
</xsl:when>
More information about the Bedework-commit
mailing list