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/08/02 02:12:22 UTC
svn commit: r427812 -
/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm
Author: agilliland
Date: Tue Aug 1 17:12:22 2006
New Revision: 427812
URL: http://svn.apache.org/viewvc?rev=427812&view=rev
Log:
some macro cleanup for Roller 3.0
Modified:
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm?rev=427812&r1=427811&r2=427812&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/referer.vm Tue Aug 1 17:12:22 2006
@@ -8,8 +8,8 @@
*#
#macro( refererDisplayUrl $ref $maxWidth $includeHits )
#set( $qq = '"' )
- #set( $url = $utilities.escapeHTML( $ref.RefererUrl ) )
- #set( $displayUrl = $url )
+ #set( $myUrl = $utils.escapeHTML( $ref.RefererUrl ) )
+ #set( $displayUrl = $myUrl )
#set( $restOfUrl = "" )
#set( $displayLink = "" )
#if ( $displayUrl.startsWith("http://") )
@@ -19,8 +19,8 @@
#set( $restOfUrl = "...$displayUrl.substring($maxWidth, $displayUrl.length())" )
#set( $displayUrl = $displayUrl.substring(0, $maxWidth) )
#end
- #if ( $url.startsWith("http://") )
- #set( $displayLink = "<a rel=${qq}nofollow${qq} href=${qq}$url${qq}" )
+ #if ( $myUrl.startsWith("http://") )
+ #set( $displayLink = "<a rel=${qq}nofollow${qq} href=${qq}$myUrl${qq}" )
#if ( $restOfUrl )
#set( $displayLink = "$displayLink title=${qq}$restOfUrl${qq}" )
#end
@@ -30,7 +30,7 @@
#if ( $includeHits )
#set( $displayLink = "$displayLink ($ref.DayHits)" )
#end
- #if ( $url.startsWith("http://") )
+ #if ( $myUrl.startsWith("http://") )
#set( $displayLink = "$displayLink</a>" )
#end
$displayLink
@@ -66,11 +66,11 @@
<b>$text.get( "macro.referer.furtherReading" )</b></p>
<ul>
#foreach( $ref in $refs )
- #set( $url = $utilities.escapeHTML( $ref.getUrl() ) )
+ #set( $url = $utils.escapeHTML( $ref.getUrl() ) )
<li> $pageHelper.getToggleLinkbackDisplayHTML($ref)
<a class="linkback" href="$url">$ref.getTitle()</a>
#if( $ref.getVisible() )
- : $utilities.removeHTML( $ref.getExcerpt() )
+ : $utils.removeHTML( $ref.getExcerpt() )
#end
</li>
#end