[Bedework-commit] bedework r3529 - in releases/bedework-3.7: build deployment/feeder/webapp/resources/demoskins/MainCampus/default/default

[svnadmin at bedework.org]

Author: bleibson
Date: 2012-04-08 10:28:04 -0400 (Sun, 08 Apr 2012)
New Revision: 3529

Modified:
   releases/bedework-3.7/build/bw-deployutil-3.7.jar
   releases/bedework-3.7/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-rss.xsl
Log:
o Backport 3.8 rss feed fixes to 3.7

Modified: releases/bedework-3.7/build/bw-deployutil-3.7.jar
===================================================================
(Binary files differ)

Modified: releases/bedework-3.7/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-rss.xsl
===================================================================
--- releases/bedework-3.7/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-rss.xsl	2012-04-03 13:13:58 UTC (rev 3528)
+++ releases/bedework-3.7/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-rss.xsl	2012-04-08 14:28:04 UTC (rev 3529)
@@ -18,9 +18,13 @@
     under the License.
 -->
 
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" omit-xml-declaration="no" indent="yes"
-    media-type="text/xml" encoding="UTF-8" />
+<xsl:stylesheet version="1.0" 
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:atom="http://www.w3.org/2005/Atom">
+  <xsl:output method="xml" 
+              omit-xml-declaration="no" indent="yes"
+              media-type="text/xml" 
+              encoding="UTF-8" />
 
    <!-- =========================================================
 
@@ -100,7 +104,7 @@
     <item>
       <title><xsl:if test="status = 'CANCELLED'">CANCELED: </xsl:if><xsl:value-of select="summary"/></title>
       <link><xsl:value-of select="substring-before($urlPrefix,$feeder)"/><xsl:value-of select="$publicCal"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link>
-      <guid>calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></guid>
+      <guid isPermaLink="false">calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></guid>
       <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time).
         --><xsl:value-of select="substring(start/utcdate,7,2)"/><xsl:text> </xsl:text><!--
         --><xsl:call-template name="monthNumToName"><xsl:with-param name="monthNum" select="substring(start/utcdate,5,2)"/></xsl:call-template><xsl:text> </xsl:text><!--
@@ -226,15 +230,15 @@
         ]]>
 
         <xsl:copy-of select="$bwStr-SgEv-Where"/><xsl:text> </xsl:text>
-        <xsl:choose>
-          <xsl:when test="location/link=''">
+        <!-- <xsl:choose>
+          <xsl:when test="location/link=''">-->
             <xsl:value-of select="location/address" />
             <xsl:text> </xsl:text>
             <xsl:if test="location/subaddress!=''">
               <xsl:text> </xsl:text>
               <xsl:value-of select="location/subaddress" />
             </xsl:if>
-          </xsl:when>
+          <!-- </xsl:when>
           <xsl:otherwise>
             <a>
               <xsl:attribute name="href"><xsl:value-of select="location/link"/></xsl:attribute>
@@ -245,7 +249,7 @@
               </xsl:if>
             </a>
           </xsl:otherwise>
-        </xsl:choose>
+        </xsl:choose>-->
 
         <![CDATA[
           <br/>