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 44b31df6599a29c2cafde6e7016955b645d9dae7..85c965d6d37f5baf4e8499e71c49cd9ec2ac897f 100644 (file)
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -13,7 +13,7 @@
     }
     ?>
     <?php if ($loadjs): ?>
     }
     ?>
     <?php if ($loadjs): ?>

-      <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.4.2.min.js"></script>
+      <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>
       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
     <?php endif; ?>
 </head>


@@ -21,7 +21,7 @@
 
 <?php
 $headerstyle = '';
 
 <?php
 $headerstyle = '';

-if(isset($_GET['popup'])) {
+if (isset($_GET['popup'])) {

     $headerstyle = ' class="popup"';
 }
 ?>
     $headerstyle = ' class="popup"';
 }
 ?>


@@ -29,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
 <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');
     }
     ?>
         $this->includeTemplate('toolbar.inc');
     }
     ?>