Fix the nav bars to make more sense for source pages

diff --git a/templates/html/index.tmpl b/templates/html/index.tmpl
index 898529411eefae1dbd9e222a15d401c6a3f646cb..dc44e990bda208c581c6dd076862f88925f03063 100644 (file)
--- a/templates/html/index.tmpl
+++ b/templates/html/index.tmpl
@@ -2,13 +2,17 @@
 [% pkg_type = is_source ? 'Source' : 'Software';
    title_common = category ? "$pkg_type Packages in \"$suite\", $category.id $category.name"
        : "$pkg_type Packages in \"$suite\"";
+
+   nav_arr = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/','','suite',suite), name=>suite } ];
    IF category;
-       navigation_pre = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>"../", name=>suite },
-                          { prefix=>"$category.id:", name=>category.name } ];
+       nav_last = { prefix=>"$category.id:", name=>category.name };
    ELSE;
-       navigation_pre = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>"index", name=>suite },
-                          { name=>'All Packages' } ];
+       nav_last = { name=>'All Packages' };
    END
+   nav_arr.push( { name=>'Source',
+                  url=>make_url('/','','suite',suite,'source',source) } )
+       IF source;
+   nav_arr.push( nav_last );
 %]
 [% PROCESS 'html/head.tmpl' 
        title_tag = title_common

diff --git a/templates/html/suite_index.tmpl b/templates/html/suite_index.tmpl
index ed4f901040065eeeb227c89033a7967b70e368cd..92b7d97a590f2dd1e456140edc9817a12b2c544f 100644 (file)
--- a/templates/html/suite_index.tmpl
+++ b/templates/html/suite_index.tmpl
@@ -1,10 +1,23 @@
-[% PROCESS 'html/head.tmpl' 
+[% nav_arr = [ { name=> suite, url=>make_url('/','','suite',suite) } ];
+   nav_arr.push( { name => 'Source' } ) IF source;
+   nav_arr.push( { name => 'Index' } );
+   PROCESS 'html/head.tmpl' 
        title_tag = "List of sections in \"$suite\""
-       page_title = "List of sections in \"$suite\""
        keywords = suite
-       navigation = [ { name=> suite },
-                      { name => 'Index' }, ]
+       navigation = nav_arr
 %]
+[% PROCESS 'html/menu.inc' %]
+[% FOREACH s IN suites %]
+   [% '<div id="pothers">' IF loop.first %]
+   [%- IF s == suite -%]
+     [% PROCESS menuitem name=s url='' %]
+   [%- ELSE -%]
+     [% PROCESS menuitem name=s url=make_url('/','','suite',s,'source',source) %]
+   [%- END -%]
+   [%- '</div>' IF loop.last -%]
+[% END %]
+
+<h1>List of sections in "[% suite %]"</h1>
 
 [% FOREACH subsections %]
   [% '<div id="lefthalfcol"><dl>' IF loop.first %]
@@ -23,6 +36,6 @@
 [% END %]
 
 <p class="psmallcenter">
-       <a href="allpackages" title="List of all packages">All packages</a><br>
+       <a href="allpackages" title="List of all [% "source " IF source %]packages">All [% "source " IF source %]packages</a><br>
        (<a href="allpackages?format=txt.gz">compact compressed textlist</a>)
 </p>