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 2005/09/19 23:31:37 UTC
svn commit: r290277 - in
/incubator/roller/branches/roller_2.0/web/WEB-INF/classes: bookmark.vm
comments.vm popupcomments.vm rssmacros.vm searchresults_day.vm user.vm
weblog.vm website.vm
Author: agilliland
Date: Mon Sep 19 14:31:32 2005
New Revision: 290277
URL: http://svn.apache.org/viewcvs?rev=290277&view=rev
Log:
updating velocity macros which use references to $userName for urls to use $website.handle now.
Modified:
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/popupcomments.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm Mon Sep 19 14:31:32 2005
@@ -98,7 +98,7 @@
*#
#macro( showOpmlLink $folderName )
#if ( $pageModel.getFolder( $folderName ) )
- <a href="$ctxPath/flavor/$userName?flavor=opml&path=$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>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm Mon Sep 19 14:31:32 2005
@@ -40,7 +40,7 @@
#if (($entry.commentsStillAllowed && $website.allowComments) || $commentCount > 0)
<div class="comments" id="comments">
<div id="commentTwisty$entry.Id" class="commentTwisty"
- onclick="toggleComments('$entry.Id', '$ctxPath/page/$userName'); return false;">
+ onclick="toggleComments('$entry.Id', '${ctxPath}/page/${website.handle}'); return false;">
<a href="$ctxPath$entry.permaLink" class="plain">
#if($commentCount == 0)
$text.get( "macro.weblog.addcomment" )
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/popupcomments.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/popupcomments.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/popupcomments.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/popupcomments.vm Mon Sep 19 14:31:32 2005
@@ -39,7 +39,7 @@
</style>
<!-- Edit your _css Page Template -->
<link rel="stylesheet" type="text/css"
- href="$ctxPath/page/$userName/_css" />
+ href="${ctxPath}/page/${website.handle}/_css" />
</head>
<body>
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm Mon Sep 19 14:31:32 2005
@@ -8,12 +8,12 @@
* of the specified category.
*#
#macro( showRSSLinksForCategory $category )
- <a href="$ctxPath/rss/$userName">$text.get("macro.rss.all")</a>
- [<a href="$ctxPath/rss/$userName?excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ <a href="${ctxPath}/rss/${website.handle}">$text.get("macro.rss.all")</a>
+ [<a href="${ctxPath}/rss/${website.handle}?excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
#set( $categories = $pageModel.getWeblogCategories($category) )
#foreach( $cat in $categories )
- <a href="$ctxPath/rss/$userName?catname=$cat.path">$cat.path</a>
- [<a href="$ctxPath/rss/$userName?catname=$cat.path&excerpts=true">$text.get("macro.rss.excerpts")</a>]<br />
+ <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 />
#end
#end
@@ -27,13 +27,13 @@
*#
#macro( showRSSAutodiscoveryLink )
<link rel="alternate" type="application/rss+xml"
- title="RSS" href="$absBaseURL/rss/$userName" />
+ title="RSS" href="$absBaseURL/rss/${website.handle}" />
#end
#**
* Show RSS badge with link to your weblog's main RSS feed.
*#
#macro( showRSSBadge )
- <a href="$ctxPath/rss/$userName"><img class="rssbadge"
+ <a href="${ctxPath}/rss/${website.handle}"><img class="rssbadge"
src="$ctxPath/images/rssbadge.gif" alt="XML" /></a>
#end
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm Mon Sep 19 14:31:32 2005
@@ -1,20 +1,20 @@
#macro( showEntryPermalink $entry )
-<a href="$baseURL/page/$entry.website.user.userName/?entry=$entry.Anchor"
+<a href="$ctxPath$entry.permaLink"
title="$text.get( "macro.searchresultsday.entrypermalink.title" )"
class="entrypermalink">posted</a>
#end
## you have to be so damn careful with whitespace in Velocity
#macro( showUserPermalink $entry )
-<a href="$baseURL/page/$entry.website.user.userName/"
+<a href="${ctxPath}/page/${entry.website.handle}"
title="$text.get( "macro.searchresultsday.userpermalink.title" )"
- class="entrypermalink">$entry.website.user.userName</a>#if ($entry.category),
+ class="entrypermalink">$entry.website.creator.userName</a>#if ($entry.category),
in #showCategoryPermalink($entry) #end
#end
## you have to be so damn careful with whitespace in Velocity
#macro( showCategoryPermalink $entry )
-<a href="$baseURL/page/$entry.website.user.userName/?catname=#$utilities.encode($entry.category.name)"
+<a href="${ctxPath}/page/${entry.website.handle}?catname=#$utilities.encode($entry.category.name)"
title="$text.get( "macro.searchresultsday.categorypermalink.title" )"
class="entrypermalink">$entry.category.name</a>,
#end
@@ -31,7 +31,7 @@
by #showUserPermalink( $entry )
on #showTimestamp($entry.pubTime).
<span style="font-size:x-small;">(<a
- href="?q=${utilities.encode($term)}&${USERNAME_KEY}=$!{entry.website.user.userName}"
+ href="?q=${utilities.encode($term)}&${USERNAME_KEY}=$!{entry.website.creator.userName}"
>restrict search</a> to just this blog)</span>
</p>
#end
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm Mon Sep 19 14:31:32 2005
@@ -27,11 +27,11 @@
* optionally surrounded with an 'A HREF' link tag
*#
#macro( showResourceImage $fileName $linkUrl $alt $border $halign $valign )
- #set( $imageUrl = $uploadPath/$userName/$fileName )
+ #set( $imageUrl = $uploadPath/${website.handle}/$fileName )
#showImage( $imageUrl $linkUrl $alt $border $halign $valign )
#end
#**
* Show path to your file upload directory, for use in building URLs.
*#
-#macro( showResourcePath )$uploadPath/$userName#end
\ No newline at end of file
+#macro( showResourcePath )$uploadPath/${website.handle}#end
\ No newline at end of file
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm Mon Sep 19 14:31:32 2005
@@ -94,7 +94,7 @@
* @param day Date object that specifies day (type java.util.Date).
*#
#macro( showDayPermalink $day )
- <a href="$baseURL/page/$userName/#formatDate($plainFormat $day )"><img
+ <a href="${ctxPath}/page/${website.handle}/#formatDate($plainFormat $day )"><img
class="daypermalink"
src="$ctxPath/images/permalink.gif"
title="$text.get( "macro.weblog.daypermalink.title" )"
@@ -144,14 +144,15 @@
* @param entry WeblogEntry object.
*#
#macro( showTrackbackURL $entry )
-$absBaseURL/trackback/$userName/$page.link/$utilities.encode($entry.anchor)#end
+$absBaseURL/trackback/${website.handle}/$page.link/$utilities.encode($entry.anchor)
+#end
#**
* Display search form for searching a weblog. This is only a form, no div
* or anything around it.
*#
#macro( showSearchForm )
- <form id="searchForm" method="get" action="$ctxPath/search/$userName"
+ <form id="searchForm" method="get" action="${ctxPath}/search/${website.handle}"
style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
<p>
<input type="text" id="q" name="q" size="20"
@@ -187,7 +188,7 @@
$text.get( "macro.weblog.searchhits", [$hits])
- <form method="get" action="$ctxPath/search/$userName"
+ <form method="get" action="${ctxPath}/search/${website.handle}"
style="margin: 5px">
<input type="text" id="q" name="q" size="31"
maxlength="255" value="$term"
@@ -202,7 +203,7 @@
<input type="submit" value="$text.get( "macro.weblog.searchagain" )" />
</form>
- $text.get( "macro.weblog.searchgoogle", [$term, $absBaseURL, $ctxPath, $userName] )
+ $text.get( "macro.weblog.searchgoogle", [$term, $absBaseURL, $ctxPath, ${website.handle}] )
</div>
<script type="text/javascript"
src="$ctxPath/theme/scripts/searchhi.js"></script>
@@ -315,7 +316,7 @@
#foreach( $day in $xmap.keySet() )
#set( $recentEntries = $xmap.get($day) )
#foreach ($var in $recentEntries)
- <li class="recentposts"><a href="$baseURL/page/$userName/?entry=$utilities.encode($var.anchor)">$var.title</a></li>
+ <li class="recentposts"><a href="${ctxPath}/page/${website.handle}?entry=$utilities.encode($var.anchor)">$var.title</a></li>
#end
#end
</ul>
@@ -405,7 +406,7 @@
#showPrevEntryLink($npcat) |
#end
#if ( $pageModel.previousEntry || $pageModel.nextEntry)
- <a href="$ctxPath/page/$userName/$page.link$catLink">$page.name</a>
+ <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a>
#end
#if ($pageModel.nextEntry)
| #showNextEntryLink($npcat)
@@ -421,8 +422,7 @@
<span id="previousEntry">
#if( $pageModel.previousEntry )
#set( $prev = $pageModel.previousEntry )
- #set( $prevURL = "$baseURL/page/${prev.website.user.userName}/#formatDate($plainFormat ${prev.pubTime})" )
- #if ( $category != 'nil' ) #set( $prevURL = "$prevURL?catname=$category" )#end
+ #set( $prevURL = "${ctxPath}${prev.permaLink}" )
<a href="$prevURL" title="Previous Entries"
>« $utilities.truncateNicely($prev.title, 30, 30, "...")</a>
#end
@@ -437,8 +437,7 @@
<span id="nextEntry">
#if( $pageModel.nextEntry )
#set( $next = $pageModel.nextEntry )
- #set( $nextURL = "$baseURL/page/${next.website.user.userName}/#formatDate($plainFormat ${next.pubTime})" )
- #if ( $category != 'nil' ) #set( $nextURL = "$nextURL?catname=$category" )#end
+ #set( $nextURL = "${ctxPath}${next.permaLink}" )
<a href="$nextURL" title="Next Entries"
>$utilities.truncateNicely($next.title, 30, 30, "...") »</a>
#end
@@ -467,7 +466,7 @@
dc:identifier="$absBaseURL$entry.permaLink"
dc:subject="$entry.category.name"
dc:description="$entry.title"
- dc:creator="$entry.website.user.userName"
+ dc:creator="$entry.website.creator.userName"
dc:date="$entry.pubTime" />
</rdf:RDF>
-->
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm?rev=290277&r1=290276&r2=290277&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm Mon Sep 19 14:31:32 2005
@@ -65,7 +65,7 @@
* @param divider The text to place between each category.
*#
#macro( showWeblogSubcategoryChooser2 $parentCategory $divider )
- #set( $rawUrl = "$ctxPath/page/$userName/$page.link" )
+ #set( $rawUrl = "${ctxPath}/page/${website.handle}" )
<div class="rWeblogCategoryChooser">
#set( $weblogUrl = $rawUrl )