X-Git-Url: https://projects.mako.cc/source/scuttle/blobdiff_plain/c7f63c8b9b12efd7b3c10b9f80cda06eaf32068f..1b57a8783f47606807c879bff785ab64b6860939:/templates/top.inc.php?ds=sidebyside

diff --git a/templates/top.inc.php b/templates/top.inc.php
index 44b31df..a881f56 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -6,14 +6,20 @@
     <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);
+    if (isset($rsschannels)) {
+        $size = count($rsschannels);
+    } else {
+        $size = 0;
+    }
     for ($i = 0; $i < $size; $i++) {
         echo '<link rel="alternate" type="application/rss+xml" title="'. $rsschannels[$i][0] .'" href="'. $rsschannels[$i][1] .'" />';
     }
     ?>
-    <?php if ($loadjs): ?>
-      <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.4.2.min.js"></script>
+    <?php if (isset($loadjs) && $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']; ?>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 +27,7 @@
 
 <?php
 $headerstyle = '';
-if(isset($_GET['popup'])) {
+if (isset($_GET['popup'])) {
     $headerstyle = ' class="popup"';
 }
 ?>
@@ -29,7 +35,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 +43,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";