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

(-)a/catalogue/search.pl (-1 / +1 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) - $results_per_page;
619
            my $last_page = $pages * ( $results_per_page - 1 );
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;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc (-5 / +9 lines)
Lines 1-7 Link Here
1
[% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
1
[% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
2
    <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">First</a></li>
2
    [% IF ( previous_page_offset.defined ) %]
3
    <!-- Row of numbers corresponding to search result pages -->
3
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">First</a></li>
4
    [% IF ( previous_page_offset.defined ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">&lt;&lt; Previous</a></li>[% END %]
4
        <!-- Row of numbers corresponding to search result pages -->
5
        <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">&lt;&lt; Previous</a></li>
6
    [% END %]
5
    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
7
    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
6
        [% IF ( PAGE_NUMBER.highlight ) %]
8
        [% IF ( PAGE_NUMBER.highlight ) %]
7
            <li class="active"><span>[% PAGE_NUMBER.pg %]</span></li>
9
            <li class="active"><span>[% PAGE_NUMBER.pg %]</span></li>
Lines 9-14 Link Here
9
            <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a></li>
11
            <li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a></li>
10
        [% END %]
12
        [% END %]
11
    [% END %]
13
    [% END %]
12
    [% IF ( next_page_offset ) %]<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>[% END %]
14
    [% IF ( next_page_offset ) %]
13
    <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>
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>
17
    [% END %]
14
</ul></nav>[% END %]
18
</ul></nav>[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc (-2 / +2 lines)
Lines 1-8 Link Here
1
[% IF ( PAGE_NUMBERS ) %]
1
[% IF ( PAGE_NUMBERS ) %]
2
    <div class="pagination pagination-small noprint">
2
    <div class="pagination pagination-small noprint">
3
        <ul>
3
        <ul>
4
            <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">First</a></li>
5
            [% IF ( previous_page_offset.defined ) %]
4
            [% IF ( previous_page_offset.defined ) %]
5
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">First</a></li>
6
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">&laquo; Previous</a></li>
6
                <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;offset=[% previous_page_offset %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]">&laquo; Previous</a></li>
7
            [% END %]
7
            [% END %]
8
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
8
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
Lines 14-21 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
            [% END %]
18
            [% END %]
18
            <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>
19
        </ul>
19
        </ul>
20
    </div>
20
    </div>
21
[% END %]
21
[% END %]
(-)a/opac/opac-search.pl (-2 / +1 lines)
Lines 837-843 for (my $i=0;$i<@servers;$i++) { Link Here
837
            my @page_numbers;
837
            my @page_numbers;
838
            # total number of pages there will be
838
            # total number of pages there will be
839
            my $pages = ceil($hits / $results_per_page);
839
            my $pages = ceil($hits / $results_per_page);
840
            my $last_page = ($pages * $results_per_page) - $results_per_page;
840
            my $last_page = $pages * ( $results_per_page - 1 );
841
            # default page number
841
            # default page number
842
            my $current_page_number = 1;
842
            my $current_page_number = 1;
843
            if ($offset) {
843
            if ($offset) {
844
- 

Return to bug 13205