svn commit: r1078676 - /trafficserver/site/branches/ats-cms/lib/view.pm

[am...@apache.org]

Author: amc
Date: Mon Mar  7 04:26:20 2011
New Revision: 1078676

URL: http://svn.apache.org/viewvc?rev=1078676&view=rev
Log:
Fixed nav bar problem.

Modified:
    trafficserver/site/branches/ats-cms/lib/view.pm

Modified: trafficserver/site/branches/ats-cms/lib/view.pm
URL: http://svn.apache.org/viewvc/trafficserver/site/branches/ats-cms/lib/view.pm?rev=1078676&r1=1078675&r2=1078676&view=diff
==============================================================================
--- trafficserver/site/branches/ats-cms/lib/view.pm (original)
+++ trafficserver/site/branches/ats-cms/lib/view.pm Mon Mar  7 04:26:20 2011
@@ -281,15 +281,20 @@ sub nav {
     if ($idx >= 0) {
 	$nav{display} = 1; # make it visible.
 	# Look for the top directory.
-	my $top_prefix = $prefix;
+	# This is the file name. If we popped up to find the ordering,
+	# make that adjustment. Then add another parent directory until
+	# we find the top file marker.
+	my $top_url = 'index.' . $lang . '.html';
+	$top_url = File::Spec->catfile($prefix, $top_url) if $prefix;
 	while (@dirs) {
 	    pop @dirs;
 	    my $pdir = File::Spec->catfile(@dirs);
 	    my $top_mark = File::Spec->catfile($pdir, TOP_MARKER_FILE);
 	    last if (-r $top_mark);
-	    $top_prefix = File::Spec->catdir('..', $top_prefix);
+	    $top_url = File::Spec->catfil('..', $top_url);
 	}
-	$nav{top_url} = File::Spec->catfile($top_prefix, 'index.' . $lang . '.html');
+	$nav{top_url} = $top_url;
+
 	if ($idx > 0) {
 	    $nav{prev_url} = targetfinder($dirs,$prefix,$order[$idx-1],$lang);
 	}