Merge branch 'mysql4-utf8' of git://github.com/takuya-o/scuttle

[scuttle] / templates / bookmarks.tpl.php

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 368ec8b87ebcf1da90c3562beda37b85910a47fc..c79655ea229d87fb2c6e2ed31423275583beaf19 100644 (file)
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -1,31 +1,22 @@
 <?php
 <?php

-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');

 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 $this->includeTemplate($GLOBALS['top_include']);
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 $this->includeTemplate($GLOBALS['top_include']);
 

-include('search.inc.php');
+include 'search.inc.php';

 if (count($bookmarks) > 0) {
 ?>
 
 if (count($bookmarks) > 0) {
 ?>
 

-<script type="text/javascript">
-window.onload = playerLoad;
-</script>
-

 <p id="sort">
 <p id="sort">

-    <?php echo T_("Sort by:"); ?>
-    <a href="?sort=date_desc"><?php echo T_("Date"); ?></a><span> / </span>
-    <a href="?sort=title_asc"><?php echo T_("Title"); ?></a><span> / </span>
-    <?php
-    if (!isset($hash)) {
-    ?>
+  <?php echo T_("Sort by:"); ?>
+  <a href="?sort=date_desc"><?php echo T_("Date"); ?></a><span> / </span>
+  <a href="?sort=title_asc"><?php echo T_("Title"); ?></a><span> / </span>
+  <?php if (!isset($hash)): ?>

     <a href="?sort=url_asc"><?php echo T_("URL"); ?></a>
     <a href="?sort=url_asc"><?php echo T_("URL"); ?></a>

-    <?php
-    }
-    ?>
+  <?php endif; ?>

 </p>
 </p>

-

 <ol<?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks">
 
     <?php
 <ol<?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks">
 
     <?php