diff options
Diffstat (limited to 'data/templates/default')
| -rw-r--r-- | data/templates/default/bookmarks.tpl.php | 18 | ||||
| -rw-r--r-- | data/templates/default/dynamictags.inc.php | 2 | ||||
| -rw-r--r-- | data/templates/default/sidebar.block.popular.php | 2 | ||||
| -rw-r--r-- | data/templates/default/sidebar.block.recent.php | 2 | ||||
| -rw-r--r-- | data/templates/default/tags.tpl.php | 2 | ||||
| -rw-r--r-- | data/templates/default/top.inc.php | 1 |
6 files changed, 20 insertions, 7 deletions
diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php index 818eea0..20b5336 100644 --- a/data/templates/default/bookmarks.tpl.php +++ b/data/templates/default/bookmarks.tpl.php @@ -112,6 +112,7 @@ if($userservice->isLoggedOn()) { window.onload = playerLoad; </script> +<?php if (count($bookmarks) > 1) { ?> <p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?> <?php $titleArrow = ''; @@ -162,6 +163,7 @@ default: <a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a> <span>/</span> <?php } ?> +<?php } ?> <?php if ($currenttag!= '') { @@ -275,6 +277,12 @@ if ($currenttag!= '') { break; } + // Add username in case bookmark was loaded using getBookmark() + if (!isset($row['username']) && isset($row['uId'])) { + $userinfo = $userservice->getObjectUser($row['uId']); + $row['username'] = $userinfo->username; + } + $cats = ''; $tagsForCopy = ''; $tags = $row['tags']; @@ -310,12 +318,13 @@ if ($currenttag!= '') { $update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>'; // User attribution - $copy = ' ' . T_('by') . ' '; if ($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username'] ) { + $copy = ' ' . T_('by') . ' '; $copy .= T_('you'); - } else { + } else if (isset($row['username'])) { + $copy = ' ' . T_('by') . ' '; $copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">' . SemanticScuttle_Model_UserArray::getName($row) . '</a>'; @@ -506,6 +515,7 @@ if ($currenttag!= '') { . $edit . "\n" . $update . "\n" . $cacheLink ."\n" + . ' | <a href="/permalink/'. $row['bId'] . '">Permalink</a>' ."\n" . " </div>\n"; echo $privateNoteField != '' ? ' <div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n" @@ -524,8 +534,10 @@ if ($currenttag!= '') { if(getPerPageCount($currentUser)>7) { echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>'; } - echo $pagesBanner; // display previous and next links pages + RSS link + if (isset($bookmarks) && count($bookmarks) > 1) { + echo $pagesBanner; // display previous and next links pages + RSS link + } } else { echo '<p class="error">'.T_('No bookmarks available').'</p>'; diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php index c2ab6d4..f731048 100644 --- a/data/templates/default/dynamictags.inc.php +++ b/data/templates/default/dynamictags.inc.php @@ -53,7 +53,7 @@ JS; $taglist = ''; foreach (array_keys($tagsCloud) as $key) { $row = $tagsCloud[$key]; - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $taglist .= '<span' . ' title="'. $row['bCount'] . ' ' . $entries . '"' . ' style="font-size:' . $row['size'] . '"' diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php index 842aa60..83ad2fb 100644 --- a/data/templates/default/sidebar.block.popular.php +++ b/data/templates/default/sidebar.block.popular.php @@ -31,7 +31,7 @@ if ($popularTags && count($popularTags) > 0) { } foreach ($popularTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php index 80ae71c..1deae27 100644 --- a/data/templates/default/sidebar.block.recent.php +++ b/data/templates/default/sidebar.block.recent.php @@ -26,7 +26,7 @@ if ($recentTags && count($recentTags) > 0) { } foreach ($recentTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."</p>\n"; diff --git a/data/templates/default/tags.tpl.php b/data/templates/default/tags.tpl.php index d6259cc..dce5e1c 100644 --- a/data/templates/default/tags.tpl.php +++ b/data/templates/default/tags.tpl.php @@ -16,7 +16,7 @@ if ($tags && count($tags) > 0) { <?php $contents = ''; foreach ($tags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php index 55be4a7..79cc2e2 100644 --- a/data/templates/default/top.inc.php +++ b/data/templates/default/top.inc.php @@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> + <meta name="viewport" content="width=device-width,initial-scale=1"> <title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title> <link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>" /> <link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>" /> |