Adding jquery as default js library and staff-global.js for global js functions. Converting form field focus scripts to jquery syntax (use class="focus" for auto-focusing form fields)

Signed-off-by: Chris Cormack <crc@liblime.com>
16 years ago · d3d5fadb43
13 changed files with 44 additions and 61 deletions
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@ -21,7 +21,8 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/<!-- TMPL_VAR NAME="widget" -->" />
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
-
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/staff-global.js"></script>
 <!-- TMPL_IF NAME="js_libs" -->
 <!-- TMPL_LOOP NAME="js_libs" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/<!-- TMPL_VAR NAME="lib" -->"></script>
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@ -0,0 +1,6 @@
+// staff-global.js
+
+ $(document).ready(function() {
+ 	$(".focus").focus();
+ });
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@ -1,9 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/JavaScript">
-    document.findsupplier.supplier.focus();
-</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@ -23,13 +20,13 @@
    <!-- TMPL_IF name="nobudget" -->
        <span class="problem">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a> in parameters</span>
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
-            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
+            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" class="focus" />
            <input type="submit" value="Search" />
            </p>
        </form>
    <!-- TMPL_ELSE -->
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
-            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
+            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" class="focus" />
            <input type="submit" value="Search" />
            </p>
        </form>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@ -1,27 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue ISBD Detail</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
-
-<h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
-
-<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
-
-	<div id="catalogue_ISBDdetail">
-		<!-- TMPL_VAR NAME="ISBD" -->
-	</div>
-</div>
-
 <script language="javascript" type="text/javascript">
 function Dopop(link) {
    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
@ -49,6 +28,28 @@ function confirm_deletion(count) {
 }

 </script>
+</head>
+<body>
+
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
+
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+
+	<div id="catalogue_ISBDdetail">
+		<!-- TMPL_VAR NAME="ISBD" -->
+	</div>
+</div>
+
+

 </div>
 </div>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@ -2,8 +2,6 @@
 <title>Koha &rsaquo; Catalogue &rsaquo; Advanced Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript" language="JavaScript">
-	document.getElementById('search_box').focus(); // auto focus on the search input.
-	
 	/**
 	 *  Function add_field();
 	 *  This function allows to display a new field to search.
@ -104,7 +102,7 @@
    <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>

        </select>
-        <input id="search_box" type="text" size="30" name="q" title="Enter search terms" value="" />
+        <input id="search_box" type="text" size="30" name="q" title="Enter search terms" value="" class="focus" />
        <!-- TMPL_IF NAME="expanded_options" -->
            <!-- TMPL_IF NAME="add_field" -->
                <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@ -3,10 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
-$.blockUI(); 
-$(document).ready(function(){
-	$.unblockUI();
-});
 function _(s) { return s } // dummy function for gettext

 function confirmnotdup(){
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@ -1,9 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/JavaScript">
-    document.search.q.focus();
-</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@ -25,7 +22,7 @@
 	<form name="search" action="addbooks.pl">
 		<p>
        <label for="q">Search the catalog: </label>
-        <input id="q" type="text"  size="25"   name="q" />
+        <input id="q" type="text"  size="25" name="q" class="focus" />
        <input type="submit" value="search" />
        </p>
 	</form>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@ -136,7 +136,7 @@
            </tr>
            <tr>
                <th scope="row">Enter barcode</th>
-                <td><input name="barcode" size="15" /></td>
+                <td><input name="barcode" size="15" class="focus" /></td>
            </tr>
        </table>
        <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@ -53,12 +53,6 @@
        }
    }

-    <!-- TMPL_IF NAME="borrowernumber" -->
-        document.mainform.barcode.focus(); // set the focus to the barcode entry.
-    <!-- TMPL_ELSE -->
-        document.mainform.findborrower.focus(); // set the focus to te form to search a borrower
-    <!-- /TMPL_IF -->
-
 </script>
 </head>
 <body>
@ -178,7 +172,7 @@

    <p>
    <label for="findborrower">Enter patron card number or partial name: </label>
-    <input id="findborrower" name="findborrower" type="text" size="40" />
+    <input id="findborrower" name="findborrower" type="text" size="40" class="focus" />
    </p>

    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
@ -307,7 +301,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
    <legend>Checkout an item</legend>

    <p>
-    <label for="barcode">Enter item barcode: </label><input type="text" name="barcode" size="14" />
+    <label for="barcode">Enter item barcode: </label><input type="text" name="barcode" class="focus" size="14" />
    
        <!-- RESULT OF ISSUING REQUEST -->
        <!-- TMPL_IF NAME="IMPOSSIBLE" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@ -1,9 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Returns <!-- TMPL_VAR Name="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/JavaScript" language="JavaScript">
-	document.mainform.barcode.focus();
-</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@ -190,7 +187,7 @@
            <fieldset>
            <legend>Enter item barcode</legend>
            <p>
-                <input name="barcode" id="barcode" size="14" maxlength="14" />
+                <input name="barcode" id="barcode" size="14" maxlength="14" class="focus" />
                <input type="submit" value="Submit" />
            </p>
            <!-- TMPL_LOOP Name="inputloop" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@ -8,7 +8,6 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
-    document.f.date.focus();
    
    /**
     *  Function CheckForm
@ -53,7 +52,7 @@
        <input id="issn" type="text" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" /></p>

        <p><label for="date">with expiration date before</label>
-        <input id="date" type="text" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" />
+        <input id="date" type="text" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" class="focus" />
            <script type="text/javascript">
                Calendar.setup(
                 {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
@ -2,7 +2,7 @@
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->

 <!-- TMPL_UNLESS name="popup" -->
-	<h1 class="serial">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
+	<h1>Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
 	<p>
 	<a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial">Back to biblio</a>
 <!-- /TMPL_UNLESS -->
@ -17,13 +17,13 @@
 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
 		<table>
 			<tr>
-				<th class="serial">Information
+				<th>Information
 				</th>
-				<th class="serial">Date
+				<th>Date
 				</th>
-				<th class="serial">Number
+				<th>Number
 				</th>
-				<th class="serial">Status
+				<th>Status
 				</th>
 			</tr>
 			<!-- TMPL_LOOP Name="serials" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl
@ -1,9 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Z39.50 Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<style type="text/css"> 
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet.css);
-</style>
 <script language="javascript" type="text/javascript">
    function Import(GetThisOne) {
        opener.document.location= "../cataloguing/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;