Merge remote-tracking branch 'gh-takuya-o/patch-mysqli-bookmark-duplicate'

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

index 68786224f881dcc5fcd2dabfc548ab1093187b9a..6a1bdb8e9fa8440e2b7accb28354c72b7fac3006 100644 (file)
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -5,9 +5,8 @@
      <title><?php echo filter($GLOBALS['sitename'] . (isset($pagetitle) ? ': ' . $pagetitle : '')); ?></title>
      <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']; ?>includes/smoothness/jquery-ui-1.8.9.custom.css" />
      <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++) {
@@ -15,10 +14,9 @@
      }
      ?>
      <?php if ($loadjs): ?>
-        <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-1.5.min.js"></script>
-        <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>includes/jquery-ui-1.8.9.min.js"></script>
-       <script type="text/javascript" src="<?php echo $GLOBALS['root']; ?>jsScuttle.php"></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>
  <body>
@@ -41,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";