Moving new Site Tags functionality out of Tagcloud plugin and into core.

git-svn-id: http://code.elgg.org/elgg/trunk@6332 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 13 insertions, 1 deletions

diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index ced3f2f30..6e78fc6f0 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -14,6 +14,8 @@
  * @uses $vars['subtype'] Entity subtype
  */
 
+$context = get_context();
+
 if (!empty($vars['subtype'])) {
 	$subtype = "&entity_subtype=" . urlencode($vars['subtype']);
 } else {
@@ -34,7 +36,11 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 	$cloud = "";
 	$max = 0;
 	
-	$cloud .= '<h3>'.elgg_echo('tagcloud').'</h3>';
+	if ($context != 'tags') {
+		$title = elgg_echo('tagcloud');
+		$cloud .= "<h3>$title</h3>";
+	}
+	
 	$cloud .= '<div class="tagcloud">';
 
 	foreach($vars['tagcloud'] as $tag) {
@@ -59,6 +65,12 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 	
 	$cloud .= "$list</div>";
 	
+	if ($context != 'tags') {
+		$cloud .= '<p class="tags">';
+		$cloud .= "<a href=\"{$vars['url']}pg/tags\">All site tags</a>";
+		$cloud .= '</p>';
+	}
+	
 	$cloud .= elgg_view('tagcloud/extend');
 	
 	echo $cloud;