roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r417895 - in /incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated: comments.vm navbar.vm rssmacros.vm weblog.vm website.vm
Date Wed, 28 Jun 2006 23:02:03 GMT
Author: agilliland
Date: Wed Jun 28 16:02:02 2006
New Revision: 417895

URL: http://svn.apache.org/viewvc?rev=417895&view=rev
Log:
first pass at macro changes to support new url structure.

- only updated macros to change links that display the weblog homepage url to use the WebsiteData.getURL()
method instead of constructing the url manually.


Modified:
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/comments.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/navbar.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/weblog.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/website.vm

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=417895&r1=417894&r2=417895&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 Wed Jun
28 16:02:02 2006
@@ -40,7 +40,7 @@
     #if (($commentsEnabled && $entry.commentsStillAllowed && $website.allowComments)
|| $commentCount > 0)
         <div class="comments" id="comments">
             <div id="commentTwisty$entry.Id" class="commentTwisty"
-                onclick="toggleComments('$entry.Id', '${ctxPath}/page/${website.handle}');
return false;">
+                onclick="toggleComments('$entry.Id', '${website.URL}'); return false;">
             <a href="$ctxPath$entry.permaLink" class="plain">
             #if($commentCount == 0)
                 $text.get( "macro.weblog.addcomment" )
@@ -186,7 +186,7 @@
 
     #showStatusMessage()
 
-    <form method="post" action="$ctxPath/$entry.website.handle/entry/$entry.anchor" focus="name"
+    <form method="post" action="$ctxPath/$entry.permaLink" focus="name"
         name="form" onsubmit="fixURL(this); return validateComments(this)">
         
         #if($requestParameters.popup)

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/navbar.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/navbar.vm?rev=417895&r1=417894&r2=417895&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/navbar.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/navbar.vm Wed Jun
28 16:02:02 2006
@@ -56,7 +56,7 @@
 #macro( showNavBar2 $vertical $delimiter $useCSS)
     #set( $container = "div" )
     #if ( $useCSS ) #set( $container = "ul" ) #end
-    #set( $rawUrl = "$ctxPath/page/$website.handle" )
+    #set( $rawUrl = "$website.URL" )
     <$container class="rNavigationBar">
     #printNavLink( "$ctxPath/" $siteShortName $useCSS $vertical "" )
     #if( $website )

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=417895&r1=417894&r2=417895&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 Wed
Jun 28 16:02:02 2006
@@ -8,7 +8,7 @@
  * of the specified category.
  *#
 #macro( showRSSLinksForCategory $category )
-    <a href="${ctxPath}/rss/${website.handle}">$text.get("macro.rss.all")</a>
+    <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
/>
     #set( $categories = $pageModel.getWeblogCategories($category) )
     #foreach( $cat in $categories )

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=417895&r1=417894&r2=417895&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 Wed Jun
28 16:02:02 2006
@@ -158,7 +158,7 @@
         #showPrevWeblogLink($npcat) |
     #end
     #if ($pageModel.previousEntry || $pageModel.nextEntry)
-        <a href="${ctxPath}/page/${website.handle}$catLink">$page.name</a>
+        <a href="${website.URL}$catLink">$page.name</a>
     #end
     #if ($pageModel.nextEntry)
         | #showNextWeblogLink($npcat)

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/website.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/website.vm?rev=417895&r1=417894&r2=417895&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/website.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/deprecated/website.vm Wed Jun
28 16:02:02 2006
@@ -65,7 +65,7 @@
  * @param divider        The text to place between each category.
  *#
 #macro( showWeblogSubcategoryChooser2 $parentCategory $divider )
-    #set( $rawUrl = "${ctxPath}/page/${website.handle}" )
+    #set( $rawUrl = "${website.URL}" )
 
     <div class="rWeblogCategoryChooser">
     #set( $weblogUrl = $rawUrl )



Mime
View raw message