[Koha-patches] [SIGNED OFF] Fix for Bug 2808, Hold queue not alphabetizing

[Colin Campbell]

From: Owen Leonard <oleonard at myacpl.org>

White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
---
 .../prog/en/includes/biblio-default-view.inc       |   10 +-------
 .../prog/en/modules/circ/waitingreserves.tmpl      |   24 +++++---------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
index deb5dd3..328471b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
@@ -1,9 +1 @@
-<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-	<a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-<!-- TMPL_ELSIF NAME="BiblioDefaultViewlabeled_marc" -->
-	<a class="title" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
-	<a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-<!-- TMPL_ELSE -->
-	<a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-<!-- /TMPL_IF -->
\ No newline at end of file
+<!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_ELSIF NAME="BiblioDefaultViewlabeled_marc" --><a class="title" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- /TMPL_IF -->
\ No newline at end of file
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 63b9e26..6587457 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -14,7 +14,7 @@ $.tablesorter.addParser({
          $('#resultlist > ul').tabs();
          $("th a").hide();
          $.tablesorter.defaults.widgets = ['zebra'];
-         $("#holdst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+         $("#holdst,#holdso").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
             dateFormat: 'uk',<!-- /TMPL_IF -->
             sortList: [[3,0]],
             headers: { 1:{sorter:'articles'},3: { sorter: 'articles' },4:{sorter:false}}
@@ -84,15 +84,13 @@ $.tablesorter.addParser({
                <tbody><!-- TMPL_LOOP NAME="reserveloop" -->
                 <tr>
                     <td><p><!-- TMPL_VAR NAME="waitingdate" --></p></td>
-                    <td>
-                        <!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
+                    <td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
                         <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
                         </a>
                             &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" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+                    <td><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-->
                     </td>
@@ -130,27 +128,17 @@ $.tablesorter.addParser({
                <tbody><!-- TMPL_LOOP NAME="overloop" -->
                     <tr>
                         <td><p><!-- TMPL_VAR NAME="waitingdate" --></p></td>
-                        <td>
-                        <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                        <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                        <!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
-                        <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                        <!-- TMPL_ELSE -->
-                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
+                        <td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
                         </a>
                             &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" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+                    <td><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" ESCAPE="url" -->">
         <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
                     </td>
                     <td><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
-                    <td>
-                        <form name="cancelReserve" action="waitingreserves.pl" method="post">
+                    <td><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" -->" />
-- 
1.7.3.2