From 0f1dad54f771f4b2f569cc825628b619fd60654d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 13 Mar 2008 19:13:53 -0500
Subject: [PATCH] Cleaning up label item search and results, fixing Bug 1929
 (Navigation issue with label-item-search.tmpl)

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/labels/result.tmpl        | 56 ++++++++-----------
 .../prog/en/modules/labels/search.tmpl        | 29 +++++-----
 2 files changed, 36 insertions(+), 49 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 c16081e106..83ae48f69f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -1,10 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Barcodes and Labels &rsaquo; Search Results</title><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<style type="text/css">#custom-doc { width:47.23em;*width:46.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style>
-
+<style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
 <script type="text/javascript">
-//<![CDATA[
+//<![CDATA[ 
+$(document).ready(function(){
+    $("#CheckAll").click(function(){
+		$(".checkboxed").checkCheckboxes();
+	        return false;
+    });
+    $("#CheckNone").click(function(){
+        $(".checkboxed").unCheckCheckboxes();
+        return false;
+    });
+});
 function add_item(itemnum,batch_id){
-
  var getstr='';
  if (itemnum == 'checked') {
     itms= new Array;        
@@ -22,18 +31,7 @@ function add_item(itemnum,batch_id){
  	var myurl = "label-manager.pl?op=add&batch_id="+batch_id+"&"+getstr;
 	window.opener.location.href = myurl;
 }
-/* # TODO  there's a checkall fcn in opac/includes.... that should be modified to accept form object. */
-function check_all()
-{
-count = document.resultform.elements.length;
-    for (i=0; i < count; i++)  
-    {   
-            document.resultform.elements[i].checked = 1;
-    }
-}
-
 function add_item3(itemnumber){
-
  var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
      window.opener.location.href = myurl;
 }
@@ -46,11 +44,9 @@ function add_item3(itemnumber){
    <div id="bd">
 <h1>Search results</h1>
 	<div class="results">
-		<p >
+		<!-- TMPL_IF EXPR="displayprev || displaynext" --><p>
 			<!-- TMPL_IF NAME="displayprev" -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">
-					&lt;&lt;
-				</a>
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&lt;&lt;</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME="numbers" -->
 				<!-- TMPL_IF NAME="highlight" -->
@@ -62,26 +58,19 @@ function add_item3(itemnumber){
 			<!-- TMPL_IF NAME="displaynext" -->
 				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
-		</p>
+		</p><!-- /TMPL_IF -->
 		<p>
 			<!-- TMPL_IF name="result" -->
-			&nbsp;<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
+			<strong>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></strong>
 			<!-- TMPL_ELSE -->
-			&nbsp; No results found<br />
+			No results found
 			<!-- /TMPL_IF -->
 		</p>
 	</div>
-<form name="resultform">
-	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="close" href="#">[ Done ]</a></span>
-<input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" />
-	<table>
-	<tr>
-	<tr>
-		<th><a href="#" onclick="check_all()" >Check all</a></th>
-		<th>Biblio Summary</th>
-		<th>Item Summary</th>
-		<th>Add</th>
-	</tr>
+<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"><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/labels/label-item-search.pl">Select All</a></span><span class="clearall"><a id="CheckNone" href="/cgi-bin/koha/labels/label-item-search.pl">Clear All</a></div>
+
+	<table style="float: left; margin: .5em 0;">
 	<!-- TMPL_LOOP name="result" -->
 		<!-- TMPL_IF name="highlight" -->
 			<tr class="highlight">
@@ -113,6 +102,7 @@ function add_item3(itemnumber){
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
+		<div style="float: right;"><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>
 </form>
 	<div class="results">
 		<p>
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 be9344ed9a..d5e939a070 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -8,9 +8,9 @@
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
 
-<h1>Catalog item search
+<h1>Search for items
 <!-- TMPL_IF name="batch_id" -->
- for batch <!-- TMPL_VAR NAME="batch_id" -->
+to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 <!-- /TMPL_IF  -->
 </h1>
 
@@ -35,8 +35,8 @@
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
 </select>
    <input type="text" size="30" id="marclist" name="marclist" class="focus" title="Enter search terms" value=""/>  
-</li><li>
-<select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
+</li><!-- FIXME: script does keyword search regardless<li>
+<select name="idx" disabled="disabled">
     <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
     <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
@@ -51,8 +51,8 @@
     <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
 </select>
-   <input type="text" size="30" name="q" title="Enter search terms" value="" disabled="disabled" /><!-- FIXME: script doesn't "catch" q param -->
-</li>
+   <input type="text" size="30" name="q" title="Enter search terms" value="" disabled="disabled" />  FIXME: script doesn't "catch" q param
+</li> -->
 </ol>
 </fieldset>
 
@@ -68,9 +68,9 @@
 </fieldset>
 <!-- /TMPL_IF -->
 
-<fieldset class="rows">
-	<table>
-<!--
+
+	
+<!--<fieldset class="rows"><table>
 	<tr><th scope="row">
 		<label for="datefrom">Added on or after date</label>
 	    </th>
@@ -114,10 +114,10 @@
         align          :    "Tl",
     });
 </script>
--->
+--><!-- FIXME: script returns ALL type regardless
     <tr><th scope="row">Document Type</th>
                 <td colspan="2">
-                    <select name="Filter" disabled="disabled"><!-- FIXME: script returns ALL type regardless-->
+                    <select name="Filter" disabled="disabled">
                         <option value="">All Item Types</option>
                         <!-- TMPL_LOOP name="itemtypeloop" -->
                             <!-- TMPL_IF name="selected" -->
@@ -128,12 +128,9 @@
                         <!-- /TMPL_LOOP -->
                     </select>
                 </td>
-            </tr>
+            </tr></table></fieldset>-->
 
-	</table>
-	<br />
-</fieldset>
-<fieldset class="action"><input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 </form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5