gitweb: place links to parent directories in page header

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index a1bf9f5e3f8a8773c721c6caa9b6c393d9239b4a31a9cf76858e692f8795e4eb..4e364ac03ac7e7b2761cc1ea938a93c55d24567320ff5bbdf8393be5a39e2412 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3842,12 +3842,27 @@ sub print_header_links {
        }
 }
 
        }
 }
 

+sub print_nav_breadcrumbs_path {
+       my $dirprefix = undef;
+       while (my $part = shift) {
+               $dirprefix .= "/" if defined $dirprefix;
+               $dirprefix .= $part;
+               print $cgi->a({-href => href(project => undef,
+                                            project_filter => $dirprefix,
+                                            action => "project_list")},
+                             esc_html($part)) . " / ";
+       }
+}
+

 sub print_nav_breadcrumbs {
        my %opts = @_;
 
        print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
        if (defined $project) {
 sub print_nav_breadcrumbs {
        my %opts = @_;
 
        print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
        if (defined $project) {

-               print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
+               my @dirname = split '/', $project;
+               my $projectbasename = pop @dirname;
+               print_nav_breadcrumbs_path(@dirname);
+               print $cgi->a({-href => href(action=>"summary")}, esc_html($projectbasename));

                if (defined $action) {
                        my $action_print = $action ;
                        if (defined $opts{-action_extra}) {
                if (defined $action) {
                        my $action_print = $action ;
                        if (defined $opts{-action_extra}) {


@@ -3860,6 +3875,8 @@ sub print_nav_breadcrumbs {
                        print " / $opts{-action_extra}";
                }
                print "\n";
                        print " / $opts{-action_extra}";
                }
                print "\n";

+       } elsif (defined $project_filter) {
+               print_nav_breadcrumbs_path(split '/', $project_filter);

        }
 }
 
        }
 }
 


@@ -3982,9 +3999,11 @@ sub git_footer_html {
                }
 
        } else {
                }
 
        } else {

-               print $cgi->a({-href => href(project=>undef, action=>"opml"),
+               print $cgi->a({-href => href(project=>undef, action=>"opml",
+                                            project_filter => $project_filter),

                              -class => $feed_class}, "OPML") . " ";
                              -class => $feed_class}, "OPML") . " ";

-               print $cgi->a({-href => href(project=>undef, action=>"project_index"),
+               print $cgi->a({-href => href(project=>undef, action=>"project_index",
+                                            project_filter => $project_filter),

                              -class => $feed_class}, "TXT") . "\n";
        }
        print "</div>\n"; # class="page_footer"
                              -class => $feed_class}, "TXT") . "\n";
        }
        print "</div>\n"; # class="page_footer"