Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 31 insertions, 0 deletions

diff --git a/data/templates/default/tags.tpl.php b/data/templates/default/tags.tpl.php
new file mode 100644
index 0000000..d6259cc
--- /dev/null
+++ b/data/templates/default/tags.tpl.php
@@ -0,0 +1,31 @@
+<?php
+$this->includeTemplate($GLOBALS['top_include']);
+?>
+
+<?php
+if ($tags && count($tags) > 0) {
+?>
+
+<p id="sort">
+    <?php echo T_("Sort by:"); ?>
+    <a href="?sort=alphabet_asc"><?php echo T_("Alphabet"); ?></a><span> / </span>
+    <a href="?sort=popularity_asc"><?php echo T_("Popularity"); ?></a>
+</p>
+<p class="tags">
+
+<?php
+$contents = '';
+foreach ($tags as $row) {
+    $entries = T_ngettext('bookmark', 'bookmarks', $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";
+?>
+
+</p>
+
+<?php
+}
+$this->includeTemplate('sidebar.tpl');
+$this->includeTemplate($GLOBALS['bottom_include']);
+?>