[Koha-patches] [PATCH] Fix for Bug 6616 - Move common table pager markup to include
Owen Leonard
oleonard at myacpl.org
Wed Jul 20 20:29:23 CEST 2011
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 @@
+<form class="formpager" action=""><label>Page(s):
+ <img src="[% interface %]/prog/img/first.png" alt="" class="first"/>
+ <img src="[% interface %]/prog/img/prev.png" alt="" class="prev"/>
+ <input type="text" size="5" class="pagedisplay"/></label>
+ <img src="[% interface %]/prog/img/next.png" alt="" class="next"/>
+ <img src="[% interface %]/prog/img/last.png" alt="" class="last"/>
+ <label>Entries/page:
+ <select class="pagesize">
+ [% IF ( perpage == 10) %]<option value="10" selected="selected">10</option>[% ELSE %]<option value="10">10</option>[% END %]
+ [% IF ( perpage == 20) %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
+ [% IF ( perpage == 30) %]<option value="30" selected="selected">30</option>[% ELSE %]<option value="30">30</option>[% END %]
+ [% IF ( perpage == 40) %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
+ [% IF ( perpage == 50) %]<option value="50" selected="selected">50</option>[% ELSE %]<option value="50">50</option>[% END %]
+ [% IF ( perpage == 100) %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
+ [% IF ( perpage == 200) %]<option value="200" selected="selected">200</option>[% ELSE %]<option value="200">200</option>[% END %]
+ </select></label>
+</form>
\ 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;
<input type="text" name="searchfield" value="[% searchfield %]" />
<input type="submit" value="OK" class="submit" />
</form><br />
-<span id="pagertable_authtagstructure" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option selected="selected" value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
-</form>
-</span>
+<div id="pagertable_authtagstructure" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_authtagstructure">
<thead>
<th>Tag</th>
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 %]
<h3>Authorized values for category [% category %]:</h3>
-[% IF ( loop ) %]<span id="pagertable_authorized_values" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option selected="selected" value="50">50</option>
- <option value="100">100</option>
- <option value="200">200</option>
- </select>
- </form>
-</span>[% END %]
+[% IF ( loop ) %]<div id="pagertable_authorized_values" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='50' %]
+</div>[% END %]
[% IF ( loop ) %]<table id="table_authorized_values" class="tablesorter">
<thead><tr>
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 @@
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript">
+//<![CDATA[
$(document).ready(function(){
$("#CheckAll").click(function(){ $("#transferlimit_tabs").checkCheckboxes();});
$("#UncheckAll").click(function(){ $("#transferlimit_tabs").unCheckCheckboxes();});
@@ -49,8 +50,12 @@
$("#"+tid).unCheckCheckboxes();
return false;
});
-
+ $(".sorted").tablesorter({
+ sortList: [[0,0]],
+ headers: { 1: { sorter: false}}
+ }).tablesorterPager({container: $(".pager"),positionFixed: false,size: 10});
});
+//]]>
</script>
<style type="text/css">td { text-align: center; }</style>
</head>
@@ -92,32 +97,11 @@
<div id="[% codes_loo.code %]set">
<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
- <script type="text/javascript" id="js">$(document).ready(function() {
- $("#[% codes_loo.code %]table").tablesorter({
- sortList: [[0,0]],
- headers: { 1: { sorter: false}}
- }).tablesorterPager({container: $("#pager[% codes_loo.code %]table"),positionFixed: false,size: 10});
-}); </script>
- <span id="pager[% codes_loo.code %]table" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/[% theme %]/img/first.png" class="first"/>
- <img src="[% interface %]/[% theme %]/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/[% theme %]/img/next.png" class="next"/>
- <img src="[% interface %]/[% theme %]/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option selected="selected" value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
- <table id="[% codes_loo.code %]table">
+ <div id="pager[% codes_loo.code %]table" class="pager">
+ [% INCLUDE 'table-pager.inc' perpage='20' %]
+ </div>
+ <table id="[% codes_loo.code %]table" class="sorted">
<thead>
<tr>
<th>Library</th>
@@ -127,8 +111,7 @@
<tbody>
[% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]
- [% UNLESS ( loop.odd ) %]<tr class="highlight"><!-- TMPL_ELSE
---><tr>[% END %]
+ [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
<td><label style="min-width:400px;" for="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row">[% to_branch_loo.toBranch %] - [% to_branch_loo.toBranchname %]</label></td>
<td><input type="checkbox" id="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row" name="[% to_branch_loo.code %]_[% to_branch_loo.toBranch %]" [% IF ( to_branch_loo.isChecked ) %]checked="checked" [% END %] /></td>
</tr>
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 ) %]<div class="dialog message">Library cannot be deleted because there are items held by that library</div>[% END %]
[% IF ( MESSAGE11 ) %]<div class="dialog message">Library cannot be deleted because there are patrons registered at that library</div>[% END %]
[% IF ( branches ) %]
-<span id="pagerbranchest" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option selected="selected" value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+<div id="pagerbranchest" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='10' %]
+</div>
<table id="branchest">
<thead><tr>
<th>Name</th>
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 %]</legend>
[% IF ( searchfield ) %]
You Searched for [% searchfield %]</span>
[% END %]
-<span id="pagertable_categorie" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option selected="selected" value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+<div id="pagertable_categorie" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_categorie">
<thead>
<th scope="col">Code</th>
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 ) %]
-<span id="pagertable_cities" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option selected="selected" value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+<div id="pagertable_cities" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_cities">
<thead>
<th>City ID</th>
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 ) %]
<h2>Item Types Administration</h2>
-[% IF ( loop ) %]<span id="pagertable_item_type" class="pager">
- <form class="formpager"> <strong>page(s)</strong>:
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page:
- <select class="pagesize">
- <option selected="selected" value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+[% IF ( loop ) %]<div id="pagertable_item_type" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='10' %]
+</div>
<table id="table_item_type">
<thead>
[% UNLESS ( noItemTypeImages ) %]<th>Image</th>[% 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 %]</p>
</fieldset>
</form>
-<span id="pagertable_marctagstructure" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option selected="selected" value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+<div id="pagertable_marctagstructure" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_marctagstructure">
<thead>
<th>Tag</th>
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 @@
<h1>Circulation History</h1>
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
-<span id="pagertable_readingrec" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page :
- <select class="pagesize">
- <option value="10">10</option>
- <option selected="selected" value="20">20</option>
- <option value="30">30</option>
- <option value="40">40</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- </form>
-</span>
+<div id="pagertable_readingrec" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_readingrec">
<thead>
<th>Date</th>
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.</p>
[% IF ( saved1 ) %]
[% IF ( savedreports ) %]<h1>Saved Reports</h1>
-<span id="pagertable_reports" class="pager">
- <form class="formpager"> <strong>page(s)</strong> :
- <img src="[% interface %]/prog/img/first.png" class="first"/>
- <img src="[% interface %]/prog/img/prev.png" class="prev"/>
- <input type="text" size="5" class="pagedisplay"/>
- <img src="[% interface %]/prog/img/next.png" class="next"/>
- <img src="[% interface %]/prog/img/last.png" class="last"/>
- , entries/page:
- <select class="pagesize">
- <option value="10">10</option>
- <option value="25" selected="selected">25</option>
- <option value="50">50</option>
- <option value="100">100</option>
- <option value="200">200</option>
- </select>
- </form>
-</span>
+<div id="pagertable_reports" class="pager">
+[% INCLUDE 'table-pager.inc' perpage='20' %]
+</div>
<table id="table_reports" class="tablesorter">
<thead>
--
1.7.3
More information about the Koha-patches
mailing list