@matheusbsbs / matheus-bagliano / commits / 7afd77bfc1
Fork 0

gitweb: Use href(-replay=>1, page=>...) to generate pagination links

Use href(-replay=>1, page=>$page-1) and href(-replay=>1, page=>$page+1) to generate previous page and next page links. Generate next page link only once. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jakub Narebski committed Nov 1, 2007 at 13:06 UTC 7afd77bfc1b6881fd9e476274d3f08b793c292ed
1 file changed +15 -29
gitweb/gitweb.perl
+15 -29
@@ -2518,7 +2518,7 @@ sub format_paging_nav {
2518
2519 if ($page > 0) {
2520 $paging_nav .= " &sdot; " .
2521 - $cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page-1),
2521 + $cgi->a({-href => href(-replay=>1, page=>$page-1),
2522 -accesskey => "p", -title => "Alt-p"}, "prev");
2523 } else {
2524 $paging_nav .= " &sdot; prev";
@@ -2526,7 +2526,7 @@ sub format_paging_nav {
2526
2527 if ($nrevs >= (100 * ($page+1)-1)) {
2528 $paging_nav .= " &sdot; " .
2529 - $cgi->a({-href => href(action=>$action, hash=>$hash, page=>$page+1),
2529 + $cgi->a({-href => href(-replay=>1, page=>$page+1),
2530 -accesskey => "n", -title => "Alt-n"}, "next");
2531 } else {
2532 $paging_nav .= " &sdot; next";
@@ -4448,7 +4448,7 @@ sub git_log {
4448 }
4449 if ($#commitlist >= 100) {
4450 print "<div class=\"page_nav\">\n";
4451 - print $cgi->a({-href => href(action=>"log", hash=>$hash, page=>$page+1),
4451 + print $cgi->a({-href => href(-replay=>1, page=>$page+1),
4452 -accesskey => "n", -title => "Alt-n"}, "next");
4453 print "</div>\n";
4454 }
@@ -5015,27 +5015,20 @@ sub git_history {
5015 file_name=>$file_name)},
5016 "first");
5017 $paging_nav .= " &sdot; " .
5018 - $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
5019 - file_name=>$file_name, page=>$page-1),
5018 + $cgi->a({-href => href(-replay=>1, page=>$page-1),
5019 -accesskey => "p", -title => "Alt-p"}, "prev");
5020 } else {
5021 $paging_nav .= "first";
5022 $paging_nav .= " &sdot; prev";
5023 }
5025 - if ($#commitlist >= 100) {
5026 - $paging_nav .= " &sdot; " .
5027 - $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
5028 - file_name=>$file_name, page=>$page+1),
5029 - -accesskey => "n", -title => "Alt-n"}, "next");
5030 - } else {
5031 - $paging_nav .= " &sdot; next";
5032 - }
5024 my $next_link = '';
5025 if ($#commitlist >= 100) {
5026 $next_link =
5036 - $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base,
5037 - file_name=>$file_name, page=>$page+1),
5027 + $cgi->a({-href => href(-replay=>1, page=>$page+1),
5028 -accesskey => "n", -title => "Alt-n"}, "next");
5029 + $paging_nav .= " &sdot; $next_link";
5030 + } else {
5031 + $paging_nav .= " &sdot; next";
5032 }
5033
5034 git_header_html();
@@ -5105,30 +5098,23 @@ sub git_search {
5098 searchtext=>$searchtext, searchtype=>$searchtype)},
5099 "first");
5100 $paging_nav .= " &sdot; " .
5108 - $cgi->a({-href => href(action=>"search", hash=>$hash,
5109 - searchtext=>$searchtext, searchtype=>$searchtype,
5110 - page=>$page-1),
5101 + $cgi->a({-href => href(-replay=>1, page=>$page-1),
5102 -accesskey => "p", -title => "Alt-p"}, "prev");
5103 } else {
5104 $paging_nav .= "first";
5105 $paging_nav .= " &sdot; prev";
5106 }
5107 + my $next_link = '';
5108 if ($#commitlist >= 100) {
5117 - $paging_nav .= " &sdot; " .
5118 - $cgi->a({-href => href(action=>"search", hash=>$hash,
5119 - searchtext=>$searchtext, searchtype=>$searchtype,
5120 - page=>$page+1),
5109 + $next_link =
5110 + $cgi->a({-href => href(-replay=>1, page=>$page+1),
5111 -accesskey => "n", -title => "Alt-n"}, "next");
5112 + $paging_nav .= " &sdot; $next_link";
5113 } else {
5114 $paging_nav .= " &sdot; next";
5115 }
5125 - my $next_link = '';
5116 +
5117 if ($#commitlist >= 100) {
5127 - $next_link =
5128 - $cgi->a({-href => href(action=>"search", hash=>$hash,
5129 - searchtext=>$searchtext, searchtype=>$searchtype,
5130 - page=>$page+1),
5131 - -accesskey => "n", -title => "Alt-n"}, "next");
5118 }
5119
5120 git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
@@ -5327,7 +5313,7 @@ sub git_shortlog {
5313 my $next_link = '';
5314 if ($#commitlist >= 100) {
5315 $next_link =
5330 - $cgi->a({-href => href(action=>"shortlog", hash=>$hash, page=>$page+1),
5316 + $cgi->a({-href => href(-replay=>1, page=>$page+1),
5317 -accesskey => "n", -title => "Alt-n"}, "next");
5318 }
5319