Updated avatar user menu to generate an ordered list, reinstated the add/remove frien...

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

diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php
index 8ed3796b7b73bdcf7d76da8176a5798b5480b4b8..15e67061c9f23f528c9b40fda3534a259e7154fc 100644 (file)
--- a/mod/blog/views/default/blog/menu.php
+++ b/mod/blog/views/default/blog/menu.php
@@ -4,6 +4,6 @@
  */\r
 ?>\r
 \r
-       <p class="user_menu_blog">\r
+       <li class="user_menu_blog">\r
                <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("blog"); ?></a>      \r
-       </p>
\ No newline at end of file
+       </li>
\ No newline at end of file

diff --git a/mod/file/views/default/file/menu.php b/mod/file/views/default/file/menu.php
index a9c79a85cab3befd6f02540ddaf657e27a84d4a5..7cde6b91aa89d02bde1a8be2484c27cc8ddd67b2 100644 (file)
--- a/mod/file/views/default/file/menu.php
+++ b/mod/file/views/default/file/menu.php
@@ -11,6 +11,6 @@
 
 ?>
 
-       <p class="user_menu_file">
+       <li class="user_menu_file">
                <a href="<?php echo $vars['url']; ?>pg/file/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("file"); ?></a>      
-       </p>
\ No newline at end of file
+       </li>
\ No newline at end of file

diff --git a/mod/messages/views/default/messages/menu.php b/mod/messages/views/default/messages/menu.php
index 06cdde060a711ff41e658061888c9873ece8edf8..150c9a73c0475b053cfd24c7b40e335e90538ff9 100644 (file)
--- a/mod/messages/views/default/messages/menu.php
+++ b/mod/messages/views/default/messages/menu.php
@@ -13,9 +13,9 @@
  if (isloggedin()) {
 ?>
 
-       <p class="user_menu_messages">
+       <li class="user_menu_messages">
                <a href="<?php echo $vars['url']; ?>mod/messages/send.php?send_to=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("messages:sendmessage"); ?></a>    
-       </p>
+       </li>
        
 <?php
 }
\ No newline at end of file

diff --git a/mod/pages/views/default/pages/menu.php b/mod/pages/views/default/pages/menu.php
index 7b2df4c90abeb2174a64fc53a6acd8c498ba6fe7..9c92648abcf5c3139f2409fff56c968115374427 100644 (file)
--- a/mod/pages/views/default/pages/menu.php
+++ b/mod/pages/views/default/pages/menu.php
@@ -9,6 +9,6 @@
         * @link http://elgg.com/
         */
 ?>
-<p class="user_menu_pages">
-               <a href="<?php echo $vars['url']; ?>pg/pages/owned/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("pages"); ?></a>      
-       </p>
\ No newline at end of file
+<li class="user_menu_pages">
+       <a href="<?php echo $vars['url']; ?>pg/pages/owned/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("pages"); ?></a>      
+</li>
\ No newline at end of file

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index dea780ceb14fadb6359b4f252a128ee459c91aa8..cde028f12c4c4e2aeb6fec634b5038e0043edc03 100644 (file)
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -349,7 +349,7 @@ p.visit_twitter a {
        height:15px;
 }
 /* user avatar submenu options */
