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/22 02:53:14 UTC
svn commit: r424506 - in
/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated:
atommacros.vm bookmark.vm comments.vm rssmacros.vm user.vm weblog.vm
Author: agilliland
Date: Fri Jul 21 17:53:12 2006
New Revision: 424506
URL: http://svn.apache.org/viewvc?rev=424506&view=rev
Log:
start revising old macros to use new URLModel for url creation.
Modified:
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/atommacros.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/bookmark.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/rssmacros.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/user.vm
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/atommacros.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/atommacros.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/atommacros.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/atommacros.vm Fri Jul 21 17:53:12 2006
@@ -8,10 +8,10 @@
* of the specified category.
*#
#macro( showAtomLinksForCategory $category )
- <a href="${ctxPath}/atom/${website.handle}">$text.get("macro.rss.all")</a><br />
+ <a href="$url.feed.entries.atom">$text.get("macro.rss.all")</a><br />
#set( $categories = $pageModel.getWeblogCategories($category) )
#foreach( $cat in $categories )
- <a href="${ctxPath}/atom/${website.handle}?catname=$cat.path">$cat.path</a><br />
+ <a href="$url.feed.entries.atom?cat=$cat.path">$cat.path</a><br />
#end
#end
@@ -32,6 +32,6 @@
* Show RSS badge with link to your weblog's main RSS feed.
*#
#macro( showAtomBadge )
- <a href="${ctxPath}/atom/${website.handle}"><img class="atombadge"
+ <a href="$url.feed.entries.atom"><img class="atombadge"
src="$ctxPath/images/atombadge.jpeg" alt="XML" /></a>
#end
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/bookmark.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/bookmark.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/bookmark.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/bookmark.vm Fri Jul 21 17:53:12 2006
@@ -16,12 +16,12 @@
src="$bookmark.image" class="rBookmark" /></a>
#else
<a href="$bookmark.url"><img alt="$bookmark.description"
- src="$baseURL#showResourcePath()/$bookmark.image" class="rBookmark" /></a>
+ src="$url.resource($bookmark.image)" class="rBookmark" /></a>
#end
#else
#if( $utilities.isNotEmpty( $bookmark.FeedUrl ) )
<a href="$bookmark.feedUrl"><img class="smrssbadge"
- src="$baseURL/images/smrssbadge.gif"
+ src="$url.site/images/smrssbadge.gif"
alt="$text.get( "macro.bookmark.urlFeed" )"/></a>
#end
<a href="$bookmark.url"
@@ -97,14 +97,7 @@
* @param folderName Name of folder to be displayed (or / separated path)
*#
#macro( showOpmlLink $folderName )
- #if ( $pageModel.getFolder( $folderName ) )
- <a href="${ctxPath}/flavor/${website.handle}?flavor=opml&path=$folderName">
- <img src="$ctxPath/images/opml.png"
- alt="OPML badge" title="OPML for $folderName" />
- </a>
- #else
- <span class="error">$text.get( "macro.bookmark.error", [$folderName])</span>
- #end
+ ## no longer supported since Roller 3.0
#end
#macro( showBlogroll )#showBookmarks("/" false false)#end
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm Fri Jul 21 17:53:12 2006
@@ -11,7 +11,7 @@
#macro( showCommentsLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
#if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
- #set( $link = "$ctxPath$entry.permaLink&popup=true#comments" )
+ #set( $link = "$url.comments($entry.anchor)?popup=true" )
<a href="$link " onclick="window.open('$link', 'comments',
'width=480,height=480,scrollbars=yes,status=yes,resizable'); return false;"
class="entrycommentslink">$text.get( "macro.weblog.comments" ) [$commentCount]</a>
@@ -25,7 +25,7 @@
#macro( showCommentsPageLink $entry )
#set( $commentCount = $pageModel.getCommentCount($entry.Id) )
#if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
- #set( $link = "$ctxPath$entry.permaLink#comments" )
+ #set( $link = "$url.comments($entry.anchor)" )
<a href="$link" class="entrycommentslink">$text.get( "macro.weblog.comments" ) [$commentCount]</a>
#end
#end
@@ -40,8 +40,8 @@
#if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
<div class="comments" id="comments">
<div id="commentTwisty$entry.Id" class="commentTwisty"
- onclick="toggleComments('$entry.Id', '${website.URL}'); return false;">
- <a href="$ctxPath$entry.permaLink" class="plain">
+ onclick="toggleComments('$entry.Id', '$url.home'); return false;">
+ <a href="$url.entry($entry.anchor)" class="plain">
#if($commentCount == 0)
$text.get( "macro.weblog.addcomment" )
#elseif($commentCount == 1)
@@ -72,7 +72,7 @@
$text.get( "macro.weblog.postedbywebsite", [$comment.url, $comment.url] )
#end
#if( $showPermalink )
- <a href="${ctxPath}${entry.permaLink}#comment${velocityCount}"
+ <a href="$url.comments($entry.anchor)${velocityCount}"
class="entrypermalink"
title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
#end
@@ -135,7 +135,7 @@
#set($content = $utilities.addNofollow($content))
<div class="comment" style="border: 1px solid #dadada; padding-left: 3px; padding-right: 5px;" >
<p>Commenting on <a class="entrypermalink"
- href="${comment.weblogEntry.permaLink}">${comment.weblogEntry.title}</a>:</p>
+ href="$url.entry($comment.weblogEntry.anchor)">${comment.weblogEntry.title}</a>:</p>
${content}
#showCommentDetails($comment false)
</div>
@@ -158,7 +158,7 @@
#set($content = $utilities.encodeEmail($comment.content))
#set($content = $utilities.addNofollow($content))
<li class="commentsListItem"><a
- href="${ctxPath}${comment.weblogEntry.permaLink}#comments"
+ href="$url.comments($comment.weblogEntry.anchor)"
class="entrypermalink"
title="$text.get( "macro.weblog.commentpermalink.title" ) to
'$utilities.removeHTML($comment.weblogEntry.title)'"
@@ -186,7 +186,7 @@
#showStatusMessage()
- <form method="post" action="$ctxPath$entry.permaLink" focus="name"
+ <form method="post" action="$url.entry($entry.anchor)" focus="name"
name="form" onsubmit="fixURL(this); return validateComments(this)">
#if($requestParameters.popup)
@@ -262,9 +262,9 @@
</form>
- <script type="text/javascript" src="$ctxPath/theme/scripts/roller.js"></script>
+ <script type="text/javascript" src="$url.site/theme/scripts/roller.js"></script>
<script type="text/javascript">
- clientSideInclude('commentAuthenticator', '$ctxPath/CommentAuthenticatorServlet');
+ clientSideInclude('commentAuthenticator', '$url.site/CommentAuthenticatorServlet');
var author = getCookie("commentAuthor");
var email = getCookie("commentEmail");
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/rssmacros.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/rssmacros.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/rssmacros.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/rssmacros.vm Fri Jul 21 17:53:12 2006
@@ -8,12 +8,12 @@
* of the specified category.
*#
#macro( showRSSLinksForCategory $category )
- <a href="${website.URL}">$text.get("macro.rss.all")</a>
- [<a href="${ctxPath}/rss/${website.handle}?excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ <a href="$url.feed.entries.rss">$text.get("macro.rss.all")</a>
+ [<a href="$url.feed.entries.rss">$text.get("macro.rss.excerpts")</a>]<br />
#set( $categories = $pageModel.getWeblogCategories($category) )
#foreach( $cat in $categories )
- <a href="${ctxPath}/rss/${website.handle}?catname=$cat.path">$cat.path</a>
- [<a href="${ctxPath}/rss/${website.handle}?catname=$cat.path&excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ <a href="$url.feed.entries.rss">$cat.path</a>
+ [<a href="$url.feed.entries.rss">$text.get("macro.rss.excerpts")</a>]<br />
#end
#end
@@ -34,6 +34,6 @@
* Show RSS badge with link to your weblog's main RSS feed.
*#
#macro( showRSSBadge )
- <a href="${ctxPath}/rss/${website.handle}"><img class="rssbadge"
+ <a href="$url.feed.entries.rss"><img class="rssbadge"
src="$ctxPath/images/rssbadge.gif" alt="XML" /></a>
#end
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/user.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/user.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/user.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/user.vm Fri Jul 21 17:53:12 2006
@@ -27,11 +27,11 @@
* optionally surrounded with an 'A HREF' link tag
*#
#macro( showResourceImage $fileName $linkUrl $alt $border $halign $valign )
- #set( $imageUrl = $uploadPath/${website.handle}/$fileName )
+ #set( $imageUrl = $url.resource($fileName) )
#showImage( $imageUrl $linkUrl $alt $border $halign $valign )
#end
#**
* Show path to your file upload directory, for use in building URLs.
*#
-#macro( showResourcePath )$uploadPath/${website.handle}#end
\ No newline at end of file
+#macro( showResourcePath )$url.home/resources#end
\ No newline at end of file
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm?rev=424506&r1=424505&r2=424506&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/weblog.vm Fri Jul 21 17:53:12 2006
@@ -65,7 +65,7 @@
#parse($dayTemplateId )
#if($trackbacksEnabled && $website.allowComments && $entry.commentsStillAllowed)
<div class="trackbackUrl">
- $text.get("macro.weblog.trackback") #showTrackbackURL($entry)
+ $text.get("macro.weblog.trackback") $url.trackback($entry.anchor)
</div>
#end
<div class="bottom-next-prev">#showNextPreviousControl()</div>
@@ -120,7 +120,7 @@
#foreach( $day in $xmap.keySet() )
#set( $recentEntries = $xmap.get($day) )
#foreach ($var in $recentEntries)
- <li class="recentposts"><a href="${ctxPath}/page/${website.handle}?entry=$utilities.encode($var.anchor)">$var.title</a></li>
+ <li class="recentposts"><a href="$url.entry($var.anchor)">$var.title</a></li>
#end
#end
</ul>
@@ -236,7 +236,7 @@
#if( $utilities.isNotEmpty($entry.summary) )
#set( $sourceText = $entry.summary )
#if( $utilities.isNotEmpty($entry.text) )
- #set( $readMore = "<a class='readmore' href='$baseURL$entry.permaLink'> ...</a>" )
+ #set( $readMore = "<a class='readmore' href='$url.entry($entry.anchor)'> ...</a>" )
#set( $sourceText = "$sourceText$readMore")
#end
#else
@@ -295,7 +295,7 @@
* @param day Date object that specifies day (type java.util.Date).
*#
#macro( showDayPermalink $day )
- <a href="${ctxPath}/page/${website.handle}/#formatDate($plainFormat $day )"><img
+ <a href="$url.date($utils.formatDate($day, $plainFormat))"><img
class="daypermalink"
src="$ctxPath/images/permalink.gif"
title="$text.get( "macro.weblog.daypermalink.title" )"
@@ -335,11 +335,11 @@
* @param entry WeblogEntry object.
*#
#macro( showEntryPermalink $entry )
- <a href="$baseURL$entry.permaLink"
+ <a href="$url.entry($entry.anchor)"
title="$text.get( "macro.weblog.entrypermalink.title" )"
class="entrypermalink">Permalink</a>
#if ($pageHelper.isUserAuthorizedToEdit())
- [<a href="$pageHelper.getEntryEditUrl($entry)">$text.get( "macro.weblog.entrypermalink.edit" )</a>]
+ [<a href="$url.editEntry($entry.anchor)">$text.get( "macro.weblog.entrypermalink.edit" )</a>]
#end
#end
@@ -349,7 +349,7 @@
* @param entry WeblogEntry object.
*#
#macro( showTrackbackURL $entry )
-${entry.permalink}
+$url.trackback($entry.anchor)
#end
@@ -370,10 +370,10 @@
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description
- rdf:about="$absBaseURL$entry.permaLink"
- trackback:ping="#showTrackbackURL($entry)"
+ rdf:about="$url.entry($entry.anchor)"
+ trackback:ping="$url.trackback($entry.anchor)"
dc:title="$entry.title"
- dc:identifier="$absBaseURL$entry.permaLink"
+ dc:identifier="$url.entry($entry.anchor)"
dc:subject="$entry.category.name"
dc:description="$entry.title"
dc:creator="$entry.creator.userName"
@@ -393,16 +393,16 @@
* or anything around it.
*#
#macro( showSearchForm )
- <form id="searchForm" method="get" action="${website.URL}/search"
+ <form id="searchForm" method="get" action="$url.search"
style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
<p>
<input type="text" id="q" name="q" size="20"
maxlength="255" value="#if($term)$term#end" />
#set( $cats = $pageModel.getWeblogCategories("nil") )
- <select name="c">
+ <select name="cat">
<option value="">- In Category -</option>
#foreach( $cat in $cats )
- <option #if($cat.name == $req.getParameter('c'))selected="selected"#end>$cat.name</option>
+ <option #if($cat.name == $req.getParameter('cat'))selected="selected"#end>$cat.name</option>
#end
</select>
<input type="submit" value="$text.get( "macro.weblog.searchbutton" )" />
@@ -430,16 +430,16 @@
$text.get( "macro.weblog.searchhits", [$searchResults.hits])
- <form method="get" action="${ctxPath}/search/${website.handle}"
+ <form method="get" action="$url.search"
style="margin: 5px">
<input type="text" id="q" name="q" size="31"
maxlength="255" value="$searchResults.term"
style="padding-left: 1px" /><br />
#set( $cats = $pageModel.getWeblogCategories("nil") )
- <select name="c">
+ <select name="cat">
<option value="">- Restrict By Category -</option>
#foreach( $cat in $cats )
- <option #if($cat.name == $req.getParameter('c'))selected="selected"#end>$cat.name</option>
+ <option #if($cat.name == $req.getParameter('cat'))selected="selected"#end>$cat.name</option>
#end
</select>
<input type="submit" value="$text.get( "macro.weblog.searchagain" )" />