[Bedework-commit] bedework r1367 -
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default
svnadmin at bedework.org
svnadmin at bedework.org
Tue Apr 24 15:50:30 EDT 2007
Author: johnsa
Date: 2007-04-24 15:50:30 -0400 (Tue, 24 Apr 2007)
New Revision: 1367
Modified:
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl
trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl
Log:
bugfixes and enhancements to rss and javascript feeds
Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl 2007-04-24 19:32:30 UTC (rev 1366)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl 2007-04-24 19:50:30 UTC (rev 1367)
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="html" omit-xml-declaration="yes" indent="no" media-type="text/javascript" standalone="yes"/>
+ <!-- Javascript feed of the day's events,
+ Bedework v3.0, Arlen Johnson
- <!-- usage: call the javascript feed from an html file by embedding the
+ Usage: call the javascript feed from an html file by embedding the
following script tag:
<script src="http://yourservername/cal/setViewPeriod.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script>
@@ -59,6 +61,7 @@
<xsl:text disable-output-escaping="yes">document.writeln('</ul>');</xsl:text>
</xsl:template>
<xsl:template match="event">
+ <!-- first, escape apostrophes -->
<xsl:variable name="aposStrippedSummary">
<xsl:call-template name="replace">
<xsl:with-param name="string" select="summary"/>
@@ -66,11 +69,14 @@
<xsl:with-param name="replacement" select='"\'"'/>
</xsl:call-template>
</xsl:variable>
+ <!-- second, strip line breaks -->
<xsl:variable name="strippedSummary" select='translate($aposStrippedSummary,"
"," ")'/>
+ <!-- finally, produce the javascript -->
<xsl:text disable-output-escaping="yes">document.writeln('<li>');</xsl:text>
- <xsl:text disable-output-escaping="yes">document.writeln(' <a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/eventView.do?subid=</xsl:text><xsl:value-of select="subscription/id"/><xsl:text disable-output-escaping="yes">&guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&skinName=default" target="_top"></xsl:text><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes"></a>');</xsl:text>
+ <xsl:text disable-output-escaping="yes">document.writeln(' <a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?subid=</xsl:text><xsl:value-of select="subscription/id"/><xsl:text disable-output-escaping="yes">&guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">></xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes"></a>');</xsl:text>
<xsl:text disable-output-escaping="yes">document.writeln('</li>');</xsl:text>
</xsl:template>
+
<xsl:template name="replace">
<xsl:param name="string" select="''"/>
<xsl:param name="pattern" select="''"/>
Modified: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl 2007-04-24 19:32:30 UTC (rev 1366)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl 2007-04-24 19:50:30 UTC (rev 1367)
@@ -6,44 +6,61 @@
indent="yes"
doctype-public="'-//Netscape Communications//DTD RSS 0.91//EN' 'http://my.netscape.com/public/formats/rss-0.91.dtd'"
media-type="text/xml"
- encoding="ISO-8859-1"
+ encoding="UTF-8"
/>
<xsl:template match="/">
<rss version="2.0">
<channel>
<title>Bedework Events Calendar</title>
<link><xsl:value-of select="/bedework/urlprefix"/></link>
- <description>My Site's Events</description>
+ <description><xsl:choose>
+ <xsl:when test="/bedework/firstday/longdate = /bedework/lastday/longdate"><xsl:value-of select="/bedework/firstday/longdate"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="/bedework/firstday/longdate"/> - <xsl:value-of select="/bedework/lastday/longdate"/></xsl:otherwise></xsl:choose></description>
+ <pubDate><xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day[event]/event/start/dayname,1,3)"/>,<xsl:text> </xsl:text><!--
+ --><xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/twodigitday"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day[event]/event/start/monthname,1,3)"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/fourdigityear"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/twodigithour24"/>:<xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/twodigitminute"/>:00 EST</pubDate>
<language>en-US</language>
- <copyright>Copyright <xsl:value-of select="substring(/bedework/currentdate,1,4)"/>, Your Institution Here</copyright>
+ <copyright>Copyright <xsl:value-of select="substring(/bedework/currentdate/date,1,4)"/>, Rensselaer Polytechnic Institute</copyright>
<managingEditor>editor at mysite.edu, Editor Name</managingEditor>
- <xsl:apply-templates select="/bedework/eventscalendar//event"/>
+ <xsl:choose>
+ <xsl:when test="/bedework/page='searchResult'">
+ <xsl:apply-templates select="/bedework/searchResults/searchResult"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="/bedework/eventscalendar//event"/>
+ </xsl:otherwise>
+ </xsl:choose>
</channel>
</rss>
</xsl:template>
<xsl:template match="event">
<item>
- <title><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text><xsl:value-of select="start/day"/></title>
- <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&calPath=<xsl:value-of select="calendar/encodedPath"/>&guid=<xsl:value-of select="guid"/>&recurrenceId=<xsl:value-of select="recurrenceId"/></link>
- <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>,
- <xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text>
- <xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text>
- <xsl:value-of select="start/fourdigityear"/><xsl:text> </xsl:text>
- <xsl:value-of select="start/twodigithour24"/>:<xsl:value-of select="start/twodigitminute"/>:00 EST</pubDate>
- <description>
- <xsl:value-of select="substring(start/dayname,1,3)"/>,
- <xsl:value-of select="start/longdate"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="start/time"/>
- <xsl:if test="end/time != ''"> - </xsl:if>
- <xsl:if test="end/dayname != start/dayname"><xsl:value-of select="substring(end/dayname,1,3)"/>, </xsl:if>
- <xsl:if test="end/longdate != start/longdate"><xsl:value-of select="end/longdate"/>,</xsl:if>
- <xsl:if test="end/time != ''"><xsl:value-of select="end/time"/></xsl:if>
- <xsl:text> </xsl:text>
- <xsl:value-of select="location/address"/>.
- <xsl:if test="cost!=''"><xsl:value-of select="cost"/>. </xsl:if>
- <xsl:value-of select="description"/>
- </description>
+ <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title>
+ <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&calPath=<xsl:value-of select="calendar/encodedPath"/>&guid=<xsl:value-of select="guid"/>&recurrenceId=<xsl:value-of select="recurrenceId"/></link>
+ <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!--
+ --><xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="start/fourdigityear"/><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="start/twodigithour24"/>:<xsl:value-of select="start/twodigitminute"/>:00 EST</pubDate>
+ <description><!--
+ --><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!--
+ --><xsl:value-of select="start/longdate"/><!--
+ --><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="start/time"/><!--
+ --><xsl:if test="end/time != ''"> - </xsl:if><!--
+ --><xsl:if test="end/dayname != start/dayname"><xsl:value-of select="substring(end/dayname,1,3)"/>, </xsl:if><!--
+ --><xsl:if test="end/longdate != start/longdate"><xsl:value-of select="end/longdate"/>, </xsl:if><!--
+ --><xsl:if test="end/time != ''"><xsl:value-of select="end/time"/></xsl:if><!--
+ --><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="location/address"/>.<!--
+ --><xsl:text> </xsl:text><!--
+ --><xsl:if test="cost!=''"><xsl:value-of select="cost"/>.</xsl:if><!--
+ --><xsl:text> </xsl:text><!--
+ --><xsl:value-of select="description"/><!--
+ --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!--
+ --></description>
</item>
</xsl:template>
</xsl:stylesheet>
More information about the Bedework-commit
mailing list