From 3ea58cbe4968d08e3653cf8d712e55f5e780d703 Mon Sep 17 00:00:00 2001
From: Nick Clemens <Nick@quecheelibrary.org>
Date: Sat, 7 Jun 2014 11:18:13 -0400
Subject: [PATCH] Bug 11905 - when editing item, cursor is positioning in
 search box and not to item

cataloging-search.inc had embedded js to set focus into the search box.
This patch removes that js from the cataloging-search.inc and adds it into
addbooks.tt and merge.tt to set focus on those pages and allow focus to be set
to the edit items form on additem.tt

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../intranet-tmpl/prog/en/includes/cataloging-search.inc      | 3 ---
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt     | 4 ++++
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index ba878ced2d..ba1b4c92d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,6 +1,3 @@
-<script>$(document).ready(function(){
-	$("input[name=q]:eq(0)").focus();
-});</script>
 
 <div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Cataloging Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 4134cd36fe..5309f0cd35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -6,6 +6,9 @@
     //<![CDATA[
 
      $(document).ready(function() {
+        //Set focus to cataloging search
+        $("input[name=q]:eq(0)").focus();
+
         $("#z3950search").click(function(){
             PopupZ3950("");
             return false;
@@ -32,6 +35,7 @@
         [% END %]
         return strQuery;
     }
+
     //]]>
 </script>
 </head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index 5ef6c99a63..2e306fd26e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -25,6 +25,9 @@ $(document).ready(function(){
     tagslib = [];
     $.getJSON("/cgi-bin/koha/cataloguing/merge_ajax.pl", {frameworkcode : "[% framework %]" }, function(json) {
         tagslib = json;
+
+    //Set focus to cataloging search
+    $("input[name=q]:eq(0)").focus();
     });
 
     // Creating tabs
-- 
2.39.5