[Koha-patches] [PATCH] Bug 8241 - Remove stray references to YUI autocomplete

[Owen Leonard]

- Removing unused references to YUI assets in authorities/auth_finder.tt
- Removing unneeded call to autocomplete JS in help-top.inc and
  adding new jQuery dependencies.
- Minor HTML markup corrections to auth-finder-search.inc discovered
  in debugging the patch.
---
 .../prog/en/includes/auth-finder-search.inc        |   10 ++++------
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    4 ++--
 .../prog/en/modules/authorities/auth_finder.tt     |    4 ----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 81e410a..a6d55df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -89,7 +89,6 @@ $(document).ready(function(){
 </script>
 
 
-<span id="header_search">
 <form name="f" method="get" action="auth_finder.pl">
             <input type="hidden" name="op" value="do_search" />
             <input type="hidden" name="type" value="intranet" />
@@ -128,11 +127,11 @@ $(document).ready(function(){
                 </li>
 
                 <li>
-                    <label for="marclist">Anywhere</label>
+                    <label for="marclistanywhere">Anywhere</label>
                     <input type="hidden" name="marclist" value="any" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
-                    <select name="operator" id="marclist">
+                    <select name="operator" id="marclistanywhere">
                         <option value="contains">contains</option>
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
@@ -141,11 +140,11 @@ $(document).ready(function(){
                     <div id="yvaluecontainermarclist"></div>
                 </li>
                 <li>
-                    <label for="marclist">Heading match</label>
+                    <label for="marclistheading">Heading match</label>
                     <input type="hidden" name="marclist" value="match" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
-                    <select name="operator" id="marclist">
+                    <select name="operator" id="marclistheading">
                         <option value="contains">contains</option>
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
@@ -162,4 +161,3 @@ $(document).ready(function(){
         </li></ol></fieldset>
             <fieldset class="action"> <input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 </form>
-</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
index 13ec5cf..0c545a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
@@ -2,6 +2,7 @@
 <title>Online Help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" />
 <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
 [% IF ( intranetstylesheet ) %]
 <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
@@ -9,7 +10,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
 [% END %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ui.tabs.js"></script>
+<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery-ui.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script>
 <!-- local colors -->
 [% IF ( intranetcolorstylesheet ) %]
@@ -17,7 +18,6 @@
 [% END %]
 <!-- yui js --> 
 <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
-[% IF ( CircAutocompl ) %]<script type="text/javascript" src="[% yuipath %]/autocomplete/autocomplete-min.js"></script> [% END %]
 <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script> 
 <script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script> 
 <script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
index b67da76..b1d9971 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
@@ -4,10 +4,6 @@
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; } 
 </style>
-    <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
-    <script type="text/javascript" src="[% yuipath %]/datasource/datasource.js"></script>
-    <script type="text/javascript" src="[% yuipath %]/autocomplete/autocomplete-min.js"></script>
-
 
 </head>
 <body id="auth_auth_finder" class="auth">
-- 
1.7.9.5