From bebd8961d9ad308f4edbf9e4389e57cdeee7f5e9 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 22 Apr 2008 09:54:55 -0500
Subject: [PATCH] More cleanup and corrections for circulation reports.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/circ/billing.tmpl         | 154 ++++++++----------
 .../prog/en/modules/circ/branchoverdues.tmpl  |  18 +-
 .../prog/en/modules/circ/overdue.tmpl         |   9 +-
 .../prog/en/modules/circ/reserveratios.tmpl   |   5 +-
 .../prog/en/modules/circ/transferstodo.tmpl   |   7 +-
 .../en/modules/circ/transferstoreceive.tmpl   |   7 +-
 .../prog/en/modules/circ/waitingreserves.tmpl |  46 ++++--
 7 files changed, 134 insertions(+), 112 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 67574c6267..71888fc69c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
@@ -3,7 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
-<!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
@@ -16,24 +15,82 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Billing</div>
 
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-g">
+	<div class="yui-b">
 
-<h1>Billing on 
-   <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
-	to <!-- TMPL_VAR NAME="to" --></h1>
-<div id="filters">
+<h2>Billing from <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --></h2>
+<h3>Reported  on <!-- TMPL_VAR NAME="todaysdate" --></h3>
 
+
+
+
+<!-- TMPL_IF NAME="billingloop" -->
+<h4>The following patrons have bills.</h4>
+    <table>
+    <tr>
+        <th>Patron
+        <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&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&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&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&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&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+        </th>
+    </tr>
+    
+    <!-- TMPL_LOOP NAME="billingloop" -->
+        <tr>
+            	 <td>
+					 <p><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="patronname" --></a><br /><!-- TMPL_VAR NAME="phone" --><br />
+                <!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Account: <!-- TMPL_VAR NAME="title" -->">
+    				 <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
+                </p>
+            	 </td>
+                <td align="right">
+                    <p><!-- TMPL_VAR NAME="l_amountoutstanding" --></p>
+                </td>
+                <td>
+                    <p><!-- TMPL_VAR NAME="l_description" --></p>
+                </td>
+                <td>
+                    <p><!-- TMPL_VAR NAME="l_accounttype" --></p>
+                </td>
+                <td>
+                    <p><!-- TMPL_VAR NAME="l_date" --></p>
+                </td>                
+                <td align="right">
+                    <p><!-- TMPL_VAR NAME="sum_amount" --></p>
+                </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+    <!-- TMPL_ELSE -->
+        <b>No items found.</b>
+    <!-- /TMPL_IF -->
+
+</div>
+</div>
+<div class="yui-b">
 <form action="/cgi-bin/koha/circ/billing.pl" method="post" >
-<p>
-<label for="ratio">
+<fieldset class="brief">
+<ol><li><label for="ratio">
     Currency Cutoff:
 </label>
-<input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" />
-<label for="from">
+<input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" /></li>
+<li><label for="from">
     Start date:
 </label>
 <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
@@ -63,8 +120,8 @@ Calendar.setup(
         dateStatusFunc : validate1
         }
 );
-</script>
-<label for="to" >
+</script></li>
+<li><label for="to" >
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
@@ -96,77 +153,10 @@ Calendar.setup(
                 }
         );
 </script>
-(inclusive)
+(inclusive)</li></ol>
 
-<input type="submit" value="Go" class="submit"/>
-</p>
+<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset></fieldset>
 </form>
-<p>The following patrons have bills.</p>
-</div>
-
-
-<div class="searchresults">
-    <!-- TMPL_IF NAME="billingloop" -->
-    <table>
-    <tr>
-        <th >Patron
-        <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&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&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&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&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&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
-        </th>
-    </tr>
-    
-                    <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                    <!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
-                    <!-- /TMPL_IF -->    
-    
-    <!-- TMPL_LOOP NAME="billingloop" -->
-        <tr>
-            <!-- TMPL_IF name="surname" -->
-            	 <td>
-					 <p><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="patronname" --></a><br /><!-- TMPL_VAR NAME="phone" --><br />
-                <!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Account: <!-- TMPL_VAR NAME="title" -->">
-    				 <!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
-                </p>
-            	 </td>
-                <td align="right">
-                    <p><!-- TMPL_VAR NAME="l_amountoutstanding" --></p>
-                </td>
-                <td>
-                    <p><!-- TMPL_VAR NAME="l_description" --></p>
-                </td>
-                <td>
-                    <p><!-- TMPL_VAR NAME="l_accounttype" --></p>
-                </td>
-                <td>
-                    <p><!-- TMPL_VAR NAME="l_date" --></p>
-                </td>                
-                <td align="right">
-                    <p><!-- TMPL_VAR NAME="sum_amount" --></p>
-                </td>
-        </tr>
-    <!-- /TMPL_LOOP -->
-    </table>
-    <!-- TMPL_ELSE -->
-        <b>No items found.</b>
-    <!-- /TMPL_IF -->
-</div>
-
-</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index 77d4102423..831b0bd4c7 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsquo; Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></title>
+<title>Koha &rsaquo; Circulation &rsaquo; Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -53,24 +53,24 @@
             <!-- TMPL_LOOP NAME="overduesloop" -->
                 <tr>
                     <td>
