roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r425236 - /incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
Date Tue, 25 Jul 2006 00:28:42 GMT
Author: agilliland
Date: Mon Jul 24 17:28:41 2006
New Revision: 425236

URL: http://svn.apache.org/viewvc?rev=425236&view=rev
Log:
cleaning up a few things and updating a few lines to use new $url model.


Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?rev=425236&r1=425235&r2=425236&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Mon Jul 24 17:28:41
2006
@@ -66,7 +66,7 @@
     <link rel="alternate" type="application/rss+xml"  title="RSS Entries"   href="$url.feed.entries.rss"
/>
     <link rel="alternate" type="application/rss+xml"  title="RSS Comments"  href="$url.feed.comments.rss"
/>
     #if ($weblog.enableBloggerApi)
-       <link rel="EditURI"   type="application/rsd+xml" title="RSD" href="$weblog.URL/rsd"/>
+       <link rel="EditURI"   type="application/rsd+xml" title="RSD" href="$url.rsd"/>
     #end
 #end
 
@@ -148,12 +148,11 @@
 Show comments for weblog entry according to Roller configuration.
 *#
 #macro(showWeblogEntryComments $entry)
-    #set($commentPreview = $model.getCommentPreview())
     <a name="comments"></a>
     <div class="comments">
 
-    #if($commentPreview)
-        #set($comments = [$commentPreview])
+    #if($model.commentPreview)
+        #set($comments = [$model.commentPreview])
         <div class="comments-head">$text.get( "macro.weblog.preview" ):</div>
     #else
         <div class="comments-head">$text.get( "macro.weblog.comments" ):</div>
@@ -194,7 +193,7 @@
                 #if( $utils.isNotEmpty($comment.url) )
                     $text.get( "macro.weblog.postedbywebsite", [$comment.url, $comment.url]
)
                 #end
-                <a href="${ctxPath}${entry.permaLink}#comment${velocityCount}"
+                <a href="$url.comment($entry.anchor, $velocityCount)"
                    class="entrypermalink"
                    title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
                 </p>
@@ -222,10 +221,9 @@
         <span class="status">$model.statusMessage</span>
     #end
 
-    <form method="post" action="$url.site/roller-ui/rendering/comment/$entry.website.handle/entry/$entry.anchor"

+    <form method="post" action="$url.entry($entry.anchor)" 
         focus="name" name="form" onsubmit="fixURL(this); return validateComments(this)">
   
         <input type="hidden" name="method" value="post" />
-        <input type="hidden" name="entryid" value="$entry.id" />
 
         <ul>
             <li>
@@ -329,7 +327,7 @@
 
 
 #** 
-Show recent weblog entries in specified category. 
+Show entries as a HTML ul list.
 *#
 #macro(showWeblogEntryLinksList $entriesList)
    <ul class="entriesList">
@@ -499,9 +497,9 @@
                 #set($isSelected = false)
                 #if ($page && $iPage.Id == $page.Id) #set($isSelected = true) #end
                 #if (!$isSelected && $iPage.name == "Weblog")
-                    <li class="rNavItem"><a href="$weblog.URL">$iPage.name</a></li>
+                    <li class="rNavItem"><a href="$url.home">$iPage.name</a></li>
                 #elseif (!$isSelected)
-                    <li class="rNavItem"><a href="$weblog.URL/page/$iPage.link">$iPage.name</a></li>
+                    <li class="rNavItem"><a href="$url.page($iPage.link)">$iPage.name</a></li>
                 #else
                     <li class="rNavItem">$iPage.name</li>
                 #end
@@ -606,7 +604,7 @@
             <input type="submit" value="$text.get( "macro.weblog.searchagain" )" />
         </form>
 
-        $text.get( "macro.weblog.searchgoogle", [$searchResults.term, $absBaseURL, $ctxPath,
${website.handle}] )
+        $text.get( "macro.weblog.searchgoogle", [$searchResults.term, $url.absoluteSite,
$url.site, ${website.handle}] )
     </div>
     <!-- searchhi script hangs firefox, commenting it out for now -->
     <!-- script type="text/javascript" src="$url.site/theme/scripts/searchhi.js"></script
-->



Mime
View raw message