put jquery+jstree into top template since we need it most times

diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php
index ac864dc782589c5a9351fee1478e183fe9eb12e4..517705ed624efb4ffbb936fba8437e1d76fe1f28 100644 (file)
--- a/data/templates/sidebar.block.linked.php
+++ b/data/templates/sidebar.block.linked.php
@@ -31,8 +31,6 @@ if ($editingMode) {
 }
 ?>
  <div id="related-content" />
-<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-1.4.2.js"></script>
-<script type="text/javascript" src="<?php echo ROOT ?>js/jquery.jstree.js"></script>
 <script type="text/javascript"><![CDATA[
 jQuery("#related-content")
 .jstree({

diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php
index d60882144f7deebdb01f1eb0bf9b143153fe9dd3..8a71527325f61492ca07363337c458881900e2f6 100644 (file)
--- a/data/templates/sidebar.block.menu2.php
+++ b/data/templates/sidebar.block.menu2.php
@@ -1,5 +1,3 @@
-<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-1.4.2.js"></script>
-<script type="text/javascript" src="<?php echo ROOT ?>js/jquery.jstree.js"></script>
 <?php
 require_once('sidebar.linkedtags.inc.php');
 

diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php
index c3cbc5d01c44afcd8b5c249c5402ff51e7f075fc..ebb2bb6f494a0f490072c5b7b73f107ae98deb62 100644 (file)
--- a/data/templates/top.inc.php
+++ b/data/templates/top.inc.php
@@ -19,6 +19,8 @@ if (isset($rsschannels)) {
 ?>
 
 <?php if (isset($loadjs)) :?>
+  <script type="text/javascript" src="<?php echo ROOT ?>js/jquery-1.4.2.js"></script>
+  <script type="text/javascript" src="<?php echo ROOT ?>js/jquery.jstree.js"></script>
   <script type="text/javascript" src="<?php echo ROOT ?>jsScuttle.php"></script>
 <?php endif ?>