Revert Thomas Niepraschk's tag autocomplete feature (3 commits)

[scuttle] / templates / top.inc.php
diff --git a/templates/top.inc.php b/templates/top.inc.php

index 64213fd25fa5303a6d619574a4588d38ce223bd6..85c965d6d37f5baf4e8499e71c49cd9ec2ac897f 100644 (file)
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -11,16 +11,17 @@
      for ($i = 0; $i < $size; $i++) {
          echo '<link rel="alternate" type="application/rss+xml" title="'. $rsschannels[$i][0] .'" href="'. $rsschannels[$i][1] .'" />';
      }
-    if ($loadjs) {
-        echo '<script type="text/javascript" src="'. $GLOBALS['root'] .'jsScuttle.php"></script>';
-    }
      ?>
+    <?php if ($loadjs): ?>
+      <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.4.4.min.js"></script>
+      <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
+    <?php endif; ?>
  </head>
  <body>
  
  <?php
  $headerstyle = '';
-if(isset($_GET['popup'])) {
+if (isset($_GET['popup'])) {
      $headerstyle = ' class="popup"';
  }
  ?>
@@ -28,7 +29,7 @@ if(isset($_GET['popup'])) {
  <div id="header"<?php echo $headerstyle; ?>>
      <h1><a href="<?php echo $GLOBALS['root']; ?>"><?php echo $GLOBALS['sitename']; ?></a></h1>
      <?php
-    if(!isset($_GET['popup'])) {
+    if (!isset($_GET['popup'])) {
          $this->includeTemplate('toolbar.inc');
      }
      ?>