aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_graphics/elgg_sprites.pngbin11671 -> 12102 bytes
-rw-r--r--engine/lib/users.php3
-rw-r--r--views/default/css.php9
-rw-r--r--views/default/page_elements/elgg_topbar.php8
4 files changed, 19 insertions, 1 deletions
diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png
index a02ab1c45..e3b21ba4d 100644
--- a/_graphics/elgg_sprites.png
+++ b/_graphics/elgg_sprites.png
Binary files differ
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 778b072a1..02b0f9027 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1765,10 +1765,13 @@ function users_init() {
global $CONFIG;
// add Friends to tools menu - if profile mod is running
+ // now added to toolbar
+ /*
if ( isloggedin() && is_plugin_enabled('profile') ) {
$user = get_loggedin_user();
add_menu(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/" . $user->username, array(), 'core:friends');
}
+ */
register_page_handler('friends', 'friends_page_handler');
register_page_handler('friendsof', 'friends_of_page_handler');
diff --git a/views/default/css.php b/views/default/css.php
index 57b5e688b..2afe89dbd 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -387,6 +387,15 @@ h2 {
#elgg_topbar_contents .log_out a:hover {
color:#71cbff;
}
+#elgg_topbar_contents a.myfriends {
+ background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -297px;
+ margin-right:30px;
+ text-indent: -900em;
+ width:36px;
+}
+#elgg_topbar_contents a.myfriends:hover {
+ background-position: left -337px;
+}
#elgg_topbar_contents a.settings {
background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
padding-left:20px !important;
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 7db5940cd..c59360a3a 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -21,8 +21,14 @@
// enable elgg topbar extending
echo elgg_view('elgg_topbar/extend', $vars);
+
+ // add Friends to top toolbar - if profile mod is running
+ if ( is_plugin_enabled('profile') ) {
+ $user = get_loggedin_user();
+ echo "<a class='myfriends' href=\"".$CONFIG->wwwroot . "pg/friends/" . $user->username."\" title=\"".elgg_echo('friends')."\">".elgg_echo('friends')."</a>";
+ }
?>
-
+
<div class="log_out">
<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
</div>