Attachment 90515 Details for Bug 23094 – Bug 23094: Use Bootstrap-style pagination on staged MARC records page

[patch] Bug 23094: Use Bootstrap-style pagination on staged MARC records page

Bug-23094-Use-Bootstrap-style-pagination-on-staged.patch (text/plain), 4.05 KB, created by Owen Leonard on 2019-06-11 18:35:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-06-11 18:35:42 UTC

Size: 4.05 KB

patch

obsolete

>From 523f1a11906c67e1131781945efec7cfe78eabb6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 20 May 2019 12:14:08 +0000
>Subject: [PATCH] Bug 23094: Use Bootstrap-style pagination on staged MARC
> records page
>
>This patch makes markup and CSS changes in order to make the pagination
>links on the staged MARC records page consistent with the links on the
>catalog search results page.
>
>The patch also adds Font Awesome icons to the catalog search results
>pagination include, replacing angle bracket symbols.
>
>To test, apply the patch and rebuild the staff client CSS.
>(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
>To test properly you should have enough staged marc record batches that
>there are multiple pages to list.
>
>Go to Tools -> Manage staged MARC records. Test that the pagination
>links look consistent with the catalog search results page and that they
>work correctly.
>---
> .../prog/en/modules/tools/manage-marc-import.tt    | 56 ++++++++++++++--------
> 1 file changed, 35 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index e384b13..0e62583 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -259,17 +259,11 @@
> <br style="clear:both;" />
> 
> [% IF ( batch_list ) %]
>-  [% IF ( pages ) %]
>-<div class="pages">
>-    [% FOREACH page IN pages %]
>-      [% IF ( page.current_page ) %]
>-      <span class="current">[% page.page_number | html %]</span>
>-      [% ELSE %]
>-      <a href="[% page.script_name | url %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>-      [% END %]
>-    [% END %]
>-</div>
>-  [% END %]
>+
>+[% IF ( pages ) %]
>+    [% PROCESS pagination %]
>+[% END %]
>+
> <table>
>   <tr>
>     <th>#</th>
>@@ -326,17 +320,9 @@
>   </tr>
>   [% END %]
> </table>
>-  [% IF ( pages ) %]
>-<div class="pages">
>-    [% FOREACH page IN pages %]
>-      [% IF ( page.current_page ) %]
>-      <span class="current">[% page.page_number | html %]</span>
>-      [% ELSE %]
>-      <a href="[% page.script_name | url %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>-      [% END %]
>+    [% IF ( pages ) %]
>+        [% PROCESS pagination %]
>     [% END %]
>-</div>
>-  [% END %]
> [% END %]
> 
> [% IF import_batch_id %]
>@@ -511,3 +497,31 @@
> [% END %]
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>+[% BLOCK pagination %]
>+    <nav>
>+        <ul class="pagination">
>+            [% FOREACH page IN pages %]
>+                [% IF ( page.current_page && page.page_number > 1 ) %]
>+                    <li><a href="[% page.script_name | url %]?offset=0" class="nav"><i class="fa fa-fw fa-angle-double-left"></i> First</a></li>
>+                    <li><a href="[% page.script_name | url %]?offset=[% offset - results_per_page | uri %]"><i class="fa fa-fw fa-angle-left"></i> Previous</a></li>
>+                [% END %]
>+            [% END %]
>+            [% FOREACH page IN pages %]
>+                [% IF ( page.current_page ) %]
>+                    [% SET current_page = page.page_number %]
>+                    <li class="active"><span class="current">[% page.page_number | html %]</span></li>
>+                [% ELSE %]
>+                    <li><a class="nav" href="[% page.script_name | url %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a></li>
>+                [% END %]
>+            [% END %]
>+            [% IF ( current_page < pages.size() ) %]
>+                <li>
>+                    <a href="[% page.script_name | url %]?offset=[% offset + results_per_page | uri %]" class="nav">Next <i class="fa fa-fw fa-angle-right"></i></a>
>+                </li>
>+                <li>
>+                    <a href="[% page.script_name | url %]?offset=[% ( results_per_page * ( pages.size - 1 ) ) | uri %]" class="nav">Last <i class="fa fa-fw fa-angle-double-right"></i></a>
>+                </li>
>+            [% END %]
>+        </ul>
>+    </nav>
>+[% END %]
>\ No newline at end of file
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 23094: 90485 | 90515 | 91027 | 91375 | 91385