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, 3 insertions, 2 deletions

diff --git a/views/default/navigation/menu/metadata.php b/views/default/navigation/menu/metadata.php
index 3ce3573b9..2685a9582 100644
--- a/views/default/navigation/menu/metadata.php
+++ b/views/default/navigation/menu/metadata.php
@@ -39,7 +39,7 @@ if ($entity->canEdit() && $handler) {
 	$delete_url = "action/$handler/delete?guid={$entity->getGUID()}";
 	$delete_link = elgg_view('output/confirmlink', array(
 		'href' => $delete_url,
-		'text' => '<span class="elgg-icon elgg-icon-delete"></span>',
+		'text' => elgg_view_icon('delete'),
 		'title' => elgg_echo('delete'),
 		'confirm' => elgg_echo('deleteconfirm'),
 		'text_encode' => false,
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 706e56fe5..0b3a47a62 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -13,8 +13,9 @@ foreach ($vars['menu']['default'] as $menu_item) {
 
 if (isset($vars['menu']['more'])) {
 	$more = elgg_echo('more');
+	$arrow = elgg_view_icon('arrow-s');
 	echo '<li class="elgg-more">';
-	echo "<a class='subnav' title=\"$more\"><span class=\"elgg-icon elgg-icon-arrow-s\"></span>$more</a>";
+	echo "<a class='subnav' title=\"$more\">$arrow $more</a>";
 	echo '<ul>';
 	foreach ($vars['menu']['more'] as $menu_item) {
 		echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));