From fa0dbc7f8a34597345f7939ca9914438624c3cee Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 5 Nov 2011 17:09:34 -0400
Subject: Fixes #3567 standardized classes for icons

---
 mod/developers/views/default/theme_preview/icons/avatars.php      | 4 ++--
 mod/file/views/default/icon/object/file.php                       | 8 +++++++-
 mod/groups/views/default/groups/invitationrequests.php            | 2 +-
 mod/groups/views/default/groups/membershiprequests.php            | 2 +-
 .../views/default/notifications/subscriptions/forminternals.php   | 2 +-
 mod/profile/views/default/profile/owner_block.php                 | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'mod')

diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
index cbce5bc7d..f50a6b70d 100644
--- a/mod/developers/views/default/theme_preview/icons/avatars.php
+++ b/mod/developers/views/default/theme_preview/icons/avatars.php
@@ -18,7 +18,7 @@
 		<?php
 			foreach ($sizes as $size) {
 				echo '<td>';
-				echo elgg_view_entity_icon($user, $size, array('hover' => false));
+				echo elgg_view_entity_icon($user, $size, array('use_hover' => false));
 				echo '</td>';
 			}
 		?>
@@ -28,7 +28,7 @@
 		<?php
 			foreach ($sizes as $size) {
 				echo '<td>';
-				echo elgg_view_entity_icon($group, $size, array('hover' => false));
+				echo elgg_view_entity_icon($group, $size, array('use_hover' => false));
 				echo '</td>';
 			}
 		?>
diff --git a/mod/file/views/default/icon/object/file.php b/mod/file/views/default/icon/object/file.php
index 51a4469e9..a3190310b 100644
--- a/mod/file/views/default/icon/object/file.php
+++ b/mod/file/views/default/icon/object/file.php
@@ -5,6 +5,7 @@
  * @uses $vars['entity']     The entity the icon represents - uses getIconURL() method
  * @uses $vars['size']       topbar, tiny, small, medium (default), large, master
  * @uses $vars['href']       Optional override for link
+ * @uses $vars['img_class']  Optional CSS class added to img
  * @uses $vars['link_class'] Optional CSS class added to link
  */
 
@@ -25,8 +26,13 @@ if (isset($vars['href'])) {
 }
 
 $class = '';
+if (isset($vars['img_class'])) {
+	$class = $vars['img_class'];
+}
 if ($entity->thumbnail) {
-	$class = 'class="elgg-photo"';
+	$class = "class=\"elgg-photo $class\"";
+} else if ($class) {
+	$class = "class=\"$class\"";
 }
 
 $img_src = $entity->getIconURL($vars['size']);
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index e644b6bdc..94dbdf1f2 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -10,7 +10,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 	echo '<ul class="elgg-list">';
 	foreach ($vars['invitations'] as $group) {
 		if ($group instanceof ElggGroup) {
-			$icon = elgg_view_entity_icon($group, 'tiny', array('hover' => 'true'));
+			$icon = elgg_view_entity_icon($group, 'tiny', array('use_hover' => 'true'));
 
 			$group_title = elgg_view('output/url', array(
 				'href' => $group->getURL(),
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index bc6d9af5a..9cd28262f 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -10,7 +10,7 @@ if (!empty($vars['requests']) && is_array($vars['requests'])) {
 	$user = elgg_get_logged_in_user_entity();
 	echo '<ul class="elgg-list">';
 	foreach ($vars['requests'] as $user) {
-		$icon = elgg_view_entity_icon($user, 'tiny', array('hover' => 'true'));
+		$icon = elgg_view_entity_icon($user, 'tiny', array('use_hover' => 'true'));
 
 		$user_title = elgg_view('output/url', array(
 			'href' => $user->getURL(),
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index a7fbec2fd..e89ce02be 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -234,7 +234,7 @@ END;
 	<td class="namefield">
 		<a href="<?php echo $friend->getURL(); ?>">
 <?php
-			echo elgg_view_entity_icon($friend, 'tiny', array('hover' => false));
+			echo elgg_view_entity_icon($friend, 'tiny', array('use_hover' => false));
 ?>
 		</a>
 		<p class="namefieldlink">
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index 05cb41a14..35199726a 100644
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -11,7 +11,7 @@ if (!$user) {
 	return TRUE;
 }
 
-$icon = elgg_view_entity_icon($user, 'large', array('hover' => 'true'));
+$icon = elgg_view_entity_icon($user, 'large', array('use_hover' => 'true'));
 
 // grab the actions and admin menu items from user hover
 $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
-- 
cgit v1.2.3