From bugzilla-daemon@bugs.koha-community.org Fri Mar 17 06:38:44 2017
From: bugzilla-daemon@bugs.koha-community.org
To: koha-bugs@lists.koha-community.org
Subject:
 [Koha-bugs] [Bug 13205] Last/First page options for result list	paging
Date: Fri, 17 Mar 2017 05:38:31 +0000
Message-ID: <bug-13205-70-vurd6CNO3H@https.bugs.koha-community.org/bugzilla3/>
In-Reply-To: <bug-13205-70@https.bugs.koha-community.org/bugzilla3/>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8585798858721532614=="

--===============8585798858721532614==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D13205

--- Comment #6 from dilan@calyx.net.au ---
Comment on attachment 61194
  --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3D61194
Bug 13205: Last/first page options for result list paging for OPAC

>From bd80eca290f389e8e12d63dd220ec639763adcbb Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Thu, 16 Feb 2017 02:28:13 +0000
>Subject: [PATCH] Bug 13205: Last/first page options for result list paging f=
or
> OPAC
>
>Same fix but on OPAC side. Same test plan
>
>Sponsored-by: Catalyst IT
>
>Signed-off-by: Dilan Johnpulle <dilan@calyx.net.au>
>
>---
> .../bootstrap/en/includes/page-numbers.inc         | 26 ++++++++++++-------=
---
> opac/opac-search.pl                                |  2 ++
> 2 files changed, 16 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/ko=
ha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>index f18c9ce..63e083e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
>@@ -1,19 +1,21 @@
> [% IF ( PAGE_NUMBERS ) %]
>     <div class=3D"pagination pagination-small noprint">
>         <ul>
>-        [% IF ( previous_page_offset.defined ) %]
>-            <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |html =
%][% limit_cgi |html %]&amp;offset=3D[% previous_page_offset %][% IF ( sort_b=
y ) %]&amp;sort_by=3D[% sort_by |html %][% END %]">&laquo; Previous</a></li>
>-        [% END %]
>-        [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
>-            [% IF ( PAGE_NUMBER.highlight ) %]
>-                <li class=3D"active"><a href=3D"#">[% PAGE_NUMBER.pg %]</a>=
</li>
>-            [% ELSE %]
>-                <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |h=
tml %][% limit_cgi |html %]&amp;offset=3D[% PAGE_NUMBER.offset %][% IF ( sort=
_by ) %]&amp;sort_by=3D[% sort_by |html%][% END %]">[% PAGE_NUMBER.pg %]</a><=
/li>
>+            <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |html =
%][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=3D[% sort_by |html %]=
[% END %]">First</a></li>
>+            [% IF ( previous_page_offset.defined ) %]
>+                <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |h=
tml %][% limit_cgi |html %]&amp;offset=3D[% previous_page_offset %][% IF ( so=
rt_by ) %]&amp;sort_by=3D[% sort_by |html %][% END %]">&laquo; Previous</a></=
li>
>             [% END %]
>-        [% END %]
>-        [% IF ( next_page_offset ) %]
>-            <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |html =
%][% limit_cgi |html %]&amp;offset=3D[% next_page_offset %][% IF ( sort_by ) =
%]&amp;sort_by=3D[% sort_by |html %][% END %]">Next &raquo;</a></li>
>-        [% END %]
>+            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
>+                [% IF ( PAGE_NUMBER.highlight ) %]
>+                    <li class=3D"active"><a href=3D"#">[% PAGE_NUMBER.pg %]=
</a></li>
>+                [% ELSE %]
>+                    <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cg=
i |html %][% limit_cgi |html %]&amp;offset=3D[% PAGE_NUMBER.offset %][% IF ( =
sort_by ) %]&amp;sort_by=3D[% sort_by |html%][% END %]">[% PAGE_NUMBER.pg %]<=
/a></li>
>+                [% END %]
>+            [% END %]
>+            [% IF ( next_page_offset ) %]
>+                <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |h=
tml %][% limit_cgi |html %]&amp;offset=3D[% next_page_offset %][% IF ( sort_b=
y ) %]&amp;sort_by=3D[% sort_by |html %][% END %]">Next &raquo;</a></li>
>+            [% END %]
>+            <li><a href=3D"/cgi-bin/koha/opac-search.pl?[% query_cgi |html =
%][% limit_cgi |html %]&amp;offset=3D[% last_page %][% IF ( sort_by ) %]&amp;=
sort_by=3D[% sort_by |html %][% END %]">Last</a></li>
>         </ul>
>     </div>
> [% END %]
>diff --git a/opac/opac-search.pl b/opac/opac-search.pl
>index a84e9d3..130aad3 100755
>--- a/opac/opac-search.pl
>+++ b/opac/opac-search.pl
>@@ -837,6 +837,7 @@ for (my $i=3D0;$i<@servers;$i++) {
>             my @page_numbers;
>             # total number of pages there will be
>             my $pages =3D ceil($hits / $results_per_page);
>+            my $last_page =3D ($pages * $results_per_page) - $results_per_p=
age;
>             # default page number
>             my $current_page_number =3D 1;
>             if ($offset) {
>@@ -887,6 +888,7 @@ for (my $i=3D0;$i<@servers;$i++) {
>                        =20
>             }
>             $template->param(   PAGE_NUMBERS =3D> \@page_numbers,
>+                                last_page =3D> $last_page,
>                                 previous_page_offset =3D> $previous_page_of=
fset) unless $pages < 2;
>             $template->param(next_page_offset =3D> $next_page_offset) unles=
s $pages eq $current_page_number;
>         }
>--=20
>2.1.4

--=20
You are receiving this mail because:
You are watching all bug changes.

--===============8585798858721532614==--