svn commit: r377758 - /incubator/roller/trunk/web/WEB-INF/classes/weblog.vm

[snoopdave]

Author: snoopdave
Date: Tue Feb 14 08:30:27 2006
New Revision: 377758

URL: http://svn.apache.org/viewcvs?rev=377758&view=rev
Log:
Fixing next/prev to conform to blog norms

Modified:
    incubator/roller/trunk/web/WEB-INF/classes/weblog.vm

Modified: incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
URL: 
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/weblog.vm?rev=377758&r1=377757&r2=377758&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Tue Feb 14 08:30:27 
2006
@@ -158,14 +158,14 @@
         #set( $catLink = "?catname=$catPath" ) 
     #end
     <div class="next-previous">
-    #if ($pageModel.nextEntry)
-        #showNextWeblogLink($npcat) |
+    #if ($pageModel.previousEntry)
+        #showPrevWeblogLink($npcat) |
     #end
-    #if (($pageModel.previousEntry && $pageModel.nextEntry) || 
$pageModel.previousEntry)
-        <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a> |
+    #if ($pageModel.previousEntry || $pageModel.nextEntry)
+        <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a>
     #end
-    #if ($pageModel.previousEntry)
-        #showPrevWeblogLink($npcat)
+    #if ($pageModel.nextEntry)
+        | #showNextWeblogLink($npcat)
     #end
     </div>
 #end
@@ -181,11 +181,11 @@
         #if( $pageModel.weblogEntry )
             #set( $prevURL = "${ctxPath}${prev.permaLink}" )
             <a href="$prevURL" title="Previous Entry"
-                >$utilities.truncateNicely($prev.title, 20, 20, "...") 
&raquo;</a>
+                > &laquo; $utilities.truncateNicely($prev.title, 25, 25, 
"...")</a>
         #else
             #set( $prevURL = 
"${ctxPath}/page/${website.handle}/#formatDate($plainFormat ${prev.pubTime})" )
             <a href="$prevURL" title="Previous Entries"
-                >#showEntryDate(${prev.pubTime}) &raquo;</a>
+                > &laquo; #showEntryDate(${prev.pubTime})</a>
         #end
     #end
     </span>
@@ -202,11 +202,11 @@
         #if( $pageModel.weblogEntry )
             #set( $nextURL = "${ctxPath}${next.permaLink}" )
             <a href="$nextURL" title="Next Entry"
-                >&laquo; $utilities.truncateNicely($next.title, 20, 20, 
"...")</a>
+                >$utilities.truncateNicely($next.title, 25, 25, "...") &raquo; 
</a>
         #else
             #set( $nextURL = 
"${ctxPath}/page/${website.handle}/#formatDate($plainFormat ${next.pubTime})" )
             <a href="$nextURL" title="Next Entries"
-                >&laquo; #showEntryDate(${next.pubTime})</a>
+                >#showEntryDate(${next.pubTime}) &raquo; </a>
         #end
 
     #end