You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/04/20 21:42:07 UTC
svn commit: r395681 - in
/incubator/roller/trunk/web/WEB-INF/classes/flavors: atom.vm rss.vm
Author: snoopdave
Date: Thu Apr 20 12:42:05 2006
New Revision: 395681
URL: http://svn.apache.org/viewcvs?rev=395681&view=rev
Log:
Still fixing/tweaking summary/text display logic
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=395681&r1=395680&r2=395681&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm Thu Apr 20 12:42:05 2006
@@ -30,8 +30,7 @@
<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( $utilities.isNotEmpty($entry.summary) && $utilities.isNotEmpty($entry.text))<summary type="html">#showEntrySummary($entry)</summary>#end
- #if( $utilities.isNotEmpty($entry.summary) && $utilities.isEmpty($entry.text))<content type="html">#showEntrySummary($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") )
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=395681&r1=395680&r2=395681&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm Thu Apr 20 12:42:05 2006
@@ -22,7 +22,7 @@
#end
<pubDate>$utilities.formatRfc822Date($entry.pubTime)</pubDate>
<category>$utilities.textToHTML($entry.category.name,true)</category>
- #if( $utilities.isNotEmpty($entry.summary) && $utilities.isNotEmpty($entry.text))<summary type="html">#showEntrySummary($entry)</summary>#end
+ #if( $utilities.isNotEmpty($entry.summary) && $utilities.isNotEmpty($entry.text))<atom:summary type="html">#showEntrySummary($entry)</atom:summary>#end
#if( $utilities.isNotEmpty($entry.summary) && $utilities.isEmpty($entry.text))<description>#showEntrySummary($entry)</description>#end
#if( $utilities.isNotEmpty($entry.text) )<description>#showEntryContent($entry)</description>#end
#set( $mc_url = $entry.findEntryAttribute("att_mediacast_url") )