From e1cf670acfd8d786aec086d1bd5bb2ff96cd5870 Mon Sep 17 00:00:00 2001 From: pete Date: Thu, 11 Mar 2010 13:53:36 +0000 Subject: Updated avatar user menu to generate an ordered list, reinstated the add/remove friend link, & cleaned up css. git-svn-id: http://code.elgg.org/elgg/trunk@5361 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/blog/menu.php | 4 +-- mod/file/views/default/file/menu.php | 4 +-- mod/messages/views/default/messages/menu.php | 4 +-- mod/pages/views/default/pages/menu.php | 6 ++-- mod/profile/views/default/profile/css.php | 37 +++++++++------------- mod/profile/views/default/profile/hoverover.php | 6 ++-- mod/profile/views/default/profile/icon.php | 8 ++--- mod/profile/views/default/profile/menu/actions.php | 6 ++-- .../views/default/profile/menu/adminwrapper.php | 2 +- mod/profile/views/default/profile/menu/links.php | 16 +++++----- .../views/default/profile/menu/linksownpage.php | 12 +++---- .../views/default/reportedcontent/user_report.php | 4 +-- 12 files changed, 51 insertions(+), 58 deletions(-) diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php index 8ed3796b7..15e67061c 100644 --- a/mod/blog/views/default/blog/menu.php +++ b/mod/blog/views/default/blog/menu.php @@ -4,6 +4,6 @@ */ ?> -

+

  • -

    \ No newline at end of file +
    • \ 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 a9c79a85c..7cde6b91a 100644 --- a/mod/file/views/default/file/menu.php +++ b/mod/file/views/default/file/menu.php @@ -11,6 +11,6 @@ ?> -

    +

  • -

    \ No newline at end of file +
    • \ 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 06cdde060..150c9a73c 100644 --- a/mod/messages/views/default/messages/menu.php +++ b/mod/messages/views/default/messages/menu.php @@ -13,9 +13,9 @@ if (isloggedin()) { ?> -

    +

  • -

    +
    • -

    - -

    \ No newline at end of file +
  • + +
    • \ 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 dea780ceb..cde028f12 100644 --- 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 571585311..5250377a1 100644 --- 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. */ ?> -

    - name; ?> -

    +
  • + name; ?> +

    • name; ?>

    "; if (isloggedin()) { $actions = elgg_view('profile/menu/actions',$vars); if (!empty($actions)) { - - echo "
    {$actions}
    "; - + echo "
  • {$actions}
    • "; } 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 ""; ?> isBanned())) { - ?>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 b60eec462..eec5a6d3f 100644 --- 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 "

    {$adminlinks}

    "; + echo "
  • {$adminlinks}
    • "; } \ 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 ce82df10a..fd04e2e99 100644 --- a/mod/profile/views/default/profile/menu/links.php +++ b/mod/profile/views/default/profile/menu/links.php @@ -12,21 +12,21 @@ */ ?> -

    +

  • -

    +
    • canEdit()){ ?> -

    +

  • -

    +
    • -

    +

  • -

    -

    +

    • +
  • -

    +
    • diff --git a/mod/profile/views/default/profile/menu/linksownpage.php b/mod/profile/views/default/profile/menu/linksownpage.php index 58eb3e1a0..2d41c6c31 100644 --- a/mod/profile/views/default/profile/menu/linksownpage.php +++ b/mod/profile/views/default/profile/menu/linksownpage.php @@ -14,16 +14,16 @@ canEdit()){ ?> -

    +

  • -

    +
    • -

    +

  • -

    -

    +

    • +
  • -

    +
    • diff --git a/mod/reportedcontent/views/default/reportedcontent/user_report.php b/mod/reportedcontent/views/default/reportedcontent/user_report.php index ee6c7cbf8..e341bb6d3 100644 --- a/mod/reportedcontent/views/default/reportedcontent/user_report.php +++ b/mod/reportedcontent/views/default/reportedcontent/user_report.php @@ -1,6 +1,6 @@ -

    +

  • wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">" . elgg_echo('reportedcontent:report') . ""; ?> -

    \ No newline at end of file +
    • \ No newline at end of file -- cgit v1.2.3