diff --git a/catalogue/search.pl b/catalogue/search.pl index baeb8b8a0d..05d064bcdc 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -617,7 +617,7 @@ for (my $i=0;$i<@servers;$i++) { my @page_numbers; # total number of pages there will be my $pages = ceil($hits / $results_per_page); - my $last_page = $pages * ( $results_per_page - 1 ); + my $last_page_offset = ( $pages -1 ) * $results_per_page; # default page number my $current_page_number = 1; $current_page_number = ($offset / $results_per_page + 1) if $offset; @@ -668,7 +668,7 @@ for (my $i=0;$i<@servers;$i++) { } # FIXME: no previous_page_offset when pages < 2 $template->param( PAGE_NUMBERS => \@page_numbers, - last_page => $last_page, + last_page_offset => $last_page_offset, previous_page_offset => $previous_page_offset) unless $pages < 2; $template->param( next_page_offset => $next_page_offset) unless $pages eq $current_page_number; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index 4d9e291b85..1c9bd33723 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -13,6 +13,6 @@ [% END %] [% IF ( next_page_offset ) %]
  • Next >>
  • -
  • Last
  • +
  • Last
  • [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc index a3f35da4e4..fbfdfc8124 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc @@ -14,7 +14,7 @@ [% END %] [% IF ( next_page_offset ) %]
  • Next »
  • -
  • Last
  • +
  • Last
  • [% END %] diff --git a/opac/opac-search.pl b/opac/opac-search.pl index d9c4505fd7..133b671bdf 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -839,7 +839,7 @@ for (my $i=0;$i<@servers;$i++) { my @page_numbers; # total number of pages there will be my $pages = ceil($hits / $results_per_page); - my $last_page = $pages * ( $results_per_page - 1 ); + my $last_page_offset = ( $pages - 1 ) * $results_per_page; # default page number my $current_page_number = 1; if ($offset) { @@ -890,7 +890,7 @@ for (my $i=0;$i<@servers;$i++) { } $template->param( PAGE_NUMBERS => \@page_numbers, - last_page => $last_page, + last_page_offset => $last_page_offset, previous_page_offset => $previous_page_offset) unless $pages < 2; $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number; }