From b49c7b62a169f45f1acbf8b66b1b9220850f3ed7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Jul 2011 14:18:34 -0400 Subject: [PATCH] Fix for Bug 6616 - Move common table pager markup to include Content-Type: text/plain; charset="utf-8" Created new include for the tablesorter pager markup: [% INCLUDE 'table-pager.inc' perpage='20' %] 'perpage' variable defines the default items per page for the paged table. Unique changes in branch_transfer_limits.tt: - Moved tablesorter configuration out of a loop and changed it to work by class instead of id (less repeated markup). - Corrected an errant TMPL tag. --- .../intranet-tmpl/prog/en/includes/table-pager.inc | 17 +++++++++ .../prog/en/modules/admin/auth_tag_structure.tt | 21 ++--------- .../prog/en/modules/admin/authorised_values.tt | 22 ++---------- .../en/modules/admin/branch_transfer_limits.tt | 39 ++++++-------------- .../prog/en/modules/admin/branches.tt | 21 ++--------- .../prog/en/modules/admin/categorie.tt | 21 ++--------- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 21 ++--------- .../prog/en/modules/admin/itemtypes.tt | 21 ++--------- .../prog/en/modules/admin/marctagstructure.tt | 21 ++--------- .../prog/en/modules/members/readingrec.tt | 21 ++--------- .../en/modules/reports/guided_reports_start.tt | 20 ++--------- 11 files changed, 55 insertions(+), 190 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc new file mode 100644 index 0000000..b39e183 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc @@ -0,0 +1,17 @@ +
+ + + +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index eb1d47e..8b3965b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -208,24 +208,9 @@ return false;
- -
 page(s) : - - - - - - , entries/page : - -
-
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index f235634..3107b7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -221,25 +221,9 @@ [% END %]

Authorized values for category [% category %]:

-[% IF ( loop ) %] -
 page(s) : - - - - - - , entries/page : - - -
[% END %] +[% IF ( loop ) %]
+[% INCLUDE 'table-pager.inc' perpage='50' %] +
[% END %] [% IF ( loop ) %]
Tag
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index a1b6fa2..3235809 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -5,6 +5,7 @@ @@ -92,32 +97,11 @@

Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]

Check All | Uncheck All

- - -
 page(s) : - - - - - - , entries/page : - - -
-
+
+ [% INCLUDE 'table-pager.inc' perpage='20' %] +
+
@@ -127,8 +111,7 @@ [% FOREACH to_branch_loo IN codes_loo.to_branch_loop %] - [% UNLESS ( loop.odd ) %][% END %] + [% UNLESS ( loop.odd ) %][% ELSE %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index b92ad52..56e48c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -163,24 +163,9 @@ [% IF ( MESSAGE10 ) %]
Library cannot be deleted because there are items held by that library
[% END %] [% IF ( MESSAGE11 ) %]
Library cannot be deleted because there are patrons registered at that library
[% END %] [% IF ( branches ) %] - -
 page(s) : - - - - - - , entries/page : - - -
+
+[% INCLUDE 'table-pager.inc' perpage='10' %] +
Library
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index c2e5062..579bcc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -265,24 +265,9 @@ Confirm Deletion of Category [% categorycode |html %][% END %] [% IF ( searchfield ) %] You Searched for [% searchfield %] [% END %] - -
 page(s) : - - - - - - , entries/page : - - -
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
Name
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 2e9bdd2..d5382bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -114,24 +114,9 @@ [% END %] [% IF ( loop ) %] - -
 page(s) : - - - - - - , entries/page : - - -
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
Code
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 9174247..ada7952 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -285,24 +285,9 @@ Item Types Administration [% IF ( else ) %]

Item Types Administration

-[% IF ( loop ) %] -
 page(s):  - - - - - - , entries/page: - - -
+[% IF ( loop ) %]
+[% INCLUDE 'table-pager.inc' perpage='10' %] +
City ID
[% UNLESS ( noItemTypeImages ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 275f232..762cea8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -157,24 +157,9 @@ $(document).ready(function() { [% END %]

- -
 page(s) : - - - - - - , entries/page : - - -
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
Image
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index c61006b..3f142c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -32,24 +32,9 @@

Circulation History

- -
 page(s) : - - - - - - , entries/page : - - -
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
Tag
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index e3df4e2..c9211a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -124,23 +124,9 @@ canned reports and writing custom SQL reports.

[% IF ( saved1 ) %] [% IF ( savedreports ) %]

Saved Reports

- -
 page(s) : - - - - - - , entries/page: - - -
+
+[% INCLUDE 'table-pager.inc' perpage='20' %] +
Date
-- 1.7.3