From 8b5a91cf140e9035f38a73928702dba742628ee0 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 31 Dec 2008 14:46:09 -0600
Subject: [PATCH] followup to Mason's labels patch

* fix XHTML errors
* fix problems with paging through results list

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 .../prog/en/modules/labels/result.tmpl        |  3 --
 .../prog/en/modules/labels/search.tmpl        | 26 ++------------
 labels/label-item-search.pl                   | 36 ++++++++++---------
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index d609331f77..7cf4f6346e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -79,9 +79,6 @@ function add_item3(i_itemnumber){
 <div id="breadcrumbs"><a href="/cgi-bin/koha/labels/label-item-search.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Search for Items for Batch <!-- TMPL_VAR NAME="batch_id" --></a> &rsaquo; Search results</div>
 <form name="resultform" class="checkboxed" action=""><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" -->,'<!-- TMPL_VAR NAME="type" -->'); 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/labels/label-item-search.pl">Select All</a><span class="clearall"><a id="CheckNone" href="/cgi-bin/koha/labels/label-item-search.pl">Clear All</a></span></div>
 
-<input type="hidden" name="ccl_query" value="<!-- TMPL_VAR name="ccl_query" -->" />
-
-
 <input type="hidden" name="ccl_query" value="<!-- TMPL_VAR name="ccl_query" -->" />
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index 4d439b7057..5758c7e831 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -67,7 +67,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 
    <input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/>
 
-</li><!-- FIXME: script does keyword search regardless<li>
+</li>
 </ol>
 </fieldset>
 
@@ -93,7 +93,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 	    </th>
 	    <td>
   <input type="text" size="10" id="datefrom" name="datefrom" value="" />
-  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
+  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" alt="Show Calendar" />
 
 <script type="text/javascript">
     Calendar.setup({
@@ -117,7 +117,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 	    </th>
 	    <td>
   <input type="text" size="10" id="dateto" name="dateto" value="" />
-  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" valign="top" />
+  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" alt="Show Calendar" />
 
 <script type="text/javascript">
     Calendar.setup({
@@ -128,32 +128,12 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
     });
 </script>
 
-<!-- FIXME: script returns ALL type regardless
-    <tr><th scope="row">Document Type</th>
-                <td colspan="2">
-                    <select name="Filter" disabled="disabled">
-                        <option value="">All Item Types</option>
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
-                        <!-- TMPL_LOOP name="itemtypeloop" -->
-                            <!-- TMPL_IF name="selected" -->
-                                <option value="<!-- TMPL_VAR name="value" -->"  selected="selected" >
-                            <!-- TMPL_ELSE -->
-                                <option value="<!-- TMPL_VAR name="value" -->">
-                            <!-- /TMPL_IF --><!-- TMPL_VAR name="description" --></option>
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
-                        <!-- /TMPL_LOOP -->
-                    </select>
                 </td>
             </tr></table>
 
 
 
 
-
-
-
-
-
 <fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 </form>
 </div>
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 17caa6e3ae..3bba92d7da 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -207,26 +207,28 @@ if ($show_results) {
 		  : $startfrom + $resultsperpage - 1;
 
 		# multi page display
-		my $displaynext = 0;
-		my $displayprev = $startfrom;
+		$displaynext = 0;
+		$displayprev = $startfrom > 1 ? $startfrom : 0;
 
-		$displaynext = 1 if (scalar @results == $resultsperpage);
+		$displaynext = 1 if $to < $total_hits;
 
-		$template->param(
-
-			total          => $total_hits,
-			from           => $from,
-			to             => $to,
-			startfromnext  => $startfromnext,
-			startfromprev  => $startfromprev,
-			startfrom      => $startfrom,
-			displaynext    => $displaynext,
-			displayprev    => $displayprev,
-			resultsperpage => $resultsperpage,
-			numbers        => \@numbers,
+	} else {
+        $displayprev = 0;
+        $displaynext = 0;
+    }
 
-		);
-	}
+	$template->param(
+		total          => $total_hits,
+		from           => $from,
+		to             => $to,
+		startfromnext  => $startfromnext,
+		startfromprev  => $startfromprev,
+		startfrom      => $startfrom,
+		displaynext    => $displaynext,
+		displayprev    => $displayprev,
+		resultsperpage => $resultsperpage,
+		numbers        => \@numbers,
+	);
 
 	$template->param(
 		result    => \@results,
-- 
2.39.5