From db6ab6a6fdc2da1573da9cafc728e7fab065d749 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 8 Apr 2011 11:52:44 +0200
Subject: [PATCH] Fix for bug 5498, Standardize markup and style of pagination
 menus

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl   | 4 ++--
 .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl  | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/classsources.tmpl     | 3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl  | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl   | 2 +-
 .../prog/en/modules/admin/patron-attr-types.tmpl              | 2 +-
 .../prog/en/modules/authorities/searchresultlist.tmpl         | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl   | 2 +-
 .../modules/cataloguing/value_builder/unimarc_field_210c.tmpl | 4 ++--
 .../prog/en/modules/patroncards/members-search.tmpl           | 2 +-
 .../prog/en/modules/reports/guided_reports_start.tmpl         | 2 +-
 .../intranet-tmpl/prog/en/modules/serials/member-search.tmpl  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl      | 2 +-
 .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl | 2 +-
 15 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index 76102d1c93..9693cab226 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -19,8 +19,8 @@
 
 
 <!-- TMPL_IF NAME="total" -->
-<b><!-- TMPL_VAR NAME="total" --> results found </b>
-<div class="pages"><!-- TMPL_VAR name='pagination_bar'--></div>
+<b><!-- TMPL_VAR NAME="total" --> results found </b> 
+<div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div>
 <!-- TMPL_ELSE -->
 <h3> No results found</h3>
 <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index ff336a9d46..a3824cb634 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -294,7 +294,7 @@
     	<!-- /TMPL_UNLESS -->
     </tbody>
     </table>
-    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+    <div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 64e9389d61..b6ce3a8b6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -241,7 +241,7 @@
     </tbody>
 </table>
 
