@matheusbsbs / matheus-bagliano / commits / 43ffc06d98
Fork 0

gitweb: Pager refactoring - use git_get_paging_nav for pagination

Add git_get_paging_nav subroutine which returns string with pager (paging nav) for shortlog and log actions. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Jul 30, 2006 at 17:49 UTC 43ffc06d98e944670b71869ba7126003597a2fa0
1 file changed +32 -36
gitweb/gitweb.cgi
+32 -36
@@ -420,6 +420,36 @@ sub git_page_nav {
420 "</div>\n";
421 }
422
423 +sub git_get_paging_nav {
424 + my ($project, $action, $hash, $head, $page, $nrevs) = @_;
425 + my $paging_nav;
426 +
427 +
428 + if ($hash ne $head || $page) {
429 + $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action")}, "HEAD");
430 + } else {
431 + $paging_nav .= "HEAD";
432 + }
433 +
434 + if ($page > 0) {
435 + $paging_nav .= " &sdot; " .
436 + $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page-1)),
437 + -accesskey => "p", -title => "Alt-p"}, "prev");
438 + } else {
439 + $paging_nav .= " &sdot; prev";
440 + }
441 +
442 + if ($nrevs >= (100 * ($page+1)-1)) {
443 + $paging_nav .= " &sdot; " .
444 + $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=$action;h=$hash;pg=" . ($page+1)),
445 + -accesskey => "n", -title => "Alt-n"}, "next");
446 + } else {
447 + $paging_nav .= " &sdot; next";
448 + }
449 +
450 + return $paging_nav;
451 +}
452 +
453 sub git_get_type {
454 my $hash = shift;
455
@@ -1873,24 +1903,7 @@ sub git_log {
1903 my @revlist = map { chomp; $_ } <$fd>;
1904 close $fd;
1905
1876 - my $paging_nav = '';
1877 - if ($hash ne $head || $page) {
1878 - $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "HEAD");
1879 - } else {
1880 - $paging_nav .= "HEAD";
1881 - }
1882 - if ($page > 0) {
1883 - $paging_nav .= " &sdot; " .
1884 - $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
1885 - } else {
1886 - $paging_nav .= " &sdot; prev";
1887 - }
1888 - if ($#revlist >= (100 * ($page+1)-1)) {
1889 - $paging_nav .= " &sdot; " .
1890 - $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
1891 - } else {
1892 - $paging_nav .= " &sdot; next";
1893 - }
1906 + my $paging_nav = git_get_paging_nav($project, 'log', $hash, $head, $page, $#revlist);
1907
1908 git_header_html();
1909 git_page_nav('log','', $hash,undef,undef, $paging_nav);
@@ -2553,24 +2566,7 @@ sub git_shortlog {
2566 my @revlist = map { chomp; $_ } <$fd>;
2567 close $fd;
2568
2556 - my $paging_nav = '';
2557 - if ($hash ne $head || $page) {
2558 - $paging_nav .= $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "HEAD");
2559 - } else {
2560 - $paging_nav .= "HEAD";
2561 - }
2562 - if ($page > 0) {
2563 - $paging_nav .= " &sdot; " .
2564 - $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev");
2565 - } else {
2566 - $paging_nav .= " &sdot; prev";
2567 - }
2568 - if ($#revlist >= (100 * ($page+1)-1)) {
2569 - $paging_nav .= " &sdot; " .
2570 - $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next");
2571 - } else {
2572 - $paging_nav .= " &sdot; next";
2573 - }
2569 + my $paging_nav = git_get_paging_nav($project, 'shortlog', $hash, $head, $page, $#revlist);
2570
2571 git_header_html();
2572 git_page_nav('shortlog','', $hash,$hash,$hash, $paging_nav);