3 files changed, 43 insertions, 12 deletions
diff --git a/views/default/output/access.php b/views/default/output/access.php
index 811948323..91c5c721e 100644
--- a/views/default/output/access.php
+++ b/views/default/output/access.php
@@ -11,6 +11,7 @@ if (isset($vars['entity']) && elgg_instanceof($vars['entity'])) {
 	$access_id = $vars['entity']->access_id;
 	$access_class = 'elgg-access';
 	$access_id_string = get_readable_access_level($access_id);
+	$access_id_string = htmlentities($access_id_string, ENT_QUOTES, 'UTF-8');
 
 	// if within a group or shared access collection display group name and open/closed membership status
 	// @todo have a better way to do this instead of checking against subtype / class.
@@ -35,5 +36,7 @@ if (isset($vars['entity']) && elgg_instanceof($vars['entity'])) {
 		$access_class .= ' elgg-access-private';
 	}
 
-	echo "<span class=\"$access_class\">$access_id_string</span>";
+	$help_text = elgg_echo('access:help');
+
+	echo "<span title=\"$help_text\" class=\"$access_class\">$access_id_string</span>";
 }
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 22b6cf49d..a212becd8 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -47,9 +47,15 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 		if ($size < 100) {
 			$size = 100;
 		}
-		$url = elgg_get_site_url()."search?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
-		$url = elgg_format_url($url);
-		$cloud .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
+		$url = "search?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
+
+		$cloud .= elgg_view('output/url', array(
+			'text' => $tag->tag,
+			'href' => $url,
+			'style' => "font-size: $size%;",
+			'title' => "$tag->tag ($tag->total)",
+			'rel' => 'tag'
+		));
 	}
 	
 	$cloud .= elgg_view('tagcloud/extend');
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 6dedfacc7..3082dd41e 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -7,6 +7,9 @@
  * @uses $vars['type']    The entity type, optional
  * @uses $vars['subtype'] The entity subtype, optional
  * @uses $vars['entity']  Optional. Entity whose tags are being displayed (metadata ->tags)
+ * @uses $vars['list_class'] Optional. Additional classes to be passed to <ul> element
+ * @uses $vars['item_class'] Optional. Additional classes to be passed to <li> elements
+ * @uses $vars['icon_class'] Optional. Additional classes to be passed to tags icon image
  */
 
 if (isset($vars['entity'])) {
@@ -38,9 +41,19 @@ if (!empty($vars['tags'])) {
 		$vars['tags'] = array($vars['tags']);
 	}
 
-	echo '<div>';
-	echo elgg_view_icon('tag');
-	echo '<ul class="elgg-tags">';
+	$list_class = "elgg-tags";
+	if (isset($vars['list_class'])) {
+		$list_class = "$list_class {$vars['list_class']}";
+	}
+
+	$item_class = "elgg-tag";
+	if (isset($vars['item_class'])) {
+		$item_class = "$item_class {$vars['item_class']}";
+	}
+
+	$icon_class = elgg_extract('icon_class', $vars);
+	$list_items = '<li>' . elgg_view_icon('tag', $icon_class) . '</li>';
+
 	foreach($vars['tags'] as $tag) {
 		if (!empty($vars['type'])) {
 			$type = "&type={$vars['type']}";
@@ -49,11 +62,20 @@ if (!empty($vars['tags'])) {
 		}
 		$url = elgg_get_site_url() . 'search?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
 		if (is_string($tag)) {
-			echo '<li>';
-			echo elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
-			echo '</li>';
+			$list_items .= "<li class=\"$item_class\">";
+			$list_items .= elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
+			$list_items .= '</li>';
 		}
 	}
-	echo '</ul>';
-	echo '</div>';
+
+	$list = <<<___HTML
+		<div class="clearfix">
+			<ul class="$list_class">
+				$list_items
+			</ul>
+		</div>
+___HTML;
+
+	echo $list;
 }
+