diff options
Diffstat (limited to 'views/default/profile')
| -rw-r--r-- | views/default/profile/hover.php | 63 | ||||
| -rw-r--r-- | views/default/profile/icon.php | 74 |
2 files changed, 7 insertions, 130 deletions
diff --git a/views/default/profile/hover.php b/views/default/profile/hover.php deleted file mode 100644 index 85d6912ba..000000000 --- a/views/default/profile/hover.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php - - -$user = $vars['entity']; -$username = $vars['username']; -$name = $vars['name']; - -?> - -<div class="avatar_menu_button"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" border="0" width="15" height="15" /></div> -<div class="sub_menu"> - <h3 class="displayname"> - <a href="<?php echo $user->getURL(); ?>"> - <?php echo $name; ?> - <span class="username"> - <?php echo "@" . $username; ?> - </span> - </a> - </h3> - <ul class='sub_menu_list'> -<?php -if (isloggedin()) { - // if not looking at your own avatar menu - if ($user->getGUID() != get_loggedin_userid()) { - - // Add / Remove friend link - $friendlinks = elgg_view('profile/menu/friendlinks',$vars); - if (!empty($friendlinks)) { - echo "<li class='user_menu_profile'>{$friendlinks}</li>"; - } - // view for plugins to extend - echo elgg_view('profile/menu/links',$vars); - } else { - // if looking at your own avatar menu - provide a couple of handy links -?> - <li class="user_menu_profile"> - <a class="edit_profile" href="<?php echo elgg_get_site_url()?>pg/profile/<?php echo $username; ?>/edit/details"> - <?php echo elgg_echo("profile:edit"); ?> - </a> - </li> - <li class="user_menu_profile"> - <a class="edit_avatar" href="<?php echo elgg_get_site_url()?>pg/profile/<?php echo $username; ?>/edit/icon"> - <?php echo elgg_echo("profile:editicon"); ?> - </a> - </li> -<?php - } - - // if Admin is logged in, and not looking at admins own avatar menu - if (isadminloggedin() && get_loggedin_userid() != $user->guid) { - $params = array( - 'user' => $user, - 'sort_by' => 'order', - ); - $admin_links = elgg_view_menu('user_admin', $params); - if (!empty($admin_links)) { - echo "<li class='user_menu_admin'>{$admin_links}</li>"; - } - } -} -?> - </ul> -</div>
\ No newline at end of file diff --git a/views/default/profile/icon.php b/views/default/profile/icon.php index 5685c0a73..5f06cfd54 100644 --- a/views/default/profile/icon.php +++ b/views/default/profile/icon.php @@ -1,77 +1,17 @@ <?php /** * Elgg profile icon - * + * + * @deprecated 1.8 use elgg_view_entity_icon() + * * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. * @uses $vars['size'] The size - small, medium or large. If none specified, medium is assumed. - * @uses $vars['align'] * @uses $vars['override'] * @uses $vars['js'] */ +elgg_deprecated_notice('The profile/icon view was deprecated. Use elgg_view_entity_icon()', 1.8); -$user = elgg_get_array_value('entity', $vars, get_loggedin_user()); -$size = elgg_get_array_value('size', $vars, 'medium'); -if (!in_array($size, array('topbar', 'tiny', 'small', 'medium', 'large', 'master'))) { - $size = 'medium'; -} +$override = elgg_extract('override', $vars, false); +$vars['use_hover'] = !$override; -if (!($user instanceof ElggUser)) { - return true; -} - -$name = htmlspecialchars($user->name, ENT_QUOTES, 'UTF-8'); -$username = $user->username; - -$icontime = $user->icontime; -if (!$icontime) { - $icontime = "default"; -} - -$js = elgg_get_array_value('js', $vars, ''); - -// Get any align and js -if (!empty($vars['align'])) { - $align = " align=\"{$vars['align']}\" "; -} else { - $align = ''; -} - -$override = elgg_get_array_value('override', $vars, false); - -$spacer_url = elgg_get_site_url() . '_graphics/spacer.gif'; -$icon_url = $user->getIcon($size); -$icon = "<img src=\"$spacer_url\" $align alt=\"$name\" title=\"$name\" $js style=\"background: url($icon_url) no-repeat;\" class=\"$size\" />"; - -// no hover menu if override set -if ($override) { - echo $icon; - return true; -} - -?> -<div class="elgg-user-icon <?php echo $size; ?>"> -<?php -$params = array( - 'entity' => $user, - 'username' => $username, - 'name' => $name, -); -echo elgg_view('profile/hover', $params); - -if ((isadminloggedin()) || (!$user->isBanned())) { -?> - <a href="<?php echo $user->getURL(); ?>" class="icon" > -<?php -} - -// Rounded avatar corners - CSS3 method -// users avatar as background image so we can clip it with border-radius in supported browsers -echo $icon; - -if ((isadminloggedin()) || (!$user->isBanned())) { -?> - </a> -<?php -} -?> -</div> +echo elgg_view('icon/user/default', $vars); |