Bugzilla – Attachment 76748 Details for
Bug 6647
Label item search should use standard pagination routine
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6647: Label item search should use standard pagination routine
Bug-6647-Label-item-search-should-use-standard-pag.patch (text/plain), 5.38 KB, created by
Maryse Simard
on 2018-07-06 19:57:01 UTC
(
hide
)
Description:
Bug 6647: Label item search should use standard pagination routine
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2018-07-06 19:57:01 UTC
Size:
5.38 KB
patch
obsolete
>From f0999f32995968dd932e01d9aaff0da684b76b8f 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> >--- > .../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 %] >+ <nav> >+ [% IF ( displayprev || displaynext ) %] >+ <ul class="pagination"> >+ [% IF ( displayprev ) %] >+ <li><a class="nav" href="label-item-search.pl?startfrom=[% startfromprev %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&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 %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">[% number.number %]</a></li> >+ [% END %] >+ [% END %] >+ [% IF ( displaynext ) %] >+ <li><a class="nav" href="label-item-search.pl?startfrom=[% startfromnext %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">Next <i class="fa fa-arrow-right"></i></a></li> >+ [% END %] >+ </ul> >+ [% END %] >+ </nav> >+[% END %] > [% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -9,19 +30,7 @@ > <div class="main container-fluid"> > <h1>Search results</h1> > <div class="results"> >- [% IF ( displayprev || displaynext ) %] >- <p> >- [% IF ( displayprev ) %] >- <a href="label-item-search.pl?startfrom=[% startfromprev %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]"><<</a> >- [% END %] >- [% FOREACH number IN numbers %] >- <a href="label-item-search.pl?startfrom=[% number.startfrom %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">[% number.number %]</a> >- [% END %] >- [% IF ( displaynext ) %] >- <a href="label-item-search.pl?startfrom=[% startfromnext %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">>></a> >- [% END %] >- </p> >- [% END %] >+ [% PROCESS pagination %] > [% IF ( results ) %] > <strong>Results [% from %] through [% to %] [% IF ( total ) %] of [% total %][% END %]</strong> > [% ELSE %] >@@ -88,24 +97,8 @@ > </div> > </form> > </div> >- [% IF ( displayprev || displaynext ) %] >- <p> >- [% IF ( displayprev ) %] >- <a href="label-item-search.pl?startfrom=[% startfromnext %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]"><<</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 %]&ccl_query=[% number.ccl_query %]&resultsperpage=[% number.resultsperpage %]&op=do_search&batch_id=[% number.batch_id %]">[% number.number %]</a> >- [% END %] >- [% END %] >- [% IF ( displaynext ) %] >- <a href="label-item-search.pl?startfrom=[% startfromnext %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">>></a> >- [% END %] >- </p> >+ [% PROCESS pagination %] > <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >- [% END %] > </div> > > [% MACRO jsinclude BLOCK %] >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6647
:
75858
|
76748
|
76750