Changeset 1368

Show
Ignore:
Timestamp:
04/25/07 08:37:00
Author:
johnsa
Message:

bugfixes and enhancements to rss and javascript feeds

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r952 r1368  
    22<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 
    33  <xsl:output method="html" omit-xml-declaration="yes" indent="no" media-type="text/javascript" standalone="yes"/> 
     4  <!-- Javascript feed of the day's events, 
     5       Bedework v3.0, Arlen Johnson 
    46 
    5   <!-- usage: call the javascript feed from an html file by embedding the 
     7       Usage: call the javascript feed from an html file by embedding the 
    68       following script tag: 
    79       <script src="http://yourservername/cal/setViewPeriod.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script> 
    …… 
    6062  </xsl:template> 
    6163  <xsl:template match="event"> 
     64    <!-- first, escape apostrophes --> 
    6265    <xsl:variable name="aposStrippedSummary"> 
    6366      <xsl:call-template name="replace"> 
    …… 
    6770      </xsl:call-template> 
    6871    </xsl:variable> 
     72    <!-- second, strip line breaks --> 
    6973    <xsl:variable name="strippedSummary" select='translate($aposStrippedSummary,"&#xA;"," ")'/> 
     74    <!-- finally, produce the javascript --> 
    7075    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    71     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;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">&amp;guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"&gt;</xsl:text><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     76    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;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">&amp;guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</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">&lt;/a&gt;');</xsl:text> 
    7277    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    7378  </xsl:template> 
     79   
    7480  <xsl:template name="replace"> 
    7581    <xsl:param name="string" select="''"/> 

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

    r1190 r1368  
    77    doctype-public="'-//Netscape Communications//DTD RSS 0.91//EN' 'http://my.netscape.com/public/formats/rss-0.91.dtd'" 
    88    media-type="text/xml" 
    9     encoding="ISO-8859-1" 
     9    encoding="UTF-8" 
    1010   /> 
    1111   <xsl:template match="/"> 
    …… 
    1414        <title>Bedework Events Calendar</title> 
    1515        <link><xsl:value-of select="/bedework/urlprefix"/></link> 
    16         <description>My Site's Events</description> 
     16        <description><xsl:choose> 
     17          <xsl:when test="/bedework/firstday/longdate = /bedework/lastday/longdate"><xsl:value-of select="/bedework/firstday/longdate"/></xsl:when> 
     18          <xsl:otherwise><xsl:value-of select="/bedework/firstday/longdate"/> - <xsl:value-of select="/bedework/lastday/longdate"/></xsl:otherwise></xsl:choose></description> 
     19        <pubDate><xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day[event]/event/start/dayname,1,3)"/>,<xsl:text> </xsl:text><!-- 
     20          --><xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/twodigitday"/><xsl:text> </xsl:text><!-- 
     21          --><xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day[event]/event/start/monthname,1,3)"/><xsl:text> </xsl:text><!-- 
     22          --><xsl:value-of select="/bedework/eventscalendar/year/month/week/day[event]/event/start/fourdigityear"/><xsl:text> </xsl:text><!-- 
     23          --><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>   
    1724        <language>en-US</language> 
    18         <copyright>Copyright <xsl:value-of select="substring(/bedework/currentdate,1,4)"/>, Your Institution Here</copyright> 
     25        <copyright>Copyright <xsl:value-of select="substring(/bedework/currentdate/date,1,4)"/>, Rensselaer Polytechnic Institute</copyright> 
    1926        <managingEditor>editor@mysite.edu, Editor Name</managingEditor> 
    20         <xsl:apply-templates select="/bedework/eventscalendar//event"/> 
     27        <xsl:choose> 
     28           <xsl:when test="/bedework/page='searchResult'"> 
     29             <xsl:apply-templates select="/bedework/searchResults/searchResult"/> 
     30           </xsl:when> 
     31           <xsl:otherwise> 
     32             <xsl:apply-templates select="/bedework/eventscalendar//event"/> 
     33           </xsl:otherwise> 
     34        </xsl:choose> 
    2135      </channel> 
    2236    </rss> 
    …… 
    2438  <xsl:template match="event"> 
    2539    <item> 
    26       <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> 
    27       <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    28       <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>, 
    29                <xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text> 
    30                <xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text> 
    31                <xsl:value-of select="start/fourdigityear"/><xsl:text> </xsl:text> 
    32                <xsl:value-of select="start/twodigithour24"/>:<xsl:value-of select="start/twodigitminute"/>:00 EST</pubDate> 
    33       <description> 
    34         <xsl:value-of select="substring(start/dayname,1,3)"/>, 
    35         <xsl:value-of select="start/longdate"/> 
    36         <xsl:text> </xsl:text> 
    37         <xsl:value-of select="start/time"/> 
    38         <xsl:if test="end/time != ''"> - </xsl:if> 
    39         <xsl:if test="end/dayname != start/dayname"><xsl:value-of select="substring(end/dayname,1,3)"/>, </xsl:if> 
    40         <xsl:if test="end/longdate != start/longdate"><xsl:value-of select="end/longdate"/>,</xsl:if> 
    41         <xsl:if test="end/time != ''"><xsl:value-of select="end/time"/></xsl:if> 
    42         <xsl:text> </xsl:text> 
    43         <xsl:value-of select="location/address"/>. 
    44         <xsl:if test="cost!=''"><xsl:value-of select="cost"/>. </xsl:if> 
    45         <xsl:value-of select="description"/> 
    46       </description> 
     40      <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> 
     41      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     42      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!-- 
     43               --><xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text><!-- 
     44               --><xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text><!-- 
     45               --><xsl:value-of select="start/fourdigityear"/><xsl:text> </xsl:text><!-- 
     46               --><xsl:value-of select="start/twodigithour24"/>:<xsl:value-of select="start/twodigitminute"/>:00 EST</pubDate> 
     47      <description><!-- 
     48        --><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!-- 
     49        --><xsl:value-of select="start/longdate"/><!-- 
     50        --><xsl:text> </xsl:text><!-- 
     51        --><xsl:value-of select="start/time"/><!-- 
     52        --><xsl:if test="end/time != ''"> - </xsl:if><!-- 
     53        --><xsl:if test="end/dayname != start/dayname"><xsl:value-of select="substring(end/dayname,1,3)"/>, </xsl:if><!-- 
     54        --><xsl:if test="end/longdate != start/longdate"><xsl:value-of select="end/longdate"/>, </xsl:if><!-- 
     55        --><xsl:if test="end/time != ''"><xsl:value-of select="end/time"/></xsl:if><!-- 
     56        --><xsl:text> </xsl:text><!-- 
     57        --><xsl:value-of select="location/address"/>.<!-- 
     58        --><xsl:text> </xsl:text><!-- 
     59        --><xsl:if test="cost!=''"><xsl:value-of select="cost"/>.</xsl:if><!-- 
     60        --><xsl:text> </xsl:text><!-- 
     61        --><xsl:value-of select="description"/><!-- 
     62        --><xsl:text> </xsl:text><xsl:if test="status = 'CANCELLED'">(CANCELLED)</xsl:if><!-- 
     63      --></description> 
    4764    </item> 
    4865  </xsl:template>