Updated avatar menu: Removed links to tools, provided a view to extend menu, added @username to menu, cleaned-up and simplified menu generation.

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

1 files changed, 55 insertions, 37 deletions

diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 83015766a..d5623e0c8 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -43,49 +43,67 @@ if ($vars['entity'] instanceof ElggUser) {
 	// Override
 	if (isset($vars['override']) && $vars['override'] == true) {
 		$override = true;
-	} else $override = false;
-
+	} else {
+		$override = false;
+	}
+	// profile avatar drop-down menu
 	if (!$override) {
-	
-?>
-<div class="usericon <?php echo $vars['size']; ?>">
-<div class="avatar_menu_button"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" border="0" width="15px" height="15px" /></div>
-
-	<div class="sub_menu">
-		<h3><a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo $vars['entity']->name; ?></a></h3>
-		<?php
-		echo "<ul class='sub_menu_list'>";
-			if (isloggedin()) {
-				$actions = elgg_view('profile/menu/actions',$vars);
-				if (!empty($actions)) {
-					echo "<li class='user_menu_addremovefriend'>{$actions}</li>";
-				}
-				if ($vars['entity']->getGUID() == $vars['user']->getGUID()) {
-					echo elgg_view('profile/menu/linksownpage',$vars);
-				} else {
-					echo elgg_view('profile/menu/links',$vars);
-				}					
-			} else {
-				echo elgg_view('profile/menu/links',$vars);
-			}
-		echo "</ul>";
 		?>
-	</div>	
-	<?php
-		if ((isadminloggedin()) || (!$vars['entity']->isBanned())) {
-		 ?><a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><?php 
-		}
+		<div class="usericon <?php echo $vars['size']; ?>">
+		<div class="avatar_menu_button"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" border="0" width="15px" height="15px" /></div>
+		<div class="sub_menu">
+			<h3 class="displayname"><a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo $vars['entity']->name; ?>
+			<span class="username"><?php echo "@".$vars['entity']->username; ?></span>
+			</a></h3>
+			<?php
+			echo "<ul class='sub_menu_list'>";
+				if (isloggedin()) {
+					// if not looking at your own avatar menu
+					if ($vars['entity']->getGUID() != $vars['user']->getGUID()) {
+					
+						// 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 $vars['url']?>pg/profile/<?php echo $vars['entity']->username; ?>/edit/details"><?php echo elgg_echo("profile:edit"); ?></a>
+						</li>
+						<li class="user_menu_profile">
+							<a class="edit_avatar" href="<?php echo $vars['url']?>pg/profile/<?php echo $vars['entity']->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() && ($_SESSION['id']!=$vars['entity']->guid) ){
+						$adminlinks = elgg_view('profile/menu/adminlinks', $vars);
+						if (!empty($adminlinks)) {
+							echo "<li class='user_menu_admin'>{$adminlinks}</li>";
+						}
+					}
+		
+				}
+				echo "</ul>";
+			?>
+		</div>	
+			<?php
+				if ((isadminloggedin()) || (!$vars['entity']->isBanned())) {
+				 ?><a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><?php 
+				}
 		
 	} 
 	
 	?><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> alt="<?php echo htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); ?>" title="<?php echo htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /><?php
 
-	if (!$override) {
-	
-	?></a>
-</div>
-
-<?php
-
+	if (!$override) { 
+	?>
+		</a></div>
+	<?php
 	}
 }
\ No newline at end of file