From dba525e5569266699028012f1c0311d41acbc063 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 27 Aug 2012 18:06:11 +0000
Subject: [PATCH] =?UTF-8?q?Tarea=20#1037=20->=20Cuando=20veo=20el=20perfil?=
 =?UTF-8?q?=20de=20otro=20usuario,=20que=20salga=20s=C3=B3lo=20el=20avatar?=
 =?UTF-8?q?=20y=20las=20opciones=20que=20salen=20en=20la=20p=C3=A1giona=20?=
 =?UTF-8?q?de=20amigos=20(dedicar=20una=20canci=C3=B3n,=20cancelar=20amist?=
 =?UTF-8?q?ad)?=
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@135 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
---
 wp-content/themes/score/dedications/index.php | 21 +++++++++++++++++--
 wp-content/themes/score/header.php            |  2 +-
 .../lib/buddypress/functions-buddypress.php   | 12 +++++------
 .../score/members/single/member-header.php    | 13 ------------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/wp-content/themes/score/dedications/index.php b/wp-content/themes/score/dedications/index.php
index b688703..9f4b080 100644
--- a/wp-content/themes/score/dedications/index.php
+++ b/wp-content/themes/score/dedications/index.php
@@ -7,7 +7,8 @@
 <?php global $bp, $post, $gp_settings; ?>
 
 <?php get_header( 'buddypress' ); ?>
-        
+
+<?php if ( bp_is_my_profile() ) : ?>
         <?php if ( !bp_is_current_action( 'new-dedication' ) ) : ?>
             <?php require(ghostpool_scripts . 'comment-home.php'); ?>
             <?php locate_template( array( 'video-slider.php' ), true ); ?>
@@ -55,6 +56,22 @@
 
 		</div><!-- .padder -->
 	</div><!-- #content -->
+<?php else: ?>
+	<div id="content" class="fullwidth">
+		<div class="padder">
+			<?php do_action( 'bp_before_member_home_content' ); ?>
+                        
+                            <div id="item-header" role="complementary">
+                                    <?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
+                            </div>
 
-<?php get_sidebar( 'buddypress' ); ?>
+			<?php do_action( 'bp_after_member_home_content' ); ?>
+		</div><!-- .padder -->
+	</div><!-- #content -->
+<?php endif; ?>
+
+<?php if ( bp_is_my_profile() ) : ?>        
+    <?php get_sidebar( 'buddypress' ); ?>
+<?php endif; ?>        
+        
 <?php get_footer( 'buddypress' ); ?>
diff --git a/wp-content/themes/score/header.php b/wp-content/themes/score/header.php
index d18bdfc..6b2158e 100644
--- a/wp-content/themes/score/header.php
+++ b/wp-content/themes/score/header.php
@@ -81,7 +81,7 @@
         <?php endif; ?>            
         
         <?php if ( is_user_logged_in() ) : ?>
-            <?php if ( $bp->current_component == BP_DEDICATION_SLUG ) : ?>
+            <?php if (( $bp->current_component == BP_DEDICATION_SLUG ) && (bp_is_my_profile())) : ?>
                 <div id="header-profile">
                 <?php locate_template( array( 'members/single/small-member-header.php' ), true );  ?>
                 </div>
diff --git a/wp-content/themes/score/lib/buddypress/functions-buddypress.php b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
index 8346a6f..d7b1913 100644
--- a/wp-content/themes/score/lib/buddypress/functions-buddypress.php
+++ b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
@@ -411,12 +411,14 @@ if (!function_exists('bp_dtheme_enqueue_scripts')) {
 if (bp_is_active('friends'))
     add_action('bp_member_header_actions', 'bp_add_friend_button');
 
-if (bp_is_active('activity'))
-    add_action('bp_member_header_actions', 'bp_send_public_message_button');
+/*if (bp_is_active('activity'))
+    add_action('bp_member_header_actions', 'bp_send_public_message_button');*/
 
-if (bp_is_active('messages'))
-    add_action('bp_member_header_actions', 'bp_send_private_message_button');
+/*if (bp_is_active('messages'))
+    add_action('bp_member_header_actions', 'bp_send_private_message_button');*/
 
+if (bp_is_active('dedications'))
+    add_action('bp_member_header_actions',  'bp_member_add_dedicate_a_song_button');
 
 // Group Buttons
 if (bp_is_active('groups')) {
@@ -431,8 +433,6 @@ if (bp_is_active('blogs'))
     add_action('bp_directory_blogs_actions', 'bp_blogs_visit_blog_button');
 
 
-
-
 add_filter('bp_get_the_profile_field_value', 'gp_bp_get_the_profile_field_value', 3);
 
 function gp_bp_get_the_profile_field_value($value, $type = '', $id = '') {
diff --git a/wp-content/themes/score/members/single/member-header.php b/wp-content/themes/score/members/single/member-header.php
index 39c1b4b..b737d02 100644
--- a/wp-content/themes/score/members/single/member-header.php
+++ b/wp-content/themes/score/members/single/member-header.php
@@ -26,23 +26,10 @@
 		<a href="<?php bp_displayed_user_link(); ?>"><?php bp_displayed_user_fullname(); ?></a>
 	</h2>
 
-	<span class="user-nicename">@<?php bp_displayed_user_username(); ?></span>
-	<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
-
 	<?php do_action( 'bp_before_member_header_meta' ); ?>
 
 	<div id="item-meta">
 
-		<?php if (0) /* bp_is_active( 'activity' ) )*/ : ?>
-
-			<div id="latest-update">
-
-				<?php bp_activity_latest_update( bp_displayed_user_id() ); ?>
-
-			</div>
-
-		<?php endif; ?>
-
 		<div id="item-buttons">
 
 			<?php do_action( 'bp_member_header_actions' ); ?>