gitweb: Headers refactoring - use git_header_div for header divs

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 7540e974ba43e7475c031b377ed73a6f205e706fd6ce4cf24aadaa39948e56be..fb7d589e150a00d7bb556d88dfa67e38c243f4313961790ec3895d0379d8c069 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -416,10 +416,53 @@ sub git_page_nav {
                                         : $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$_$arg{$_}")}, "$_")
                                 }
                 @navs);
                                         : $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$_$arg{$_}")}, "$_")
                                 }
                 @navs);

-       print "<br/>$extra<br/>\n" .
+       print "<br/>\n$extra<br/>\n" .

              "</div>\n";
 }
 
              "</div>\n";
 }
 

+sub git_header_div {
+       my ($action, $title, $hash, $hash_base) = @_;
+       my $rest = '';
+
+       $rest .= ";h=$hash" if $hash;
+       $rest .= ";hb=$hash_base" if $hash_base;
+
+       print "<div class=\"header\">\n" .
+             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action$rest"),
+                      -class => "title"}, $title ? $title : $action) . "\n" .
+             "</div>\n";
+}
+
+sub git_get_paging_nav {
+       my ($action, $hash, $head, $page, $nrevs) = @_;
+       my $paging_nav;
+
+
+       if ($hash ne $head || $page) {
+               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action")}, "HEAD");
+       } else {
+               $paging_nav .= "HEAD";
+       }
+
+       if ($page > 0) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page-1)),
+                                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+       } else {
+               $paging_nav .= " &sdot; prev";
+       }
+
+       if ($nrevs >= (100 * ($page+1)-1)) {
+               $paging_nav .= " &sdot; " .
+                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page+1)),
+                                                        -accesskey => "n", -title => "Alt-n"}, "next");
+       } else {
+               $paging_nav .= " &sdot; next";
+       }
+
+       return $paging_nav;
+}
+

 sub git_get_type {
        my $hash = shift;
 
 sub git_get_type {
        my $hash = shift;
 


@@ -1093,9 +1136,7 @@ sub git_summary {
                or die_error(undef, "Open git-rev-list failed.");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
                or die_error(undef, "Open git-rev-list failed.");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog"), -class => "title"}, "shortlog") .
-             "</div>\n";
+       git_header_div('shortlog');

        my $i = 16;
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        my $i = 16;
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;


@@ -1139,9 +1180,7 @@ sub git_summary {
 
        my $taglist = git_read_refs("refs/tags");
        if (defined @$taglist) {
 
        my $taglist = git_read_refs("refs/tags");
        if (defined @$taglist) {

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tags"), -class => "title"}, "tags") .
-                     "</div>\n";
+               git_header_div('tags');

                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;
                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;


@@ -1191,9 +1230,7 @@ sub git_summary {
 
        my $headlist = git_read_refs("refs/heads");
        if (defined @$headlist) {
 
        my $headlist = git_read_refs("refs/heads");
        if (defined @$headlist) {

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=heads"), -class => "title"}, "heads") .
-                     "</div>\n";
+               git_header_div('heads');

                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;
                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;


@@ -1246,9 +1283,7 @@ sub git_tag {
        git_header_html();
        git_page_nav('','', $head,undef,$head);
        my %tag = git_read_tag($hash);
        git_header_html();
        git_page_nav('','', $head,undef,$head);
        my %tag = git_read_tag($hash);

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($tag{'name'})) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($tag{'name'}), $hash);

        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n" .
              "<tr>\n" .
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n" .
              "<tr>\n" .


@@ -1296,9 +1331,7 @@ sub git_blame2 {
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);

-       print "<div>" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);

        git_print_page_path($file_name, $ftype);
        my @rev_color = (qw(light dark));
        my $num_colors = scalar(@rev_color);
        git_print_page_path($file_name, $ftype);
        my @rev_color = (qw(light dark));
        my $num_colors = scalar(@rev_color);


@@ -1352,9 +1385,7 @@ sub git_blame {
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
                " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;f=$file_name")}, "head");
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);

-       print "<div>" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);

        git_print_page_path($file_name);
        print "<div class=\"page_body\">\n";
        print <<HTML;
        git_print_page_path($file_name);
        print "<div class=\"page_body\">\n";
        print <<HTML;


@@ -1430,11 +1461,10 @@ sub git_tags {
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);

-       my $taglist = git_read_refs("refs/tags");
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";
+       git_header_div('summary', $project);

        print "<table cellspacing=\"0\">\n";
        print "<table cellspacing=\"0\">\n";

+
+       my $taglist = git_read_refs("refs/tags");

        my $alternate = 0;
        if (defined @$taglist) {
                foreach my $entry (@$taglist) {
        my $alternate = 0;
        if (defined @$taglist) {
                foreach my $entry (@$taglist) {


@@ -1481,11 +1511,10 @@ sub git_heads {
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);
        my $head = git_read_head($project);
        git_header_html();
        git_page_nav('','', $head,undef,$head);

-       my $taglist = git_read_refs("refs/heads");
-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";
+       hit_header_div('summary', $project);

        print "<table cellspacing=\"0\">\n";
        print "<table cellspacing=\"0\">\n";

+
+       my $taglist = git_read_refs("refs/heads");

        my $alternate = 0;
        if (defined @$taglist) {
                foreach my $entry (@$taglist) {
        my $alternate = 0;
        if (defined @$taglist) {
                foreach my $entry (@$taglist) {


@@ -1654,9 +1683,7 @@ sub git_blob {
                        $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain");
                }
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                        $formats_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain");
                }
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);

-               print "<div>" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
-                     "</div>\n";
+               git_header_div('commit', esc_html($co{'title'}), $hash_base);

        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .
        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .


@@ -1710,9 +1737,7 @@ sub git_tree {
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                $base_key = ";hb=$hash_base";
                git_page_nav('tree','', $hash_base);
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                $base_key = ";hb=$hash_base";
                git_page_nav('tree','', $hash_base);

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
-                     "</div>\n";
+               git_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);

        } else {
                print "<div class=\"page_nav\">\n";
                print "<br/><br/></div>\n";
        } else {
                print "<div class=\"page_nav\">\n";
                print "<br/><br/></div>\n";


@@ -1873,33 +1898,15 @@ sub git_log {
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 

-       my $paging_nav = '';
-       if ($hash ne $head || $page) {
-               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "HEAD");
-       } else {
-               $paging_nav .= "HEAD";
-       }
-       if ($page > 0) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
-       } else {
-               $paging_nav .= " &sdot; prev";
-       }
-       if ($#revlist >= (100 * ($page+1)-1)) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
-       } else {
-               $paging_nav .= " &sdot; next";
-       }
+       my $paging_nav = git_get_paging_nav('log', $hash, $head, $page, $#revlist);

 
        git_header_html();
        git_page_nav('log','', $hash,undef,undef, $paging_nav);
 
        if (!@revlist) {
 
        git_header_html();
        git_page_nav('log','', $hash,undef,undef, $paging_nav);
 
        if (!@revlist) {

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-                     "</div>\n";

                my %co = git_read_commit($hash);
                my %co = git_read_commit($hash);

+
+               git_header_div('summary', $project);

                print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
        }
        for (my $i = ($page * 100); $i <= $#revlist; $i++) {
                print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
        }
        for (my $i = ($page * 100); $i <= $#revlist; $i++) {


@@ -1911,10 +1918,10 @@ sub git_log {
                my %co = git_read_commit($commit);
                next if !%co;
                my %ad = date_str($co{'author_epoch'});
                my %co = git_read_commit($commit);
                next if !%co;
                my %ad = date_str($co{'author_epoch'});

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "title"},
-                     "<span class=\"age\">$co{'age_string'}</span>" . esc_html($co{'title'}) . $ref) . "\n";
-               print "</div>\n";
+               git_header_div('commit',
+                                                                        "<span class=\"age\">$co{'age_string'}</span>" .
+                                                                        esc_html($co{'title'}) . $ref,
+                                                                        $commit);

                print "<div class=\"title_text\">\n" .
                      "<div class=\"log_link\">\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
                print "<div class=\"title_text\">\n" .
                      "<div class=\"log_link\">\n" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .


@@ -1986,13 +1993,9 @@ sub git_commit {
                                                         $formats_nav);
 
        if (defined $co{'parent'}) {
                                                         $formats_nav);
 
        if (defined $co{'parent'}) {

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
-                     "</div>\n";
+               git_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);

        } else {
        } else {

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-                     "</div>\n";
+               git_header_div('tree', esc_html($co{'title'}), $co{'tree'}, $hash);

        }
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n";
        }
        print "<div class=\"title_text\">\n" .
              "<table cellspacing=\"0\">\n";


@@ -2158,9 +2161,7 @@ sub git_blobdiff {
                my $formats_nav =
                        $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                my $formats_nav =
                        $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
                git_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);

-               print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-                     "</div>\n";
+               git_header_div('commit', esc_html($co{'title'}), $hash_base);

        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .
        } else {
                print "<div class=\"page_nav\">\n" .
                      "<br/><br/></div>\n" .


@@ -2212,9 +2213,7 @@ sub git_commitdiff {
        my $formats_nav =
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
        git_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
        my $formats_nav =
                $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain");
        git_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'}) . $ref) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}) . $ref, $hash);

        print "<div class=\"page_body\">\n";
        my $comment = $co{'comment'};
        my $empty = 0;
        print "<div class=\"page_body\">\n";
        my $comment = $co{'comment'};
        my $empty = 0;


@@ -2344,9 +2343,7 @@ sub git_history {
        my $refs = read_info_ref();
        git_header_html();
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base);
        my $refs = read_info_ref();
        git_header_html();
        git_page_nav('','', $hash_base,$co{'tree'},$hash_base);

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-             "</div>\n";
+       git_header_div('commit', esc_html($co{'title'}), $hash_base);

        if (!defined $hash && defined $file_name) {
                $hash = git_get_hash_by_path($hash_base, $file_name);
        }
        if (!defined $hash && defined $file_name) {
                $hash = git_get_hash_by_path($hash_base, $file_name);
        }


@@ -2427,10 +2424,8 @@ sub git_search {
        }
        git_header_html();
        git_page_nav('','', $hash,$co{'tree'},$hash);
        }
        git_header_html();
        git_page_nav('','', $hash,$co{'tree'},$hash);

+       git_header_div('commit', esc_html($co{'title'}), $hash);

 
 

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" .
-             "</div>\n";

        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        if ($commit_search) {
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        if ($commit_search) {


@@ -2553,31 +2548,12 @@ sub git_shortlog {
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
 

-       my $paging_nav = '';
-       if ($hash ne $head || $page) {
-               $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "HEAD");
-       } else {
-               $paging_nav .= "HEAD";
-       }
-       if ($page > 0) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
-       } else {
-               $paging_nav .= " &sdot; prev";
-       }
-       if ($#revlist >= (100 * ($page+1)-1)) {
-               $paging_nav .= " &sdot; " .
-                       $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
-       } else {
-               $paging_nav .= " &sdot; next";
-       }
+       my $paging_nav = git_get_paging_nav('shortlog', $hash, $head, $page, $#revlist);

 
        git_header_html();
        git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);
 
        git_header_html();
        git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);

+       git_header_div('summary', $project);

 
 

-       print "<div>\n" .
-             $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary"), -class => "title"}, "&nbsp;") .
-             "</div>\n";

        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        for (my $i = ($page * 100); $i <= $#revlist; $i++) {
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        for (my $i = ($page * 100); $i <= $#revlist; $i++) {