You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/28 02:28:28 UTC
svn commit: r426340 - in
/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds:
site-comments-atom.vm site-comments-rss.vm site-entries-atom.vm
site-entries-rss.vm weblog-comments-atom.vm weblog-entries-rss.vm
Author: agilliland
Date: Thu Jul 27 17:28:28 2006
New Revision: 426340
URL: http://svn.apache.org/viewvc?rev=426340&view=rev
Log:
a bit of cleanup and tweaking on feed templates.
Modified:
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm?rev=426340&r1=426339&r2=426340&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm Thu Jul 27 17:28:28 2006
@@ -15,16 +15,17 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-*#$pageHelper.setContentType("application/atom+xml;charset=utf-8")<?xml version="1.0" encoding='utf-8'?>
+*#<?xml version="1.0" encoding='utf-8'?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/atom-xsl.jsp" media="screen"?>
<feed xmlns="http://www.w3.org/2005/Atom">
- <title type="html">$utils.escapeHTML($config.getConfigProperty("site.name"))) (Comments)</title>
- <id>$config.absoluteContextURL/atom/$model.weblog.handle</id>
- <link rel="alternate" type="text/html" href="$model.weblog.URL" />
+ <title type="html">$utils.escapeHTML($config.siteName) (Comments)</title>
+ <id>$url.feed.comments.atom</id>
+ <link rel="alternate" type="text/html" href="$url.home" />
<id>$url.feed.comments.atom($model.categoryPath, $model.excerpts)</id>
<link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
<generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
- #set($comments = $site.getComments(0, $model.weblog.entryDisplayCount))
+ #set($comments = $site.getComments(60, 0, $config.feedSize))
#showCommentsAtom10($comments)
</feed>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm?rev=426340&r1=426339&r2=426340&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm Thu Jul 27 17:28:28 2006
@@ -16,19 +16,20 @@
directory of this distribution.
*#<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/rss-xsl.jsp" media="screen"?>
<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($config.getConfigProperty("site.name")) (Comments)</title>
+ <title>$utils.escapeHTML($config.siteName) (Comments)</title>
<link>$url.absoluteSite</link>
<atom:link rel="self" type="application/rss+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
- <description>$utils.escapeHTML($model.weblog.description)</description>
+ <description>$utils.escapeHTML($config.siteDescription)</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($comments = $site.getComments(0, $model.weblog.entryDisplayCount))
- #showCommentsAtom10($comments)
+ #set($comments = $site.getComments(60, 0, $config.feedSize))
+ #showCommentsAtom10($comments)
</channel>
</rss>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm?rev=426340&r1=426339&r2=426340&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm Thu Jul 27 17:28:28 2006
@@ -15,16 +15,17 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-*#<?xml version="1.0" encoding='utf-8'?>
+*#<?xml version="1.0" encoding='utf-8'?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/atom-xsl.jsp" media="screen"?>
<feed xmlns="http://www.w3.org/2005/Atom">
- <title type="html">$utils.escapeHTML($config.getConfigProperty("site.name"))</title>
- <subtitle type="html">$utils.escapeHTML($config.getConfigProperty("site.description"))</subtitle>
+ <title type="html">$utils.escapeHTML($config.siteName)</title>
+ <subtitle type="html">$utils.escapeHTML($config.siteDescription)</subtitle>
<id>$url.absoluteSite</id>
<link rel="alternate" type="text/html" href="$url.absoluteSite" />
<link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
<generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller Weblogger</generator>
- #set($entries = $site.getWeblogEntries("nil" $cat, 0, $model.weblog.entryDisplayCount))
+ #set($entries = $site.getWeblogEntries("nil", "nil", $model.categoryPath, 60, 0, $config.feedSize) )
#showEntriesAtom10($entries)
</feed>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm?rev=426340&r1=426339&r2=426340&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm Thu Jul 27 17:28:28 2006
@@ -16,20 +16,20 @@
directory of this distribution.
*#<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/rss-xsl.jsp" media="screen"?>
<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($config.getConfigProperty("site.name"))</title>
- <atom:subtitle type="html">$utils.escapeHTML($config.getConfigProperty("site.description"))</subtitle>
+ <title>$utils.escapeHTML($config.siteName)</title>
<link>$url.absoluteSite</link>
<atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
- <description>$utils.escapeHTML($config.getConfigProperty("site.description"))</description>
+ <description>$utils.escapeHTML($config.siteDescription)</description>
<language>en-us</language>
- <copyright>Copyright #formatDate("yyyy" $model.now)</copyright>
- <lastBuildDate>$utilities.formatRfc822Date($model.now)</lastBuildDate>
+ <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 = $site.getWeblogEntries($null, $null, $cat, -1, 0, $config.getConfigProperty("site.newsfeeds.maxEntries")) )
+ #set($entries = $site.getWeblogEntries("nil", "nil", $model.categoryPath, 60, 0, $config.feedSize) )
#showEntriesRSS20($entries)
</channel>
</rss>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm?rev=426340&r1=426339&r2=426340&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm Thu Jul 27 17:28:28 2006
@@ -19,7 +19,7 @@
<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/atom-xsl.jsp" media="screen"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title type="html">$utils.escapeHTML($model.weblog.name) (Comments)</title>
- <id>$config.absoluteContextURL/atom/$model.weblog.handle</id>
+ <id>$url.feed.comments.atom</id>
<link rel="alternate" type="text/html" href="$url.home" />
<link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
<updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
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=426340&r1=426339&r2=426340&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 Thu Jul 27 17:28:28 2006
@@ -17,24 +17,19 @@
*#<?xml version="1.0" encoding="utf-8"?>
<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/theme/styles/rss-xsl.jsp" media="screen"?>
-#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($model.weblog.name))</title>
- <link>$url.home</link>
- <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
- <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())
- #showEntriesRSS20($entries)
+ <title>$utils.escapeHTML($utils.removeHTML($model.weblog.name))</title>
+ <link>$url.home</link>
+ <atom:link rel="self" type="application/rss+xml" href="$url.feed.entries.rss($model.categoryPath, $model.excerpts)" />
+ <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())
+ #showEntriesRSS20($entries)
</channel>
</rss>