Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 28 insertions, 0 deletions

diff --git a/data/templates/default/sidebar.block.common.php b/data/templates/default/sidebar.block.common.php
new file mode 100644
index 0000000..951ed80
--- /dev/null
+++ b/data/templates/default/sidebar.block.common.php
@@ -0,0 +1,28 @@
+<?php
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$commonTags =& $b2tservice->getRelatedTagsByHash($hash);
+$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc');
+
+if ($commonTags && count($commonTags) > 0) {
+	?>
+
+<h2><?php echo T_('Popular Tags'); ?></h2>
+<div id="common">
+<p class="tags"><?php
+$contents = '';
+
+if(strlen($user)==0) {
+	$cat_url = createURL('tags', '%2$s');
+}
+
+foreach ($commonTags 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>
+</div>
+
+<?php
+}
+?>