From 97179266447bdf070a4dff44b309177128d615d1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 12 May 2008 07:58:27 -0500
Subject: [PATCH] Hiding empty results table when there are no results
 (prevents js error from tablesorter). Now links back to search form. Also
 includes minor CSS tweak for IE/Opera general layout problems.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css      | 8 +++-----
 koha-tmpl/intranet-tmpl/prog/en/includes/header.inc       | 2 +-
 .../prog/en/modules/cataloguing/z3950_search.tmpl         | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 9263d52550..abd8814183 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -171,13 +171,11 @@ ol li {
 	background-color : #F3F3F3;
 	border-bottom : 1px solid #E8E8E8;
 	line-height : 2em;
-	display : inline-block;
+	overflow : auto;
 }
 
-#header:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
+*html #header {
+	display : inline-block;
 }
 
 #sitetitle {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 6af5f00499..474b6ca39d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,4 +1,4 @@
-<div id="header" class="clearfix">
+<div id="header">
 
 <div id="toplevelnav">
 <ul id="toplevelmenu">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
index bccaa14f7e..9df1d2f083 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
@@ -76,12 +76,13 @@ $.tablesorter.addParser({
 
         </p>
     <!-- /TMPL_LOOP -->
-    <input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/>
+    <fieldset class="action"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/> <a class="cancel close" href="#">Cancel</a></fieldset>
     </form>
 
 
 <!-- TMPL_ELSE -->
     <h2>Results</h2>
+    <!-- TMPL_IF name="breeding_loop" -->
     <table id="resultst">
 <thead>    <tr>
         <th>Server</th>
@@ -92,7 +93,6 @@ $.tablesorter.addParser({
         <th colspan="2">Preview</th>
 		<th>&nbsp;</th>
     </tr></thead>
-    <!-- TMPL_IF name="breeding_loop" -->
     <tbody><!-- TMPL_LOOP name="breeding_loop" -->
         <!-- TMPL_IF NAME="breedingid" -->
 		
@@ -107,10 +107,10 @@ $.tablesorter.addParser({
         </tr>
         <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP --></tbody>
+</table>
     <!-- TMPL_ELSE -->
-        <tr><td colspan="6">Nothing found</td></tr>
+        <p>Nothing found. <a href="/cgi-bin/koha/cataloguing/z3950_search.pl">Try another search</a>.</p>
     <!-- /TMPL_IF -->
-</table>
 
 
 <!-- /TMPL_IF -->
-- 
2.39.5