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

10 files changed, 97 insertions, 167 deletions

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index ed5b050b3..7a82b2bec 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -352,8 +352,8 @@ p.visit_twitter a {
 	width:164px; 
 	background:#FFFFFF; 
 	text-align:left;
-	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); /* safari v3+ */
-	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); /* FF v3.5+ */
+	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 }
 div.usericon a.icon img {
 	z-index:10;
@@ -367,17 +367,21 @@ div.usericon a.icon img {
 	background:#cccccc;
 	text-decoration:none;
 }
-.usericon .sub_menu h3 {
-	font-size:1.3em;
-	line-height: 1.1em;
+.usericon .sub_menu h3.displayname {
+	font-size:1.3em !important; /* make sure nothing overrides our sub menu h3 */
+	line-height: 1.1em !important;
 	padding:0 !important;
 	margin:0 !important;
-	border-bottom:solid 1px #dddddd;
-	color: #4690d6;
+	border-bottom:solid 1px #dddddd !important;
 }
-.usericon .sub_menu h3 a {
+.usericon .sub_menu h3.displayname a {
 	padding:3px 3px 3px 8px;
 }
+.usericon .sub_menu h3.displayname a .username {
+	display:block;
+	font-weight: normal;
+	font-size: 0.8em;
+}
 .usericon .sub_menu a {
 	padding:2px 3px 2px 8px;
 }
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
diff --git a/mod/profile/views/default/profile/menu/actions.php b/mod/profile/views/default/profile/menu/actions.php
deleted file mode 100644
index f200ec379..000000000
--- a/mod/profile/views/default/profile/menu/actions.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg profile icon hover over: actions
- * 
- * @package ElggProfile
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- * 
- * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
- */
-
-if (isloggedin()) {
-	if ($_SESSION['user']->getGUID() != $vars['entity']->getGUID()) {
-		$ts = time();
-		$token = generate_action_token($ts);
-		if ($vars['entity']->isFriend()) {
-			echo elgg_view('output/confirmlink', array(
-				'href' => "{$vars['url']}action/friends/remove?friend={$vars['entity']->getGUID()}",
-				'text' => elgg_echo('friend:remove'),
-				'class' => 'user_menu_removefriend'
-			));
-		} else {
-			echo elgg_view('output/confirmlink', array(
-				'href' => "{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}",
-				'text' => elgg_echo('friend:add'),
-				'class' => 'user_menu_addfriend'
-			));
-		}
-	}
-}
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/adminwrapper.php b/mod/profile/views/default/profile/menu/adminwrapper.php
deleted file mode 100644
index eec5a6d3f..000000000
--- a/mod/profile/views/default/profile/menu/adminwrapper.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Wraps the admin links
- * 
- * @package ElggProfile
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- * 
- */
-
-$adminlinks = elgg_view('profile/menu/adminlinks', $vars);
-
-if (!empty($adminlinks)) {
-	echo "<li class='user_menu_admin'>{$adminlinks}</li>";
-}
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/friendlinks.php b/mod/profile/views/default/profile/menu/friendlinks.php
new file mode 100644
index 000000000..f7ca3c2fd
--- /dev/null
+++ b/mod/profile/views/default/profile/menu/friendlinks.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg profile icon avatar menu: Add / Remove friend links
+ * 
+ * @package ElggProfile
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ * 
+ * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
+ */
+$ts = time();
+$token = generate_action_token($ts);
+if ($vars['entity']->isFriend()) {
+	echo elgg_view('output/confirmlink', array(
+		'href' => "{$vars['url']}action/friends/remove?friend={$vars['entity']->getGUID()}",
+		'text' => elgg_echo('friend:remove'),
+		'class' => 'remove_friend'
+	));
+} else {
+	echo elgg_view('output/confirmlink', array(
+		'href' => "{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}",
+		'text' => elgg_echo('friend:add'),
+		'class' => 'add_friend'
+	));
+}
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/links.php b/mod/profile/views/default/profile/menu/links.php
index fd04e2e99..de2b28926 100644
--- a/mod/profile/views/default/profile/menu/links.php
+++ b/mod/profile/views/default/profile/menu/links.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg profile icon hover over: passive links
+ * Elgg profile icon avatar menu: view for plugins to extend
  * 
  * @package ElggProfile
  * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
@@ -11,22 +11,3 @@
  * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
  */
 ?>
-
-<li class="user_menu_profile">
-	<a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo elgg_echo("profile"); ?></a>
-</li>
-<?php
-	if ($vars['entity']->canEdit()){
-?>
-		<li class="user_menu_profile">
-			<a href="<?php echo $vars['url']?>pg/profile/<?php echo $vars['entity']->username; ?>/edit/icon"><?php echo elgg_echo("profile:editicon"); ?></a>
-		</li>
-<?php
-	}
-?>
-<li class="user_menu_friends">
-	<a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>	
-</li>
-<li class="user_menu_friends_of">
-	<a href="<?php echo $vars['url']; ?>pg/friendsof/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends:of"); ?></a>	
-</li>
diff --git a/mod/profile/views/default/profile/menu/linksownpage.php b/mod/profile/views/default/profile/menu/linksownpage.php
deleted file mode 100644
index 2d41c6c31..000000000
--- a/mod/profile/views/default/profile/menu/linksownpage.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg profile icon / profile links: passive links when looking at your own icon / profile
- * 
- * @package ElggProfile
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- * 
- * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
- */
-?>
-<?php
-	if ($vars['entity']->canEdit()){
-?>
-		<li class="user_menu_profile">
-			<a href="<?php echo $vars['url']?>pg/profile/<?php echo $vars['entity']->username; ?>/edit/icon"><?php echo elgg_echo("profile:editicon"); ?></a>
-		</li>
-<?php
-	}
-?>
-<li class="user_menu_friends">
-	<a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>	
-</li>
-<li class="user_menu_friends_of">
-	<a href="<?php echo $vars['url']; ?>pg/friendsof/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends:of"); ?></a>	
-</li>
-	
diff --git a/mod/profile/views/default/profile/profile_contents/widgets.php b/mod/profile/views/default/profile/profile_contents/widgets.php
deleted file mode 100644
index e69de29bb..000000000
--- a/mod/profile/views/default/profile/profile_contents/widgets.php
+++ /dev/null
diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php
index 7f89d3782..4a6622fc8 100755
--- a/mod/profile/views/default/profile/profile_ownerblock.php
+++ b/mod/profile/views/default/profile/profile_ownerblock.php
@@ -31,8 +31,8 @@ if($section == 'details'){
 $profile_actions = "";
 if(get_loggedin_user()->getGuid() == page_owner()){
 	$profile_actions = "<div class='clearfloat profile_actions'>";
-	$profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/details' class='action_button'>Edit profile</a>";
-	$profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/icon' class='action_button'>Edit profile icon</a>";
+	$profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/details' class='action_button'>". elgg_echo('profile:edit') ."</a>";
+	$profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') ."</a>";
 	$profile_actions .= "</div>";
 }else{
 	$profile_actions = "<div class='profile_actions'>";
diff --git a/mod/profile/views/default/profile/submenu.php b/mod/profile/views/default/profile/submenu.php
deleted file mode 100644
index 682b910c2..000000000
--- a/mod/profile/views/default/profile/submenu.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-	/**
-	 * Elgg profile submenu links
-	 * These sit in the submenu when the profile editing is on view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 * 
-	 */
-	 
-?>
-
-<ul class="submenu profilelinks">
-    <li><a href="<?php echo $CONFIG->wwwroot . "mod/profile/edit.php"; ?>"><?php echo elgg_echo('profile:details'); ?></a></li>
-    <li><a href="<?php echo $CONFIG->wwwroot."mod/profile/editicon.php"; ?>"><?php echo elgg_echo('profile:editicon'); ?></a></li>
-    <li><a href="<?php echo $CONFIG->wwwroot."pg/profile/" . $_SESSION['user']->username; ?>"><?php echo elgg_echo('profile:back'); ?></a></li>
-</ul>
\ No newline at end of file