-                        <p>
                         <!-- TMPL_VAR NAME="date_due" -->
-                        </p>
                     </td>
                     <td>
-                        <p>
-                            <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                        <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF -->
                             &nbsp; (<b><!-- TMPL_VAR NAME="description" --></b>)
                             <br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
-                        </p>
                     </td>
                     <td>
-                        <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
                     <!-- TMPL_IF NAME="borroweremail" --><a href="mailto:<!-- TMPL_VAR NAME="borroweremail" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">
                     <!-- TMPL_VAR NAME="borroweremail" --></a><!--/TMPL_IF-->
-                        </p>
                     </td>
-                    <td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+                    <td><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" -->
                     </td>
                     <td align="center">
                     <b>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index 9d235f49b6..f5f3d38415 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -56,9 +56,12 @@ $.tablesorter.addParser({
     <!--TMPL_IF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSE --><!--TMPL_IF NAME="phonepro" -->       <!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->)</td>
         <!-- /TMPL_IF -->
         <td><!-- TMPL_VAR name="branchcode" --></td>
-        <td>
-            <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
-            <p><!-- TMPL_VAR NAME="author" --></p>
+        <td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         </td>
     </tr>
 <!-- /TMPL_LOOP --></tbody>
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 d7f94a40cc..e558766f3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
@@ -44,8 +44,7 @@ $.tablesorter.addParser({
    <h3>Calculated on <!-- TMPL_VAR NAME="todaysdate" -->. From <!-- TMPL_VAR NAME="from" -->
 	to <!-- TMPL_VAR NAME="to" --></h3>
 <p>These items have a large number of holds.</p>
-<div class="searchresults">
-    <!-- TMPL_IF NAME="reserveloop" -->
+<!-- TMPL_IF NAME="reserveloop" -->
     <table id="holdst">
 <thead>    <tr>
         <th>Reserves
@@ -117,7 +116,6 @@ $.tablesorter.addParser({
     <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 <div class="yui-b">
 <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
 <fieldset class="brief">
@@ -195,7 +193,6 @@ Calendar.setup(
 </fieldset>
 </form>
 
-</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index 1703e2fde4..3b25d5ace3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -50,7 +50,12 @@ $.tablesorter.addParser({
             <tbody><!-- TMPL_LOOP NAME="reserv" -->
                 <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
                     <td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold over <!-- /TMPL_IF --></td>
-                    <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>) <br />Barcode : <!-- TMPL_VAR NAME="barcode" --></td>
+                    <td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF -->&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>) <br />Barcode : <!-- TMPL_VAR NAME="barcode" --></td>
                     <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br />
                             <!-- TMPL_VAR NAME="borrowerphone" --><br />
                             <!-- TMPL_IF NAME="borrowermail" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index b6ccf669c0..063e365c7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -55,7 +55,12 @@ $.tablesorter.addParser({
 					<tr>
 					<!-- /TMPL_IF -->
                         <td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF --></td>
-                        <td><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                        <td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF -->
                                 &nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
                                 <br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
                         </td>
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 b7c30200bd..2b91306831 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -1,6 +1,25 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Holds awaiting pickup</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+    id: 'articles', 
+    is: function(s) {return false;  }, 
+    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
+    type: 'text' 
+});
+	 $(document).ready(function() {
+	 	$("th a").hide();
+		$.tablesorter.defaults.widgets = ['zebra'];
+		$("#holdst").tablesorter({
+			sortList: [[3,0]],
+			headers: { 1:{sorter:'articles'},3: { sorter: 'articles' },4:{sorter:false}}
+		}); 
+ 	 });
+//]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -39,31 +58,34 @@
         <!-- TMPL_UNLESS NAME="message" -->
         <div id="resultlist">
             <!-- TMPL_IF NAME="reserveloop" -->
-                <table>
-                <tr>
+                <table id="holdst">
+               <thead> <tr>
                         <th>Available since</th>
                         <th>Title</th>
                         <th>Patron</th>
                         <th>Localisation</th>
                         <th>Action</th>
-                </tr>
-                        <!-- TMPL_LOOP NAME="reserveloop" -->
+                </tr></thead>
+                        <tbody><!-- TMPL_LOOP NAME="reserveloop" -->
                                 <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
                                         <td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold Over <!-- /TMPL_IF --></td>
                                         <td>
-                                                <p>
-                                                        <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-                                                        &nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
+
+
+<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --> &nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
                                                         <br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
-                                                </p>
                                         </td>
                                         <td>
-                                                <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
                                         <!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
                 <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
-                                                </p>
                                         </td>
-                                        <td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
+                                        <td><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
                                         <td>
                                                 <form name="cancelReserve" action="waitingreserves.pl" method="post">
                                                         <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->" />
@@ -78,7 +100,7 @@
                                                 </form>
                                         </td>
                                 </tr>
-                        <!-- /TMPL_LOOP -->
+                        <!-- /TMPL_LOOP --></tbody>
                 </table>
                 <!-- TMPL_ELSE -->
                     <div class="dialog message">No holds found.</div>
-- 
2.39.5