svn commit: r416103 [2/2] - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/ui/rendering/model/ src/org/apache/roller/util/ web/WEB-INF/classes/ web/WEB-INF/velocity/ web/WEB-INF/velocity/templates/feeds/

[sn...@apache.org]

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm?rev=416103&r1=416102&r2=416103&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm Wed Jun 21 13:42:56 2006
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-#if($page.weblogCategory && $page.weblogCategory.path.length() > 0) 
-   #set($postfix = "?catname=$page.weblogCategory.path") 
-   #set($cat = $page.weblogCategory.path)
+#if($model.weblogCategory && $model.weblogCategory.path.length() > 0) 
+   #set($postfix = "?catname=$model.weblogCategory.path") 
+   #set($cat = $model.weblogCategory.path)
 #else
    #set($postfix = "") 
+   #set($cat = "nil") 
 #end   
-<rss version="2.0" 
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:atom="http://www.w3.org/2005/Atom" >
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" >
 <channel>
-  <title>$utils.escapeHTML($utils.removeHTML($page.weblog.name))</title>
-  <link>$page.weblog.URL</link>
-  <description>$utils.escapeHTML($page.weblog.description)</description>
-  <language>en-us</language>
-  <copyright>Copyright $utils.formatDate($page.weblog.lastModified, "yyyy")</copyright>
-  <lastBuildDate>$utils.formatRfc822Date($page.weblog.lastModified)</lastBuildDate>
-  <generator>Roller Weblogger $config.rollerVersion ($config.rollerBuildTime:$config.rollerBuildUser)</generator>
-    #set($entries = $page.getWeblogEntries($cat, 0, $page.weblog.entryDisplayCount) )
+    <title>$utils.escapeHTML($utils.removeHTML($model.weblog.name))</title>
+    <link>$model.weblog.URL</link>
+    <description>$utils.escapeHTML($model.weblog.description)</description>
+    <language>en-us</language>
+    <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
+    <lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
+    <generator>Roller Weblogger $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
+    #set($entries = $model.getWeblogEntries($cat, 0))
     #showEntriesRSS20($entries)
 </channel>
 </rss>