@@ -, +, @@ markup - Test pages where the pagination_bar subroutine is called: - Administration -> Record matching rules. - Authorities -> Authority search results. - Cataloging -> Cataloging search results. - Cataloging -> MARC Editor -> Edit tag which is configured to use the unimarc_field_210c value builder. - Reports -> Saved SQL reports -> Results. - Tools -> Comments. - Lists -> List contents. - Administration -> Patron attribute types. - Tools -> Tags. --- C4/Output.pm | 54 +++++++------------ .../prog/css/src/staff-global.scss | 40 ++------------ .../prog/en/modules/admin/matching-rules.tt | 1 - .../en/modules/admin/patron-attr-types.tt | 2 - .../modules/authorities/searchresultlist.tt | 9 +++- .../prog/en/modules/cataloguing/addbooks.tt | 12 ++++- .../value_builder/unimarc_field_210c.tt | 22 ++++---- .../modules/reports/guided_reports_start.tt | 10 +++- .../prog/en/modules/reviews/reviewswaiting.tt | 6 ++- .../prog/en/modules/tags/review.tt | 6 +-- .../prog/en/modules/virtualshelves/shelves.tt | 12 ++++- 11 files changed, 77 insertions(+), 97 deletions(-) --- a/C4/Output.pm +++ a/C4/Output.pm @@ -107,21 +107,17 @@ sub pagination_bar { # navigation bar useful only if more than one page to display ! if ( $nb_pages > 1 ) { - + $pagination_bar = ''; } return $pagination_bar; --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1251,42 +1251,6 @@ div { } } - &.pages { - margin: .5em 0; - - a { - font-weight: bold; - padding: 1px 5px; - text-decoration: none; - - &:link, - &:visited { - background-color: #EEEEEE; - color: #3366CC; - } - - &:hover, - &:active { - background-color: #FFC; - } - } - - .current, - .currentPage { - background-color: #E6FCB7; - color: #666; - font-weight: bold; - padding: 1px 5px; - } - - .inactive { - background-color: #F3F3F3; - color: #BCBCBC; - font-weight: bold; - padding: 1px 5px; - } - } - .browse { margin: .5em 0; } @@ -3206,6 +3170,10 @@ nav { } } + &.pages { + font-size: 90%; + } + } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -478,7 +478,6 @@

There are no saved matching rules.

[% END # /IF ( available_matching_rules ) %] -
[% pagination_bar | $raw %]
[% END # /IF ( display_list ) %] [% IF ( matching_rule_form ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -352,8 +352,6 @@ Patron attribute types › Administration › Koha

There are no saved patron attribute types.

[% END %] -
[% pagination_bar | $raw %]
- [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -35,7 +35,10 @@
[% IF ( total ) %] -
[% pagination_bar | $raw %]
+ +

Results [% from | html %] to [% to | html %] of [% total | html %] @@ -86,7 +89,9 @@ -

[% pagination_bar | $raw %]
+ [% ELSE %] No results found --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -93,7 +93,11 @@ [% total | html %] result(s) found in catalog, [% breeding_count | html %] result(s) found in reservoir -
[% pagination_bar | $raw %]
+ + +
@@ -180,7 +184,11 @@ [% END # /FOREACH resultsloo %]
-
[% pagination_bar | $raw %]
+ + +
[% ELSE # IF total %] [% IF ( query ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt @@ -16,7 +16,7 @@ - + @@ -42,10 +42,11 @@ [% IF ( total ) %] -

Authority search results

-
- [% pagination_bar | $raw %] -
[% END %] +

Authority search results

+ + [% END %]

[% IF ( total ) %]  Results [% from | html %] to [% to | html %] of [% total | html %]

@@ -68,10 +69,10 @@ [% resul.summary.label | html %] [% resul.used | html %] times - [% IF ( resul.to_report ) %] + [% #IF ( resul.to_report ) %]

- [% END %] + [% #END %] [% END %] @@ -79,9 +80,10 @@ [% END %] - [% IF ( total ) %]
- [% pagination_bar | $raw %] -
+ [% IF ( total ) %] + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -1076,7 +1076,10 @@ -
[% pagination_bar | $raw %]
+ + [% UNLESS ( errors ) %] @@ -1093,7 +1096,10 @@ [% END %]
[% END %] -
[% pagination_bar | $raw %]
+ + [% INCLUDE 'chart.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -81,7 +81,11 @@ [% END %] -
[% pagination_bar | $raw %]
+ + + [% ELSE %] [% IF ( status ) %]

No comments have been approved.

[% ELSE %]

No comments to moderate.

[% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -80,11 +80,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% END %] - [% IF ( pagination_bar ) %] -
- [% pagination_bar | $raw %] -
- [% END %] + [% IF ( tagloop ) %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -186,7 +186,11 @@ [% IF itemsloop %]

Contents of [% shelf.shelfname | html %]

-
[% pagination_bar | $raw %]
+ + + @@ -307,7 +311,11 @@ [% END %]
-
[% pagination_bar | $raw %]
+ + + [% END %] --