From 1a5013441ba0f9484127ac813b709da9746009ad Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Tue, 1 Apr 2008 12:01:06 -0500
Subject: [PATCH] XHTML fixes for various circ templates

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/circ/billing.tmpl         | 26 ++++++++--------
 .../prog/en/modules/circ/pendingreserves.tmpl | 28 ++++++++---------
 .../prog/en/modules/circ/reserveratios.tmpl   | 30 +++++++++----------
 .../prog/en/modules/circ/waitingreserves.tmpl |  2 +-
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
index 8cd001554d..b86b6dc744 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
@@ -23,18 +23,18 @@
 	<div class="yui-b">
 
 <h1>Billing on 
-   <!-- TMPL_VAR NAME="todaysdate" --> <br>From <!-- TMPL_VAR NAME="from" -->
+   <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
 	to <!-- TMPL_VAR NAME="to" --></h1>
 <div id="filters">
 <br />
 
-<form method="post" >
+<form action="/cgi-bin/koha/circ/billing.pl" method="post" >
 <p>
-<label for "ratio">
+<label for="ratio">
     Currency Cutoff:
 </label>
 <input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" />
-<label for "from">
+<label for="from">
     Start date:
 </label>
 <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
@@ -65,11 +65,11 @@ Calendar.setup(
         }
 );
 </script>
-<label for "to" >
+<label for="to" >
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" />
 <script type="text/javascript">
         function validate2(date) {
             var day = date.getDate();
@@ -99,7 +99,7 @@ Calendar.setup(
 </script>
 (inclusive)
 
-<input type="submit" value="Go" class="submit">
+<input type="submit" value="Go" class="submit"/>
 </p>
 </form>
 <p>The following patrons have bills.</p>
@@ -111,22 +111,22 @@ Calendar.setup(
     <table>
     <tr>
         <th >Patron
-        <a href="/cgi-bin/koha/circ/billing.pl?order=patron&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=patron&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Fee Item
-        <a href="/cgi-bin/koha/circ/billing.pl?order=fee&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=fee&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Description
-        <a href="/cgi-bin/koha/circ/billing.pl?order=desc&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=desc&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Type
-        <a href="/cgi-bin/koha/circ/billing.pl?order=type&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=type&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Date
-        <a href="/cgi-bin/koha/circ/billing.pl?order=date&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=date&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Total Amount
-        <a href="/cgi-bin/koha/circ/billing.pl?order=total&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/billing.pl?order=total&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
     </tr>
     
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index be954d1c35..84f7a1e655 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -27,10 +27,10 @@
 	to <!-- TMPL_VAR NAME="to" -->)</h1>
 <div id="filters">
 <br />
-<form method="post" >
+<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
 <p>
 
-<label for "from">
+<label for="from">
     Start date:
 </label>
 <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
@@ -61,11 +61,11 @@ Calendar.setup(
         }
 );
 </script>
-<label for "to" >
+<label for="to" >
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" />
 <script type="text/javascript">
         function validate2(date) {
             var day = date.getDate();
@@ -93,9 +93,9 @@ Calendar.setup(
                 }
         );
 </script>
-<br>
-<i>(Inclusive, default is (10yr/ago to yesterday), set"to" to today as needed. )</i>
-<input type="submit" value="Go" class="submit">
+<br/>
+<i>(Inclusive, default is (10 years ago to yesterday), set "to" to today as needed. )</i>
+<input type="submit" value="Go" class="submit"/>
 </p>
 </form>
 <p>The following holds have not been filled.</p>
@@ -116,26 +116,26 @@ Calendar.setup(
 				Patrons with Holds
         </th>
         <th >Title
-        <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=biblio&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>
             Libraries
-				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=library&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=library&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>
             Available Call Numbers
-				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>
             Available Itypes
-				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>
             Available Locations
-				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=location&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=location&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Earliest Hold Date
-            <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=date&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+            <a href="/cgi-bin/koha/circ/pendingreserves.pl?order=date&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
 
     </tr>
@@ -143,7 +143,7 @@ Calendar.setup(
     <!-- TMPL_LOOP NAME="reserveloop" -->
         <tr>
             <!-- TMPL_IF name="borrowernumber" -->
-                <td><p><center><b><!-- TMPL_VAR NAME="pullcount" --></b></center></p></td>
+                <td><p><!-- TMPL_VAR NAME="pullcount" --></b></p></td>
                 <td><!-- TMPL_VAR NAME="count" --></td>  
                 <td><!-- TMPL_VAR NAME="rcount" --></td> 
                 <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
index 20af72d44d..d72014b92e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
@@ -22,19 +22,19 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>Hold Ratios to Calculate Items Needed<br>
-    Calculated on <!-- TMPL_VAR NAME="todaysdate" --> <br>From <!-- TMPL_VAR NAME="from" -->
+<h1>Hold Ratios to Calculate Items Needed<br/>
+    Calculated on <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
 	to <!-- TMPL_VAR NAME="to" --></h1>
 <div id="filters">
 <br />
 
-<form method="post" >
+<form action="/cgi-bin/koha/circ/reserverations.pl" method="post" >
 <p>
-<label for "ratio">
+<label for="ratio">
     Hold Ratio:
 </label>
 <input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" />
-<label for "from">
+<label for="from">
     Start date:
 </label>
 <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
@@ -65,11 +65,11 @@ Calendar.setup(
         }
 );
 </script>
-<label for "to" >
+<label for="to" >
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" />
 <script type="text/javascript">
         function validate2(date) {
             var day = date.getDate();
@@ -99,7 +99,7 @@ Calendar.setup(
 </script>
 (inclusive)
 
-<input type="submit" value="Go" class="submit">
+<input type="submit" value="Go" class="submit"/>
 </p>
 </form>
 <p>These items have a large number of holds.</p>
@@ -110,25 +110,25 @@ Calendar.setup(
     <table>
     <tr>
         <th >Reserves
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=reservecount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=reservecount&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Items
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itemcount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=itemcount&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Title
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=biblio&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Holding Branches
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=branch&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=branch&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Location
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=location&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=location&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Itype
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itype&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=itype&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>Call Numbers
-        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=callnumber&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&amp;order=callnumber&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th >Items Needed
         </th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 67f254bd4d..78397f3721 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -71,7 +71,7 @@
                                         </td>
                                         <td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
                                         <td>
-                                                <form name="cancelReserve -->" action="waitingreserves.pl" method="post">
+                                                <form name="cancelReserve" action="waitingreserves.pl" method="post">
                                                         <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->" />
                                                         <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                                                         <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
-- 
2.39.5