From 35fb1fe67cef029201eef6fd53c2d0e4af82195c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 <maryse.simard@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../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 c02a2170d3..0efee7d470 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 %]
+    <nav>
+        [% IF ( displayprev || displaynext ) %]
+            <ul class="pagination">
+                [% IF ( displayprev ) %]
+                    <li><a class="nav" href="label-item-search.pl?startfrom=[% startfromprev %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]"><i class="fa fa-arrow-left"></i> Previous</a></li>
+                [% END %]
+                [% FOREACH number IN numbers %]
+                    [% IF ( startfrom == number.startfrom ) %]
+                        <li class="active"><span>[% number.number %]</span></a></li>
+                    [% ELSE %]
+                        <li><a class="nav" href="label-item-search.pl?startfrom=[% number.startfrom %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">[% number.number %]</a></li>
+                    [% END %]
+                [% END %]
+                [% IF ( displaynext ) %]
+                    <li><a class="nav" href="label-item-search.pl?startfrom=[% startfromnext %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">Next <i class="fa fa-arrow-right"></i></a></li>
+                [% END %]
+            </ul>
+        [% END %]
+    </nav>
+[% END %]
 [% USE Asset %]
     [% INCLUDE 'doc-head-open.inc' %]
     <title>Koha &rsaquo; Barcodes and labels &rsaquo; Search results</title>
@@ -53,19 +74,7 @@
         <div id="bd">
             <h1>Search results</h1>
         <div class="results">
-                [% IF ( displayprev || displaynext ) %]
-            <p>
-                    [% IF ( displayprev ) %]
-                    <a href="label-item-search.pl?startfrom=[% startfromprev %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">&lt;&lt;</a>
-                    [% END %]
-                    [% FOREACH number IN numbers %]
-                    <a href="label-item-search.pl?startfrom=[% number.startfrom %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">[% number.number %]</a>
-                    [% END %]
-                    [% IF ( displaynext ) %]
-                    <a href="label-item-search.pl?startfrom=[% startfromnext %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">&gt;&gt;</a>
-                    [% END %]
-        </p>
-                [% END %]
+            [% PROCESS pagination %]
                 [% IF ( results ) %]
                 <strong>Results [% from %] through [% to %] [% IF ( total ) %] of [% total %][% END %]</strong>
                 [% ELSE %]
@@ -132,23 +141,7 @@ z                                    [% END -%]
                 </div>
             </form>
         </div>
-        [% IF ( displayprev || displaynext ) %]
-            <p>
-                [% IF ( displayprev ) %]
-                <a href="label-item-search.pl?startfrom=[% startfromnext %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">&lt;&lt;</a>
-                [% END %]
-                [% FOREACH number IN numbers %]
-                [% IF ( number.highlight ) %]
-                <span class="current">[% number.number %]</span>
-                [% ELSE %]
-                <a href="label-item-search.pl?startfrom=[% number.startfrom %]&amp;ccl_query=[% number.ccl_query %]&amp;resultsperpage=[% number.resultsperpage %]&amp;op=do_search&amp;batch_id=[% number.batch_id %]">[% number.number %]</a>
-                [% END %]
-        [% END %]
-                [% IF ( displaynext ) %]
-                <a href="label-item-search.pl?startfrom=[% startfromnext %]&amp;ccl_query=[% ccl_query %]&amp;resultsperpage=[% resultsperpage %]&amp;op=do_search&amp;batch_id=[% batch_id %]">&gt;&gt;</a>
-                [% END %]
-        </p>
+        [% PROCESS pagination %]
         <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
-            [% END %]
     </div>
     [% INCLUDE 'popup-bottom.inc' %]
-- 
2.39.5