Update of /cvsroot/roller/roller/web/WEB-INF/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv12945/web/WEB-INF/classes
Modified Files:
bookmark.vm weblog.vm
Log Message:
More bug fixes in flavors.
Index: bookmark.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/bookmark.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bookmark.vm 26 Nov 2003 03:31:05 -0000 1.7
--- bookmark.vm 27 Nov 2003 04:56:15 -0000 1.8
***************
*** 13,26 ****
#if( $utilities.isNotEmpty( $bookmark.Image ) )
<a href="$bookmark.Url"><img alt="$bookmark.Name"
! src="$baseURL#showResourcePath()/$bookmark.Image" /></a><br />
#elseif( $utilities.isNotEmpty( $bookmark.FeedUrl ) )
! <a class="rBookmark" href="$bookmark.Url"
#if( $utilities.isNotEmpty( $bookmark.Description ) )
title="$bookmark.Description"
#end
>$bookmark.Name</a>
! <a href="$bookmark.FeedUrl"><img class="smrssbadge"
! src="$baseURL/images/smrssbadge.gif"
! alt="URL of site's RSS feed" /></a><br />
#else
<a href="$bookmark.Url" class="rBookmark$bookmark.Weight"
--- 13,26 ----
#if( $utilities.isNotEmpty( $bookmark.Image ) )
<a href="$bookmark.Url"><img alt="$bookmark.Name"
! src="$baseURL#showResourcePath()/$bookmark.Image" /></a>
#elseif( $utilities.isNotEmpty( $bookmark.FeedUrl ) )
! <a href="$bookmark.FeedUrl"><img class="smrssbadge"
! src="$baseURL/images/smrssbadge.gif"
! alt="URL of site's RSS feed" /></a><a class="rBookmark"
href="$bookmark.Url"
#if( $utilities.isNotEmpty( $bookmark.Description ) )
title="$bookmark.Description"
#end
>$bookmark.Name</a>
! <br />
#else
<a href="$bookmark.Url" class="rBookmark$bookmark.Weight"
***************
*** 70,74 ****
<span class="error">Error fetching folder named $folderName</span>
#else
! <a href="$ctxPath/flavor?flavor=opml&path=$folder.path">
<img src="$ctxPath/images/opml.png" alt="OPML for $folderName" />
</a>
--- 70,74 ----
<span class="error">Error fetching folder named $folderName</span>
#else
! <a href="$ctxPath/flavor/$userName?flavor=opml&path=$folder.path">
<img src="$ctxPath/images/opml.png" alt="OPML for $folderName" />
</a>
Index: weblog.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/weblog.vm,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** weblog.vm 26 Nov 2003 03:31:36 -0000 1.34
--- weblog.vm 27 Nov 2003 04:56:15 -0000 1.35
***************
*** 27,36 ****
#**
! * It is no longer necessary to use a page template named _entry
* if you want to override entry rendering in both your
* HTML and RSS weblog output (for support of PagePlugins).
* However, backwards compatibility for such use is still included,
* or if you have some other need to override entry rendering.
! * The _entry page is now loaded by ContextLoader as $entryPage.
*#
#macro( showEntryText $entry )
--- 27,40 ----
#**
! * Use this macro in your day template if you want to override
! * entry rendering in both your HTML and RSS weblog output by defining
! * a page template named _entry.
! *
! * <p>It is no longer necessary to use a page template named _entry
* if you want to override entry rendering in both your
* HTML and RSS weblog output (for support of PagePlugins).
* However, backwards compatibility for such use is still included,
* or if you have some other need to override entry rendering.
! * The _entry page is now loaded by ContextLoader as $entryPage.</p>
*#
#macro( showEntryText $entry )
***************
*** 56,68 ****
* entry rendering in both your HTML and RSS weblog output by defining
* a page template named _desc.
*#
#macro( showEntryDescription $entry )
! #if( $pageModel.getUsersPageByName($entry.website.user.userName,"_desc"))
! #set( $entryPage =
$pageModel.getUsersPageByName($entry.website.user.userName,"_desc"))
! #parse($entryPage.id)
! #elseif( $entryLength > -1 )
! $stringUtils.left($utilities.textToXML($entry.text),$entryLength)...
[$entry.text.length() characters]
#else
! $utilities.textToXML($entry.text)
#end
#end
--- 60,86 ----
* entry rendering in both your HTML and RSS weblog output by defining
* a page template named _desc.
+ *
+ * <p>It is no longer necessary to use a page template named _desc
+ * if you want to override entry rendering in both your
+ * HTML and RSS weblog output (for support of PagePlugins).
+ * However, backwards compatibility for such use is still included,
+ * or if you have some other need to override entry rendering.
+ * The _desc page is now loaded by ContextLoader as $descPage.</p>
*#
#macro( showEntryDescription $entry )
! #if( $descPage )
! #parse($descPage.id)
#else
! #if ( $entry.autoformatEntry )
! #set( $entryText = $pageHelper.renderPlugins( $entry ) )
! #else
! #set( $entryText = $entry.text )
! #end
! #if( $entryLength == -1 )
! $utilities.textToHTML($entryText,true)
! #else
! #set( $entryText = $utilities.removeHTML($entryText) )
! $stringUtils.left( $entryText, $entryLength )...
[$entryText.length() characters]
! #end
#end
#end
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
|
