Author: snoopdave
Date: Tue Apr 18 13:25:10 2006
New Revision: 395028
URL: http://svn.apache.org/viewcvs?rev=395028&view=rev
Log:
Using atom:summary everywhere for summary
Modified:
incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm
incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm?rev=395028&r1=395027&r2=395028&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm Tue Apr 18
13:25:10 2006
@@ -30,8 +30,8 @@
<published>$utilities.formatIso8601Date($entry.pubTime)</published>
<updated>$utilities.formatIso8601Date($entry.updateTime)</updated>
<category term="$utilities.textToHTML($entry.category.path, true)"
label="$utilities.textToHTML($entry.category.name, true)" />
- #if( $entry.summary )<summary
type="html">#showEntrySummary($entry)</summary>#end
- #if( $entry.text )<content
type="html">#showEntryContent($entry)</content>#end
+ #if( $utilities.isNotEmpty($entry.summary) )<summary
type="html">#showEntrySummary($entry)</summary>#end
+ #if( $utilities.isNotEmpty($entry.text) )<content
type="html">#showEntryContent($entry)</content>#end
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm?rev=395028&r1=395027&r2=395028&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm Tue Apr 18
13:25:10 2006
@@ -1,7 +1,7 @@
$pageHelper.setContentType("application/rss+xml;charset=utf-8")<?xml
version="1.0" encoding="utf-8"?>
<rss version="2.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:content="http://purl.org/rss/1.0/modules/content/"; >
+ xmlns:atom="http://www.w3.org/2005/Atom"; >
<channel>
<title>$utilities.textToHTML($utilities.removeHTML($website.name))</title>
<link>$websiteURL</link>
@@ -22,8 +22,8 @@
#end
<pubDate>$utilities.formatRfc822Date($entry.pubTime)</pubDate>
<category>$utilities.textToHTML($entry.category.name,true)</category>
- #if( $entry.summary
)<description>#showEntrySummary($entry)</description>#end
- #if( $entry.text
)<content:encoded>#showEntryContent($entry)</content:encoded>#end
+ #if( $utilities.isNotEmpty($entry.summary) )<atom:summary
type="html">#showEntrySummary($entry)</atom:summary>#end
+ #if( $utilities.isNotEmpty($entry.text)
)<description>#showEntryContent($entry)</description>#end
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
