Hiding empty results table when there are no results (prevents js error from tablesor...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 9263d52..abd8814 100644 (file)
--- 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 6af5f00..474b6ca 100644 (file)
--- 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 bccaa14..9df1d2f 100644 (file)
--- 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 -->