From a4bad169b7362c39d98087f2e34a295ca607f058 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 6 Jun 2018 14:54:58 +0000 Subject: [PATCH] Bug 6647: Label item search should use standard pagination routine This patch doesn't fix how pagination links are generated for the label item search results, but it does modify the template so that the pagination links are styled like they are on catalog search results. To test, apply the patch and go to Tools -> Labels. - Open or create a label batch. - Click "Add items" to trigger the pop-up search window. - Perform a search which would return multiple results. - Confirm that the style of the pagination bar matches the one on the catalog search results page. - Confirm that current-page number highlighting works correctly. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/modules/labels/result.tt | 53 ++++++++++------------ 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt index 6d130f7..42b76b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -1,3 +1,24 @@ +[% BLOCK pagination %] + +[% END %] [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -9,19 +30,7 @@

Search results

- [% IF ( displayprev || displaynext ) %] -

- [% IF ( displayprev ) %] - << - [% END %] - [% FOREACH number IN numbers %] - [% number.number %] - [% END %] - [% IF ( displaynext ) %] - >> - [% END %] -

- [% END %] + [% PROCESS pagination %] [% IF ( results ) %] Results [% from %] through [% to %] [% IF ( total ) %] of [% total %][% END %] [% ELSE %] @@ -88,24 +97,8 @@
- [% IF ( displayprev || displaynext ) %] -

- [% IF ( displayprev ) %] - << - [% END %] - [% FOREACH number IN numbers %] - [% IF ( number.highlight ) %] - [% number.number %] - [% ELSE %] - [% number.number %] - [% END %] - [% END %] - [% IF ( displaynext ) %] - >> - [% END %] -

+ [% PROCESS pagination %] - [% END %] [% MACRO jsinclude BLOCK %] -- 2.1.4