-.usericon div.sub_menu { 
+.usericon .sub_menu { 
        display:none; 
        position:absolute; 
        padding:0; 
@@ -367,44 +367,37 @@ p.visit_twitter a {
 div.usericon a.icon img {
        z-index:10;
 }
-.usericon div.sub_menu a:link, 
-.usericon div.sub_menu a:visited, 
-.usericon div.sub_menu a:hover { 
+.usericon .sub_menu a:link, 
+.usericon .sub_menu a:visited, 
+.usericon .sub_menu a:hover { 
        display:block;
 }      
-.usericon div.sub_menu a:hover {
+.usericon .sub_menu a:hover {
        background:#cccccc;
        text-decoration:none;
 }
-.usericon div.sub_menu h3 {
+.usericon .sub_menu h3 {
        font-size:1.3em;
        line-height: 1.1em;
        padding:0;
+       margin:0;
        border-bottom:solid 1px #dddddd;
        color: #4690d6;
-       margin:0 !important;
-}
-.usericon div.sub_menu h3 a {
-       padding:3px 3px 3px 6px !important;
 }
-.usericon div.sub_menu p {
-       margin:0 !important;
-       padding:0 !important;
-       height:auto !important;
-       line-height:1.2em !important;
-       font-size:12px !important;
+.usericon .sub_menu h3 a {
+       padding:3px 3px 3px 8px;
 }
-.usericon div.sub_menu p a {
-       padding:3px 3px 3px 6px !important;
+.usericon .sub_menu a {
+       padding:2px 3px 2px 8px;
 }
 /* admin menu options in avatar submenu */
 .user_menu_admin {
        border-top:solid 1px #dddddd;
 }
-.user_menu_admin a {
+.usericon .sub_menu li.user_menu_admin a {
        color:red;
 }
-.user_menu_admin a:hover {
-       color:white !important;
-       background:red !important;
+.usericon .sub_menu li.user_menu_admin a:hover {
+       color:white;
+       background:red;
 }

diff --git a/mod/profile/views/default/profile/hoverover.php b/mod/profile/views/default/profile/hoverover.php
index 571585311c1603838d0eb03b75ad19a2de244890..5250377a11262829d197d976a559a1debbfdf80c 100644 (file)
--- a/mod/profile/views/default/profile/hoverover.php
+++ b/mod/profile/views/default/profile/hoverover.php
@@ -11,9 +11,9 @@
  * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
  */
 ?>
-<p class="user_menu_name">
-       <b><?php echo $vars['entity']->name; ?></b>
-</p>
+<li class="user_menu_name">
+       <?php echo $vars['entity']->name; ?>
+</li>
 <?php
        echo elgg_view('profile/hoverover/actions', $vars);
        echo elgg_view('profile/hoverover/links', $vars);

diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 59b16cdac8421b17d04da1a5e83dd49e87019342..83015766a94d357b704135b152175b816123a79c 100644 (file)
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -54,12 +54,11 @@ if ($vars['entity'] instanceof ElggUser) {
        <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 "<div class=\"item_line\">{$actions}</div>";
-                                       
+                                       echo "<li class='user_menu_addremovefriend'>{$actions}</li>";
                                }
                                if ($vars['entity']->getGUID() == $vars['user']->getGUID()) {
                                        echo elgg_view('profile/menu/linksownpage',$vars);
@@ -69,11 +68,12 @@ if ($vars['entity'] instanceof ElggUser) {
                        } 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 
+                ?><a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><?php 
                }
                
        } 

diff --git a/mod/profile/views/default/profile/menu/actions.php b/mod/profile/views/default/profile/menu/actions.php
index 4ce7c89b6b83734f630c56f87b594e9f51eb5593..f200ec379bbb4796353386dd28c69d110bf79dba 100644 (file)
--- a/mod/profile/views/default/profile/menu/actions.php
+++ b/mod/profile/views/default/profile/menu/actions.php
@@ -16,16 +16,16 @@ if (isloggedin()) {
                $ts = time();
                $token = generate_action_token($ts);
                if ($vars['entity']->isFriend()) {
-                       echo elgg_view('output/confirm_link', array(
+                       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/confirm_link', array(
+                       echo elgg_view('output/confirmlink', array(
                                'href' => "{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}",
                                'text' => elgg_echo('friend:add'),
-                               'class' => 'user_menu_removefriend'
+                               'class' => 'user_menu_addfriend'
                        ));
                }
        }

diff --git a/mod/profile/views/default/profile/menu/adminwrapper.php b/mod/profile/views/default/profile/menu/adminwrapper.php
index b60eec46276a1cce3947dbda6aa7810516d1c88b..eec5a6d3f9e06f43486f7472c16ceabe26b2df8e 100644 (file)
--- a/mod/profile/views/default/profile/menu/adminwrapper.php
+++ b/mod/profile/views/default/profile/menu/adminwrapper.php
@@ -13,5 +13,5 @@
 $adminlinks = elgg_view('profile/menu/adminlinks', $vars);
 
 if (!empty($adminlinks)) {
-       echo "<p class=\"user_menu_admin\">{$adminlinks}</p>";
+       echo "<li class='user_menu_admin'>{$adminlinks}</li>";
 }
\ 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 ce82df10a845593179a4a138d55ee81e7dd3ad94..fd04e2e996fbe25df72be738b4303692ded0fd2a 100644 (file)
--- a/mod/profile/views/default/profile/menu/links.php
+++ b/mod/profile/views/default/profile/menu/links.php
@@ -12,21 +12,21 @@
  */
 ?>
 
-<p class="user_menu_profile">
+<li class="user_menu_profile">
        <a href="<?php echo $vars['entity']->getURL(); ?>"><?php echo elgg_echo("profile"); ?></a>
-</p>
+</li>
 <?php
        if ($vars['entity']->canEdit()){
 ?>
-               <p class="user_menu_profile">
+               <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>
-               </p>
+               </li>
 <?php
        }
 ?>
-<p class="user_menu_friends">
+<li class="user_menu_friends">
        <a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>       
-</p>
-<p class="user_menu_friends_of">
+</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>  
-</p>
+</li>

diff --git a/mod/profile/views/default/profile/menu/linksownpage.php b/mod/profile/views/default/profile/menu/linksownpage.php
index 58eb3e1a06f74f1441829435a909e0cdb5542e9a..2d41c6c31a351c09466de413319845062e7f477c 100644 (file)
--- a/mod/profile/views/default/profile/menu/linksownpage.php
+++ b/mod/profile/views/default/profile/menu/linksownpage.php
@@ -14,16 +14,16 @@
 <?php
        if ($vars['entity']->canEdit()){
 ?>
-               <p class="user_menu_profile">
+               <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>
-               </p>
+               </li>
 <?php
        }
 ?>
-<p class="user_menu_friends">
+<li class="user_menu_friends">
        <a href="<?php echo $vars['url']; ?>pg/friends/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo("friends"); ?></a>       
-</p>
-<p class="user_menu_friends_of">
+</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>  
-</p>
+</li>
        

diff --git a/mod/reportedcontent/views/default/reportedcontent/user_report.php b/mod/reportedcontent/views/default/reportedcontent/user_report.php
index ee6c7cbf8b6a460373a798789d17707842f5352a..e341bb6d376d96a118ab1b58f44fe7619694d540 100644 (file)
--- a/mod/reportedcontent/views/default/reportedcontent/user_report.php
+++ b/mod/reportedcontent/views/default/reportedcontent/user_report.php
@@ -1,6 +1,6 @@
 
-<p class="user_menu_profile">
+<li class="user_menu_profile">
 <?php
        echo "<a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">" . elgg_echo('reportedcontent:report') . "</a>";
 ?>
-</p>
\ No newline at end of file
+</li>
\ No newline at end of file