-<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="pagination_bar" --><div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- ********************************************************************************************** -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 569d87515c..a9c0567747 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -274,9 +274,8 @@ $(document).ready(function() {
   <!-- /TMPL_LOOP -->
 </table>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <h2>Classification Filing Rules</h2>
 <!-- TMPL_IF name="added_rule" -->
 <div class="dialog message">Added filing rule <!-- TMPL_VAR name="added_rule" --></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 2d9aafca96..72710e132e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -341,7 +341,7 @@ Item Types Administration
 <div class="dialog message">There are no itemtypes defined</div>
 <!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index d0b9a2037b..3b971b1697 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -579,7 +579,7 @@ function CheckRuleForm(f) {
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved matching rules.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <!-- /TMPL_IF -->
  <!-- TMPL_IF name="matching_rule_form" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index b445c41c8a..db6ea5d405 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -221,7 +221,7 @@ function CheckAttributeTypeForm(f) {
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved patron attribute types.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <!-- /TMPL_IF -->
  
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 86abf15a5e..6623970484 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -42,7 +42,7 @@ function searchauthority() {
 <h1>Authority search results</h1>
 
 <!-- TMPL_IF name="total" -->
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <p id="authorities_searchresultlist_current_page_info">
   Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 943d1fb42b..edb3f8e3a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -30,7 +30,7 @@
 <!-- TMPL_IF NAME="total"-->
 <!-- TMPL_VAR NAME="total"--> result(s) found in catalog,
 <a href="#searchresult-breeding"><!-- TMPL_VAR NAME="breeding_count" --> result(s) found in reservoir</a>
-<!-- TMPL_VAR name='pagination_bar'-->
+<div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div>
 <div class="searchresults">
     <table>
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
index 6cf50f285e..53a589e6b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -39,7 +39,7 @@
         </form>
             <!-- TMPL_IF NAME="total" -->
             <h3>Authority search results</h3>
-            <div class="paginationBar">
+            <div class="pages">
                           <!--TMPL_VAR Name="pagination_bar"-->      
                         </div><!-- /TMPL_IF -->
             <p>
@@ -72,7 +72,7 @@
         </div>
 <!-- /TMPL_IF -->
 
-            <!-- TMPL_IF NAME="total" --><div class="paginationBar">
+            <!-- TMPL_IF NAME="total" --><div class="pages">
                           <!--TMPL_VAR Name="pagination_bar"-->      
                         </div>
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tmpl
index 49fc10786f..28e7cf8fec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tmpl
@@ -89,7 +89,7 @@ function add_item(borrowernum,batch_id,type_id){
 
 <!-- TMPL_IF NAME="resultsloop" -->
 <div id="searchheader"> <h3>Results <!-- TMPL_VAR Name ="from" --> to <!-- TMPL_VAR Name ="to" --> of <!-- TMPL_VAR Name ="numresults" --> found for <!-- TMPL_IF NAME="member" -->name: '<span class="ex"><!-- TMPL_VAR NAME="member" --><!-- TMPL_ELSIF NAME="category_type" -->category code: '<span class="ex"><!-- TMPL_VAR NAME="category_type" --><!-- /TMPL_IF --></span>'</h3></div>
-<!-- TMPL_IF NAME="paginationbar" --><div id="pagination_top"><!-- TMPL_VAR Name ="paginationbar" --></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="paginationbar" --><div id="pagination_top" class="pages"><!-- TMPL_VAR Name ="paginationbar" --></div><!-- /TMPL_IF -->
 <form name="resultform" action="/cgi-bin/koha/patroncards/members-search.pl" method="get" class="checkboxed"><div style="float: right; margin-top: .5em;"><input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" /> <input type="button" class="close" value="Done" /></div>
 <div style="line-height: 2em; margin-left: .7em;"><a id="CheckAll" href="/cgi-bin/koha/patroncards/members-search.pl">Select All</a><a id="CheckNone" href="/cgi-bin/koha/patroncards/members-search.pl">Clear All</a></div>
 <div class="searchresults">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 705fd6acc2..88d679205a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -500,7 +500,7 @@ NAME="name" -->"><!-- TMPL_VAR NAME="name"--></label></td><td>
 <!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="unlimited_total" --><p>Total number of rows matching the (unlimited) query is <!-- TMPL_VAR NAME="unlimited_total" -->.</p><!-- /TMPL_IF -->
 <pre id="sql_output"><!-- TMPL_VAR name="sql" --></pre>
-<p><!-- TMPL_VAR NAME='pagination_bar' DEFAULT="" --></p>
+<div class="pages"><!-- TMPL_VAR NAME="pagination_bar" DEFAULT="" --></div>
 <!-- TMPL_UNLESS name="errors" -->
 <table>
 <tr><!-- TMPL_LOOP NAME="header_row" --><th><!-- TMPL_VAR NAME="cell" --></th><!-- /TMPL_LOOP --></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
index 2be331fefa..21c9359ef9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
@@ -69,7 +69,7 @@ function add_member(subscriptionid,borrowernumber){
 		<!-- /TMPL_LOOP -->
 	</tbody>
 </table>
-<div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
+<!--TMPL_IF Name="multipage"--><div class="pages"><!--TMPL_VAR Name="paginationbar" --></div><!--/TMPL_IF-->
 </div>
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="searching" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
index 3f8254d758..0fabf2fd53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
@@ -188,7 +188,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
   </div>
   <!-- /TMPL_IF -->
   <!-- TMPL_IF NAME="pagination_bar" -->
-  <div class="pagination" id="pagination_top">
+  <div class="pages" id="pagination_top">
   	<!-- TMPL_VAR NAME="pagination_bar" -->
   </div>
   <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 0b3bf2d954..20701ca50e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -166,7 +166,7 @@ function placeHold () {
      <span class="clearall"></span></p>
  <!-- /TMPL_IF -->
 	
- <!-- TMPL_VAR name='pagination_bar'-->
+ <div class="pages"><!-- TMPL_VAR name="pagination_bar"--></div>
     <table>
             <tr>
                 <!--TMPL_IF NAME="manageshelf" --><th class="checkall">&nbsp;</th><!-- /TMPL_IF -->
-- 
2.20.1