Removing script-specified CSS and js pointers. More markup cleanup and restructuring.

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 4d5459f..0833c3f 100755 (executable)
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -660,12 +660,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => { editcatalogue => 1 },
-               css_page => 'addbiblio.css',
-               js_page => 'addbiblio.js',
-               js_libs =>  [   
-                          { lib => 'lib/jquery/jquery.js' },
-                                                 { lib => 'lib/jquery/plugins/jquery.blockUI.js' },
-                        ],
     }
 );
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc
new file mode 100644 (file)
index 0000000..7543aac
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc
@@ -0,0 +1,6 @@
+<ul id="navigation">
+       <li>    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Edit Bibliographic Record</a></li>
+       <li>    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal view</a></li>
+       <li>    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">View MARC in Catalog</a></li>
+       <li>    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">View ISBD in Catalog</a></li>
+</ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
new file mode 100644 (file)
index 0000000..936a3b7
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -0,0 +1,25 @@
+<!-- Begin Circulation Resident Search Box -->
+<div id="header_search">
+       <div id="circ_search">
+       <p class="tip">Enter patron card number or partial name:</p>
+       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+                       <label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Submit" type="submit" />
+       </form>
+       </div>  
+       <div id="catalog_search">
+       <p class="tip">Enter search keywords:</p>
+               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                        <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                               <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+                       <li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+                       </ul>   
+</div>
+<!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
index 80b9486..0ffac06 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
@@ -39,7 +39,7 @@
 .tabs-nav a {
     position: relative;
     top: 1px;
-    z-index: 2;
+    /*z-index: 2;*/
     white-space: nowrap; /* required in IE 6 */    
 }
 .tabs-nav .tabs-selected a {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 26a8e15..8958c5e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -10,7 +10,7 @@
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-b">
 
        <h1>Koha &rsaquo; Catalogue Maintenance</h1>
        <!-- TMPL_IF name="noitemsfound" -->
@@ -23,7 +23,7 @@
                <p>
         <label for="q">Search the catalog: </label>
         <input id="q" type="text"  size="25" name="q" class="focus" />
-        <input type="submit" value="search" />
+        <input type="submit" value="Search" />
         </p>
        </form>
 </div>
@@ -171,5 +171,4 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file