Merge branch 'autocomplete-tags'

[scuttle] / templates / top.inc.php

diff --git a/templates/top.inc.php b/templates/top.inc.php
index 44b31df6599a29c2cafde6e7016955b645d9dae7..6a1bdb8e9fa8440e2b7accb28354c72b7fac3006 100644 (file)
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -6,6 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="icon" type="image/png" href="<?php echo $GLOBALS['root']; ?>icon.png" />
     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['root']; ?>scuttle.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['root']; ?>jquery-ui-1.8.9.autocomplete.css" />
     <?php
     $size = count($rsschannels);
     for ($i = 0; $i < $size; $i++) {
@@ -13,7 +14,8 @@
     }
     ?>
     <?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']; ?>includes/jquery-ui-1.8.9.autocomplete.min.js"></script>
       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></script>
     <?php endif; ?>
 </head>
@@ -21,7 +23,7 @@
 
 <?php
 $headerstyle = '';
-if(isset($_GET['popup'])) {
+if (isset($_GET['popup'])) {
     $headerstyle = ' class="popup"';
 }
 ?>
@@ -29,7 +31,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');
     }
     ?>
@@ -37,7 +39,11 @@ if(isset($_GET['popup'])) {
 
 <?php
 if (isset($subtitle)) {
-    echo '<h2>'. $subtitle ."</h2>\n";
+    echo '<h2>'. $subtitle;
+    if (isset($total)) {
+        echo " (" . $total . ")";
+    }
+    echo "</h2>\n";
 }
 if (isset($error)) {
     echo '<p class="error">'. $error ."</p>\n";