From d9b283d22d52a264854e18c0339636ec7f532301 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 19 Jul 2012 08:55:51 +0000
Subject: [PATCH] =?UTF-8?q?-=20Mejora=20de=20estilos=20en=20p=C3=A1ginas?=
 =?UTF-8?q?=20de=20grupos=20y=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@17 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
---
 wp-content/themes/score/groups/create.php     |  2 +-
 wp-content/themes/score/groups/index.php      | 16 +++--
 .../lib/buddypress/functions-buddypress.php   | 26 ++++++++
 wp-content/themes/score/members/index.php     | 19 ++++--
 .../themes/score/members/members-loop.php     |  2 +
 wp-content/themes/score/style-asong2u.css     | 64 ++++++++++++++++---
 6 files changed, 106 insertions(+), 23 deletions(-)

diff --git a/wp-content/themes/score/groups/create.php b/wp-content/themes/score/groups/create.php
index 84cefe5..8c6531a 100644
--- a/wp-content/themes/score/groups/create.php
+++ b/wp-content/themes/score/groups/create.php
@@ -15,7 +15,7 @@
 		<div class="padder">
 
 		<form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
-			<h3><?php _e( 'Create a Group', 'buddypress' ); ?> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php _e( 'Groups Directory', 'buddypress' ); ?></a></h3>
+			<h3><?php _e( 'Create a Group', 'buddypress' ); ?><h3> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php _e( 'Groups Directory', 'buddypress' ); ?></a>
 
 			<?php do_action( 'bp_before_create_group' ); ?>
 
diff --git a/wp-content/themes/score/groups/index.php b/wp-content/themes/score/groups/index.php
index 7da62e9..d6f7eec 100644
--- a/wp-content/themes/score/groups/index.php
+++ b/wp-content/themes/score/groups/index.php
@@ -13,40 +13,42 @@
 
 	<?php do_action( 'bp_before_directory_groups_page' ); ?>
 
-	<div id="content">
+	<div id="content fullwidth">
 		<div class="padder">
 
 		<?php do_action( 'bp_before_directory_groups' ); ?>
 
 		<form action="" method="post" id="groups-directory-form" class="dir-form">
 
-			<h3><?php _e( 'Groups Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Create a Group', 'buddypress' ); ?></a><?php endif; ?></h3>
+			<h3><?php _e( 'Groups Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?></h3>&nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Create a Group', 'buddypress' ); ?></a><?php endif; ?>
 
 			<?php do_action( 'bp_before_directory_groups_content' ); ?>
-
+                        
+                        <?php if (0) : ?>
 			<div id="group-dir-search" class="dir-search" role="search">
 
 				<?php bp_directory_groups_search_form() ?>
 
 			</div><!-- #group-dir-search -->
+                        <?php endif; ?>
 
 			<?php do_action( 'template_notices' ); ?>
 
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count() ); ?></a></li>
-
 					<?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-						<li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+						<li class="selected" id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
 					<?php endif; ?>
 
+                                        <li id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count() ); ?></a></li>
+
 					<?php do_action( 'bp_groups_directory_group_filter' ); ?>
 
 				</ul>
 			</div><!-- .item-list-tabs -->
-
+                        
 			<div class="item-list-tabs" id="subnav" role="navigation">
 				<ul>
 
diff --git a/wp-content/themes/score/lib/buddypress/functions-buddypress.php b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
index 075e551..a60564a 100644
--- a/wp-content/themes/score/lib/buddypress/functions-buddypress.php
+++ b/wp-content/themes/score/lib/buddypress/functions-buddypress.php
@@ -509,4 +509,30 @@ function check_country_field() {
 }
 add_action('bp_init', 'check_country_field');
 
+
+function bp_member_add_dedicate_a_song_button() {
+    global $bp;
+    global $members_template;
+    
+    $button = array(
+            'id'                => 'dedicate-song',
+            'component'         => 'friends',
+            'must_be_logged_in' => true,
+            'block_self'        => true,
+            'wrapper_class'     => 'friendship-button dedicate-song',
+            'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
+            'link_href'         => wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/add-friend/' . $potential_friend_id . '/', 'friends_add_friend' ),
+            'link_text'         => __( 'Dedicate a song', 'buddypress' ),
+            'link_title'        => __( 'Dedicate a song', 'buddypress' ),
+            'link_id'           => 'friend-' . $potential_friend_id,
+            'link_rel'          => 'add',
+            'link_class'        => 'friendship-button dedicate-song add'
+    );
+
+    if ( !bp_is_my_profile() ) {    
+        echo bp_get_button( ( $button ) );
+    }
+}
+ add_action('bp_directory_members_actions',  'bp_member_add_dedicate_a_song_button');
+
 ?>
\ 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 52f3413..3a53b05 100644
--- a/wp-content/themes/score/members/index.php
+++ b/wp-content/themes/score/members/index.php
@@ -13,7 +13,7 @@
 
 	<?php do_action( 'bp_before_directory_members_page' ); ?>
 
-	<div id="content">
+	<div id="content fullwidth">
 		<div class="padder">
 
 		<?php do_action( 'bp_before_directory_members' ); ?>
@@ -23,28 +23,32 @@
 			<h3><?php _e( 'Members Directory', 'buddypress' ); ?></h3>
 
 			<?php do_action( 'bp_before_directory_members_content' ); ?>
-
+                        
+                        <?php if(0) : ?>
 			<div id="members-dir-search" class="dir-search" role="search">
 
 				<?php bp_directory_members_search_form(); ?>
 
 			</div><!-- #members-dir-search -->
