Fixes #2980: DRY'ed up all plugins to use elgg_view_icon instead of generating their own html

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

2 files changed, 7 insertions, 5 deletions

diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 329119a6b..6742d9954 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -55,10 +55,12 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 	}
 		
 	if ($context != 'tags') {
-		$text = elgg_echo('tagcloud:allsitetags');
 		$cloud .= '<p class="small">';
-		$cloud .= '<span class="elgg-icon elgg-icon-tag"></span>';
-		$cloud .= "<a href=\"" . elgg_get_site_url() . "pg/tags\">$text</a>";
+		$cloud .= elgg_view_icon('tag');
+		$cloud .= elgg_view('output/url', array(
+			'href' => 'pg/tags', 
+			'text' => elgg_echo('tagcloud:allsitetags'),
+		));
 		$cloud .= '</p>';
 	}
 	
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 76145276c..2af4c2757 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -33,7 +33,7 @@ if (!empty($vars['tags'])) {
 	}
 
 	echo '<div>';
-	echo '<span class="elgg-icon elgg-icon-tag"></span>';
+	echo elgg_view_icon('tag');
 	echo '<ul class="elgg-tags">';
 	foreach($vars['tags'] as $tag) {
 		if (!empty($vars['type'])) {
@@ -44,7 +44,7 @@ if (!empty($vars['tags'])) {
 		$url = elgg_get_site_url() . 'pg/search/?q=' . urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}";
 		if (is_string($tag)) {
 			echo '<li>';
-			echo "<a rel=\"tag\" href=\"$url\">" . htmlspecialchars($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+			echo elgg_view('output/url', array('href' => $url, 'text' => $tag, 'rel' => 'tag'));
 			echo '</li>';
 		}
 	}