svn commit: r424412 - /incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm

[sn...@apache.org]

Author: snoopdave
Date: Fri Jul 21 11:35:55 2006
New Revision: 424412

URL: http://svn.apache.org/viewvc?rev=424412&view=rev
Log:
Fixing a couple of lingering URL related bugs

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=424412&r1=424411&r2=424412&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 Fri Jul 21 11:35:55 2006
@@ -97,7 +97,7 @@
 Include Javascript code needed for standard macros, for use in HTML head.
 *#
 #macro(showCommonJavascript)
-<script type="text/javascript" src="$config.getContextURL()/theme/scripts/roller.js"></script>
+<script type="text/javascript" src="$url.site/theme/scripts/roller.js"></script>
 #end
 
 
@@ -222,7 +222,7 @@
         <span class="status">$model.statusMessage</span>
     #end
 
-    <form method="post" action="$config.getContextURL()/roller-ui/rendering/comment/$entry.website.handle/entry/$entry.anchor" 
+    <form method="post" action="$url.site/roller-ui/rendering/comment/$entry.website.handle/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" />
@@ -266,7 +266,7 @@
                 </span>
             </li>
             <li class="info">
-               <script type="text/javascript" src="$config.getContextURL()/theme/scripts/clientSideInclude.js"></script>
+               <script type="text/javascript" src="$url.site/theme/scripts/clientSideInclude.js"></script>
                <div id="commentAuthenticator"></div>
             </li>
             <li>
@@ -278,9 +278,9 @@
 
     </form>
 
-    <script type="text/javascript" src="$config.getContextURL()/theme/scripts/roller.js"></script>
+    <script type="text/javascript" src="$url.site/theme/scripts/roller.js"></script>
     <script type="text/javascript">
-    clientSideInclude('commentAuthenticator', '$config.getContextURL()/CommentAuthenticatorServlet');
+    clientSideInclude('commentAuthenticator', '$url.site)/CommentAuthenticatorServlet');
 
     var author = getCookie("commentAuthor");
     var email = getCookie("commentEmail");
@@ -383,7 +383,7 @@
         #else
             #if($utils.isNotEmpty( $bookmark.FeedUrl))
             <a href="$bookmark.feedUrl"><img class="smrssbadge"
-               src="$config.getAbsoluteContextURL()/images/smrssbadge.gif"
+               src="$url.absoluteSite/images/smrssbadge.gif"
                alt="$text.get("macro.bookmark.urlFeed")"/></a>
             #end
             <a href="$bookmark.url"
@@ -491,7 +491,7 @@
 #macro(showPageMenu $weblog)
     <ul class="rNavigationBar">
         <li class="rNavItem">
-            <a href="$config.getContextURL()">$config.getProperty("site.shortName")</a>
+            <a href="$url.site">$config.getProperty("site.shortName")</a>
         </li>
         #foreach($iPage in $weblog.pages)
             #set($invisible = $iPage.Name.startsWith("_"))
@@ -609,7 +609,7 @@
         $text.get( "macro.weblog.searchgoogle", [$searchResults.term, $absBaseURL, $ctxPath, ${website.handle}] )
     </div>
     <!-- searchhi script hangs firefox, commenting it out for now -->
-    <!-- script type="text/javascript" src="$config.getContextURL()/theme/scripts/searchhi.js"></script -->
+    <!-- script type="text/javascript" src="$url.site/theme/scripts/searchhi.js"></script -->
 #end