-
+                        <?php endif; ?>
+                        
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<li class="selected" 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 ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-						<li 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>
+						<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>
 
 					<?php endif; ?>
 
+                                        <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 do_action( 'bp_members_directory_member_types' ); ?>
 
 				</ul>
 			</div><!-- .item-list-tabs -->
 
+                        <?php if (0): ?>
+                        
 			<div class="item-list-tabs" id="subnav" role="navigation">
 				<ul>
 
@@ -69,7 +73,8 @@
 					</li>
 				</ul>
 			</div>
-
+                        <?php endif; ?>
+                        
 			<div id="members-dir-list" class="members dir-list">
 
 				<?php locate_template( array( 'members/members-loop.php' ), true ); ?>
diff --git a/wp-content/themes/score/members/members-loop.php b/wp-content/themes/score/members/members-loop.php
index d268008..8317730 100644
--- a/wp-content/themes/score/members/members-loop.php
+++ b/wp-content/themes/score/members/members-loop.php
@@ -54,7 +54,9 @@
 
 				</div>
 
+                                <?php if (0) : ?>
 				<div class="item-meta"><span class="activity"><?php bp_member_last_active(); ?></span></div>
+                                <?php endif; ?>
 
 				<?php do_action( 'bp_directory_members_item' ); ?>
 
diff --git a/wp-content/themes/score/style-asong2u.css b/wp-content/themes/score/style-asong2u.css
index e9783d0..721373a 100644
--- a/wp-content/themes/score/style-asong2u.css
+++ b/wp-content/themes/score/style-asong2u.css
@@ -713,7 +713,7 @@ a.button {
     padding: 5px 10px;
     cursor: pointer;
     color: #ffffff;
-    /*background: #576a7b;*/
+
     background: -moz-linear-gradient(
 		top,
 		#179dc2 0%,
@@ -946,13 +946,15 @@ color: #325670;
 .bbPress #content span.bbp-admin-links a:hover,
 .bbPress #content .bbp-reply-permalink:hover,
 .bbPress #content div#item-header .updated {
-color: #077dc8;
+    color: #077dc8;
 }
-/*#content-wrapper .widget input[type="button"],
+
+#content-wrapper .widget input[type="button"],
 #content-wrapper .widget input[type="submit"],
 #content-wrapper .widget input[type="reset"],
 #content-wrapper .widget input[type="file"],
 #content-wrapper .widget button,
+#content-wrapper #groups-directory-form h3 a.button,
 .bp-wrapper #content-wrapper .button,
 .bp-wrapper #content-wrapper .button.submit,
 .bp-wrapper #content-wrapper ul.button-nav li a,
@@ -962,10 +964,29 @@ color: #077dc8;
 .bp-wrapper #content-wrapper #submit_topic_cancel,
 .bp-wrapper #content-wrapper .acomment-options a,
 .bp-wrapper #content-wrapper .activity-meta a:hover span {
-    background: #2D5069;
-    font-size: 14px;
-    color: #fff !important;
+    color: #fff;
+
+    font-size: 13px;
+    font-weight: bold;        
+    padding: 3px 0;
+    line-height: 19px;
+    
+    text-align: center;
+    padding: 5px 10px;
+    cursor: pointer;
+
+    background: -moz-linear-gradient(
+		top,
+		#179dc2 0%,
+		#0f3d5f);
+    background: -webkit-gradient(
+            linear, left top, left bottom, 
+            from(#179dc2),
+            to(#0f3d5f));
+    border: 1px outset #34404b;   
+    border-radius: 0;
 }
+
 .bp-wrapper #content-wrapper .button:hover,
 .bp-wrapper #content-wrapper .button.submit:hover,
 .bp-wrapper #content-wrapper ul.button-nav li a:hover,
@@ -976,8 +997,35 @@ color: #077dc8;
 .bp-wrapper #content-wrapper .acomment-options a:hover,
 .bp-wrapper #content-wrapper div.item-list-tabs ul li a:hover span,
 .bp-wrapper #content-wrapper .activity-meta a span {
-background: #273138;
-}*/
+    background: #879db1;
+    border: 1px outset #34404b;
+    border-radius: 0;
+}
+
+.bp-wrapper #content-wrapper .button:active,
+.bp-wrapper #content-wrapper .button.submit:active,
+.bp-wrapper #content-wrapper ul.button-nav li a:active,
+.bp-wrapper #content-wrapper .generic-button a:active,
+.bp-wrapper #content-wrapper .comment-reply-link:active,
+.bp-wrapper #content-wrapper #previous-next input:active,
+.bp-wrapper #content-wrapper #submit_topic_cancel:active,
+.bp-wrapper #content-wrapper .acomment-options a:active,
+.bp-wrapper #content-wrapper div.item-list-tabs ul li a:active span,
+.bp-wrapper #content-wrapper .activity-meta a span {
+    background: #685f6e;
+    border: 1px inset #34404b;
+    -moz-box-shadow:    inset 0 0 10px #262630;
+    -webkit-box-shadow: inset 0 0 10px #262630;
+    box-shadow:         inset 0 0 10px #262630;
+    border-radius: 0;
+}
+
+.bp-wrapper .accepted, .bp-wrapper .accepted a, 
+.bp-wrapper .accepted a:hover, .bp-wrapper .pending, .bp-wrapper .pending a, 
+.bp-wrapper .pending a:hover, .bp-wrapper .disabled, .bp-wrapper .disabled a, 
+.bp-wrapper .disabled a:hover {
+    border-radius: 0;
+}
 
 #members-list li {
     width: 50%;