Got the browse.php navbar working

diff --git a/browse.php b/browse.php
index 45f239d784dcd8fa468e3f0daa82978ef4f56e1a..6b122ede9bf4b8dedc7c970a8db60991c6bf4892 100644 (file)
--- a/browse.php
+++ b/browse.php
@@ -33,19 +33,19 @@ $navbar = $controller->construct_breadcrumb();
 $node = preg_replace('#(^/|/$)#', '', ($viewsvn->paths->relpath == '' ? $viewsvn->paths->path : $viewsvn->paths->relpath));
 $latest = $controller->cachev->fetch_node($node);
 
-$link['log'] = $controller->out('log.php' . $viewsvn->paths->revstr);
+$link['log'] = $controller->href_compound('log.php', null, $controller->revstr);
 
 $show['head'] = ($latest['revision'] != $viewsvn->paths->revnum AND $viewsvn->paths->revnum != 'HEAD');
 if ($show['head'])
 {
-       $link['gohead'] = $controller->out('browse.php' . $viewsvn->paths->fetch_rev_str(false, 'HEAD'));
-       $link['diffhead'] = $controller->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, 'HEAD', $viewsvn->paths->revnum));
+       $link['gohead'] = $controller->href_compound('browse.php', null, Paths::fetch_rev_str(false, 'HEAD'));
+       $link['diffhead'] = $controller->href_compound('diff.php', null, Paths::fetch_rev_str(true, 'HEAD', $controller->revnum));
 }
 
 $show['prev'] = ($prev = $controller->cachev->fetch_prev_revision($viewsvn->paths->relpath, $viewsvn->paths->revnum));
 if ($show['prev'])
 {
-       $link['diffprev'] = $controller->out('diff.php' . $viewsvn->paths->fetch_rev_str(true, $viewsvn->paths->revnum, $prev));
+       $link['diffprev'] = $controller->href_compound('diff.php', null, Paths::fetch_rev_str(true, $controller->revnum, $prev));
 }
 
 // ###################################################################

diff --git a/templates/default/browse.tpl b/templates/default/browse.tpl
index c2c6c0733b39fd346869e5c8775592e58af5fd5b..33c4ab732a190425153731c9a146097aa1a7cd1c 100644 (file)
--- a/templates/default/browse.tpl
+++ b/templates/default/browse.tpl
@@ -20,15 +20,15 @@ $header
        
        <span style="font-weight: normal">
                (
-               <a href="$viewsvn->path/$link[log]">{@"View Log"}</a>
+               <a href="$link[log]">{@"View Log"}</a>
                
                <if condition="$show['head']">
-                       - <a href="$viewsvn->path/$link[gohead]">{@"Go to HEAD"}</a>
-                       - <a href="$viewsvn->path/$link[diffhead]">{@"Diff to HEAD"}</a>
+                       - <a href="$link[gohead]">{@"Go to HEAD"}</a>
+                       - <a href="$link[diffhead]">{@"Diff to HEAD"}</a>
                </if>
                
                <if condition="$show['prev']">
-                       - <a href="$viewsvn->path/$link[diffprev]">{@"Diff to PREV"}</a>
+                       - <a href="$link[diffprev]">{@"Diff to PREV"}</a>
                </if>
                )
        </span>