View | Details | Raw Unified | Return to bug 13205
Collapse All | Expand All

(-)a/catalogue/search.pl (-2 / +2 lines)
Lines 616-622 for (my $i=0;$i<@servers;$i++) { Link Here
616
            my @page_numbers;
616
            my @page_numbers;
617
            # total number of pages there will be
617
            # total number of pages there will be
618
            my $pages = ceil($hits / $results_per_page);
618
            my $pages = ceil($hits / $results_per_page);
619
            my $last_page = $pages * ( $results_per_page - 1 );
619
            my $last_page_offset = ( $pages -1 ) * $results_per_page;
620
            # default page number
620
            # default page number
621
            my $current_page_number = 1;
621
            my $current_page_number = 1;
622
            $current_page_number = ($offset / $results_per_page + 1) if $offset;
622
            $current_page_number = ($offset / $results_per_page + 1) if $offset;
Lines 667-673 for (my $i=0;$i<@servers;$i++) { Link Here
667
            }
667
            }
668
            # FIXME: no previous_page_offset when pages < 2
668
            # FIXME: no previous_page_offset when pages < 2
669
            $template->param(   PAGE_NUMBERS => \@page_numbers,
669
            $template->param(   PAGE_NUMBERS => \@page_numbers,
670
                                last_page => $last_page,
670
                                last_page_offset => $last_page_offset,
671
                                previous_page_offset => $previous_page_offset) unless $pages < 2;
671
                                previous_page_offset => $previous_page_offset) unless $pages < 2;
672
            $template->param(   next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
672
            $template->param(   next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
673
        }
673
        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc (-1 / +1 lines)
Lines 13-18 Link Here
13
    [% END %]
13
    [% END %]
14
    [% IF ( next_page_offset ) %]
14
    [% IF ( next_page_offset ) %]
15
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Next &gt;&gt;</a></li>
15
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Next &gt;&gt;</a></li>
16
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Last</a></li>
16
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Last</a></li>
17
    [% END %]
17
    [% END %]
18
</ul></nav>[% END %]
18
</ul></nav>[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc (-1 / +1 lines)
Lines 14-20 Link Here
14
            [% END %]
14
            [% END %]
15
            [% IF ( next_page_offset ) %]
15
            [% IF ( next_page_offset ) %]
16
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Next &raquo;</a></li>
16
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% next_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Next &raquo;</a></li>
17
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Last</a></li>
17
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% last_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">Last</a></li>
18
            [% END %]
18
            [% END %]
19
        </ul>
19
        </ul>
20
    </div>
20
    </div>
(-)a/opac/opac-search.pl (-3 / +2 lines)
Lines 838-844 for (my $i=0;$i<@servers;$i++) { Link Here
838
            my @page_numbers;
838
            my @page_numbers;
839
            # total number of pages there will be
839
            # total number of pages there will be
840
            my $pages = ceil($hits / $results_per_page);
840
            my $pages = ceil($hits / $results_per_page);
841
            my $last_page = $pages * ( $results_per_page - 1 );
841
            my $last_page_offset = ( $pages - 1 ) * $results_per_page;
842
            # default page number
842
            # default page number
843
            my $current_page_number = 1;
843
            my $current_page_number = 1;
844
            if ($offset) {
844
            if ($offset) {
Lines 889-895 for (my $i=0;$i<@servers;$i++) { Link Here
889
                        
889
                        
890
            }
890
            }
891
            $template->param(   PAGE_NUMBERS => \@page_numbers,
891
            $template->param(   PAGE_NUMBERS => \@page_numbers,
892
                                last_page => $last_page,
892
                                last_page_offset => $last_page_offset,
893
                                previous_page_offset => $previous_page_offset) unless $pages < 2;
893
                                previous_page_offset => $previous_page_offset) unless $pages < 2;
894
            $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
894
            $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
895
        }
895
        }
896
- 

Return to bug 13205