From: Benjamin Mako Hill Date: Sun, 8 Apr 2012 19:21:20 +0000 (-0400) Subject: Merge branch 'autocomplete-tags' X-Git-Url: https://projects.mako.cc/source/scuttle/commitdiff_plain/050b5adfe71a4d515996dcb24dcdf070feb014bb?ds=inline;hp=-c Merge branch 'autocomplete-tags' --- 050b5adfe71a4d515996dcb24dcdf070feb014bb diff --combined templates/editbookmark.tpl.php index fbb21bd,16b56c7..2304134 --- a/templates/editbookmark.tpl.php +++ b/templates/editbookmark.tpl.php @@@ -31,12 -31,12 +31,12 @@@ switch ($row['bStatus']) - + - + ← @@@ -69,7 -69,7 +69,7 @@@ @@@ -108,4 -108,4 +108,4 @@@ document.write('<\/ul>') includeTemplate($GLOBALS['bottom_include']); -?> +?> diff --combined templates/top.inc.php index 390fbf3,d7a6731..6a1bdb8 --- a/templates/top.inc.php +++ b/templates/top.inc.php @@@ -5,9 -5,8 +5,8 @@@ <?php echo filter($GLOBALS['sitename'] . (isset($pagetitle) ? ': ' . $pagetitle : '')); ?> - - + - - - - + + + @@@ -41,11 -39,7 +39,11 @@@ if (isset($_GET['popup'])) '. $subtitle ."\n"; + echo '

'. $subtitle; + if (isset($total)) { + echo " (" . $total . ")"; + } + echo "

\n"; } if (isset($error)) { echo '

'. $error ."

\n";