6 files changed, 25 insertions, 26 deletions
diff --git a/tpl/changetag.html b/tpl/changetag.html
index b0bd0d06..b22bddea 100644
--- a/tpl/changetag.html
+++ b/tpl/changetag.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
-<head>{include="includes"}</head>
+<head>{include="includes"}
+{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
+</head>
 <body onload="document.changetag.fromtag.focus();">
 <div id="pageheader">
        {include="page.header"}
@@ -12,5 +14,13 @@
 <script language="JavaScript">function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>
 </div>
 {include="page.footer"}
+{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
+<script language="JavaScript">
+$(document).ready(function()
+{
+    $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1});
+});
+</script>
+{/if}
 </body>
 </html>
 \ No newline at end of file
diff --git a/tpl/editlink.html b/tpl/editlink.html
index ad549137..4a2c30cc 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
-<head>{include="includes"}</head>
+<head>{include="includes"}
+{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
+</head>
 <body
 {if condition="$link.title==''"}onload="document.linkform.lf_title.focus();"
 {elseif condition="$link.description==''"}onload="document.linkform.lf_description.focus();"
@@ -30,5 +32,13 @@
        </div>
 </div>
 {include="page.footer"}
+{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
+<script language="JavaScript">
+$(document).ready(function()
+{
+    $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
+});
+</script>
+{/if}
 </body>
 </html>
 \ No newline at end of file
diff --git a/tpl/includes.html b/tpl/includes.html
index e0ad00d5..2b61f1e1 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -7,4 +7,3 @@
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
 <link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
 {if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
-{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
diff --git a/tpl/linklist.html b/tpl/linklist.html
index bce3fa9f..ddc38cb0 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -68,7 +68,6 @@
    {include="page.footer"} 
 <script language="JavaScript">
 // Remove any displayed QR-Code
 function remove_qrcode()
 { 
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 3aa47ba6..8e5869c5 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -7,24 +7,3 @@
 {if="isLoggedIn()"}
 <script language="JavaScript">function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
 {/if}
-{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
-<script language="JavaScript">
-$(document).ready(function()
-{
-    $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1});
-    $('#searchtags').autocomplete({source:'{$source}?ws=tags',minLength:1});
-    $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1});
-});
-</script>
-{/if}
-{if="empty($GLOBALS['disablejquery']) && isset($_GET['searchterm'])"}
-<script src="inc/jquery.highlight.js#"></script>
-<script language="JavaScript">
-$(document).ready(function()
-{
-        $('#linklist li').highlight("{$search_crits}");
-});
-</script>
-{/if}
-\ No newline at end of file
diff --git a/tpl/picwall.html b/tpl/picwall.html
index 631e0866..b78e2609 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -2,7 +2,9 @@
 <html>
 <head>{include="includes"}
 {if="empty($GLOBALS['disablejquery'])"} 
-        <script src="inc/jquery.lazyload.min.js#"></script>
+<script src="inc/jquery.min.js#"></script>
+<script src="inc/jquery-ui.min.js#"></script>
+<script src="inc/jquery.lazyload.min.js#"></script>
 {/if}
 </head>
 <body>