From ca53af75b6b8fa11163016ae58ed252749747edf Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 27 Jul 2012 10:52:43 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#938=20->=20=09Fallo=20al=20mostrar=20?=
 =?UTF-8?q?la=20p=C3=A1gina=20de=20miembros.=20Mezcla=20la=20lista=20de=20?=
 =?UTF-8?q?amigos=20con=20la=20de=20todos=20los=20miembros.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@41 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
---
 .../lib/buddypress/functions-buddypress.php     | 17 ++++++++++++++++-
 wp-content/themes/score/members/index.php       |  8 +++++++-
 wp-content/themes/score/style-asong2u.css       | 16 ++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/score/lib/buddypress/functions-buddypress.php b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
index 8b2addd..7527018 100644
--- a/wp-content/themes/score/lib/buddypress/functions-buddypress.php
+++ b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
@@ -535,6 +535,21 @@ function bp_member_add_dedicate_a_song_button() {
         echo bp_get_button( ( $button ) );
     }
 }
- add_action('bp_directory_members_actions',  'bp_member_add_dedicate_a_song_button');
+add_action('bp_directory_members_actions',  'bp_member_add_dedicate_a_song_button');
+
+ 
+function my_friends_by_default( $query_string ) {
+	global $bp;
+
+	if ( !$query_string )
+		$query_string = '';	
+       
+	if ( $query_string == '' && $bp->current_component == BP_MEMBERS_SLUG && !strpos($query_string, 'scope=')) {
+            $query_string .= 'type=active&action=active&user_id='.$bp->loggedin_user->id.'&scope=personal&page=1';
+        }
+
+	return $query_string;
+}
+add_filter( 'bp_dtheme_ajax_querystring', 'my_friends_by_default' );
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/score/members/index.php b/wp-content/themes/score/members/index.php
index 2d83850..b9e239b 100644
--- a/wp-content/themes/score/members/index.php
+++ b/wp-content/themes/score/members/index.php
@@ -34,7 +34,7 @@
                         
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
+					<?php if (is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
 						<li class="selected" id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
 
@@ -42,6 +42,12 @@
 
                                         <li id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
 
+                                        <?php if (0) : /* bp_friend_get_total_requests_count() != "0" ):*/ ?>
+
+                                        <li><a id="members-" href="<?php bloginfo('url'); ?>/members/<?php global $current_user; get_currentuserinfo(); echo $current_user->user_login; ?>/friends"><span style="font-weight:bold;">(<?php echo bp_friend_total_requests_count() ?>)</span>&nbsp;&nbsp;Friends</a></li>
+
+                                        <?php endif;?>                                        
+                                        
 					<?php do_action( 'bp_members_directory_member_types' ); ?>
 
 				</ul>
diff --git a/wp-content/themes/score/style-asong2u.css b/wp-content/themes/score/style-asong2u.css
index 7402219..5032e0a 100644
--- a/wp-content/themes/score/style-asong2u.css
+++ b/wp-content/themes/score/style-asong2u.css
@@ -140,7 +140,7 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
 /*************************** User Details ***************************/
 
 ul.navmenu {
-    width: 269px;
+    width: 330px;
     float: right;
     margin-bottom: 10px;    
 }
@@ -216,12 +216,24 @@ ul.navmenu li a.profile:hover {
     background-repeat: no-repeat;
 }
 
+ul.navmenu li a.logout {
+    background-image: url(lib/images/icons.png);
+    background-position: 0px -170px;
+    background-repeat: no-repeat;
+}
+
+ul.navmenu li a.logout:hover {
+    background-image: url(lib/images/icons.png);
+    background-position: -52px -170px;
+    background-repeat: no-repeat;
+}
+
 
 .login-name {
     color: #596a7c;
     width: 40%;
     float: left;
-    margin-top: 50px;
+    margin-top: 40px;
     text-align: center;
     font-weight: bold;
 }