Subida a producción de la maqueta

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@21 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6

wp-content/plugins/most-active-members/most-active-members.php

@@ -281,12 +281,12 @@ class Top_Members extends WP_Widget {
 		$defaults = array( 
 			'title' => __(	'Top Members', 'top_members'), 
 							'number' => __(1, 'top_members'), 
-							'template' => __('<h3>Thanks %firstname% %lastname% !!!</h3><div class="post type-post status-publish format-standard hentry post-loop"><div class="post-thumbnail"><a href="%linktoposts%">%gravatar%</a></div><div class="post-text"><a href="%linktoposts%">%firstname% %lastname% </a> has recommended<br/>us to %nrofposts% friends!!!<div class="post-meta"></div></div></div><a href="" class="button">Invite your friends</a>', 'top_members'),
+							'template' => __('<h3>Thanks %nickname% !!!</h3><div class="post type-post status-publish format-standard hentry post-loop"><div class="post-thumbnail"><a href="%linktoposts%">%gravatar%</a></div><div class="post-text"><a href="%linktoposts%">%nickname% </a> has recommended<br/>us to %nrofposts% friends!!!<br/><br/><div class="post-meta"></div></div></div><div class="clear"></div><a href="" class="button">Invite your friends</a>', 'top_members'),
 							'linkbase' => 'buddypress/members',
 							'author_link' => 'username',
 							'before' => __('<ul>', 'top_members'),
 							'after' => __('</ul>', 'top_members'),
-							'gravatar_size' => __(24),
+							'gravatar_size' => __(100),
 							
 						);
 						

wp-content/themes/score/dedications/single/new-dedication.php

@@ -36,8 +36,6 @@ global $bp;
             $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
             
             break;
-        default : die();
-            
     }
     
 ?>

wp-content/themes/score/footer.php

@@ -2,7 +2,12 @@
 
 		</div>
 		<!--End Content Wrapper-->
-		
+
+        </div>
+<!--End Page Wrapper-->
+
+<div class="clear"></div>
+<div id="footer">
 		<!--Begin Footer Widgets-->		
 		<?php if($theme_footer_widgets == "All Pages" OR ($theme_footer_widgets == "Homepage" && is_home())) { ?>
 		
@@ -50,7 +55,7 @@
 					<?php } ?>
 					
 				<?php } ?>
-				
+				<div class="clear"></div>
 			</div>
 		<?php } ?>
 		<!--End Footer Widgets-->
@@ -62,16 +67,12 @@
 			</div>
 		<?php } ?>
 		<!--End Footer Bottom-->
-		
-		<div class="clear"></div>
-
-	</div>
-	<!--End Page Shadow-->
-
+                <div class="clear"></div>
 </div>
-<!--End Page Wrapper-->
 
-<div class="clear"></div>
+
+
+
 
 <?php wp_footer(); ?>
 

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' ); ?><h3> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php _e( 'Groups Directory', 'buddypress' ); ?></a>
+			<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' ); ?>
 
@@ -95,7 +95,7 @@
 								<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
 							</ul>
 						</label>
-
+                                                <?php if (0) : ?>
 						<label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> />
 							<strong><?php _e('This is a hidden group', 'buddypress'); ?></strong>
 							<ul>
@@ -104,10 +104,11 @@
 								<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
 							</ul>
 						</label>
+                                                <?php endif; ?>
 					</div>
 
 					<hr />
-
+                                        <?php if (0) : ?>
 					<h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
 
 					<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p>
@@ -130,7 +131,7 @@
 					</div>
 
 					<hr />
-
+                                        <?php endif; ?>
 					<?php do_action( 'bp_after_group_settings_creation_step' ); ?>
 
 					<?php wp_nonce_field( 'groups_create_save_group-settings' ); ?>

wp-content/themes/score/groups/single/admin.php

@@ -75,7 +75,7 @@
 				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>
 			</ul>
 		</label>
-
+                <?php if (0) : ?>
 		<label>
 			<input type="radio" name="group-status" value="hidden"<?php bp_group_show_status_setting( 'hidden' ) ?> />
 			<strong><?php _e( 'This is a hidden group', 'buddypress' ) ?></strong>
@@ -85,10 +85,11 @@
 				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ) ?></li>
 			</ul>
 		</label>
+                <?php endif; ?>
 	</div>
 
 	<hr /> 
-	 
+	<?php if (0) : ?> 
 	<h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4> 
 
 	<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ) ?></p> 
@@ -111,7 +112,7 @@
  	</div> 
 
 	<hr /> 
-
+        <?php endif; ?>
 	<?php do_action( 'bp_after_group_settings_admin' ); ?>
 
 	<p><input type="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="save" name="save" /></p>

wp-content/themes/score/header.php

@@ -29,9 +29,6 @@
 <!--Begin Page Wrapper-->
 <div id="page-wrapper">
 
-	<!--Begin Page Shadow-->
-	<div id="page-shadow">
-
 		<!--Begin Header-->
 		<div id="header">
                         <!--Begin Logo-->
@@ -45,7 +42,7 @@
                         <!--End Logo-->
         <?php if(is_user_logged_in()) { ?>
             <?php global $bp, $current_user; get_currentuserinfo(); ?>
-            <div class="login-name"><?php echo $current_user->display_name; ?></div>
+            <div class="login-name"><?php echo $current_user->display_name; ?> (<a href="<?php echo wp_logout_url(); ?>"><?php _e( 'Logout', 'buddypress' ) ?></a>)</div>
         <? } ?>
             
         <?php if ( is_user_logged_in() ) : ?>
@@ -57,9 +54,9 @@
             <!--End Nav-->   
             <?php } ?>
             <ul class="navmenu">
-                <li><a class="friends" href="<?php echo bp_get_members_directory_permalink(); ?>"><span><?php __( 'Members', 'buddypress' ); ?></span></a></li>
-                <li><a class="groups " href="<?php echo bp_get_groups_directory_permalink(); ?>"><span><?php __( 'Groups', 'buddypress' ); ?></span></a></li>
-                <li><a class="dedications" href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>"><span><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></span></a></li>
+                <li><a class="events" href="#"><span><?php __( 'Events', 'buddypress' ); ?></span></a></li>
+                <li><a title="<?php __( 'Members', 'buddypress' ); ?>" class="friends" href="<?php echo bp_get_members_directory_permalink(); ?>"><span><?php __( 'Members', 'buddypress' ); ?></span></a></li>
+                <li><a title="<?php __( 'Groups', 'buddypress' ); ?>" class="groups " href="<?php echo bp_get_groups_directory_permalink(); ?>"><span><?php __( 'Groups', 'buddypress' ); ?></span></a></li>
                 <li><a class="profile" href="<?php if(function_exists('bp_is_active')) { echo $bp->loggedin_user->domain; } else { echo get_author_posts_url(get_the_author_id()); } ?>"><span><?php _e('Profile', 'gp_lang'); ?></span></a></li>
             </ul>
         <?php endif; ?>            

wp-content/themes/score/lib/admin/inc/theme-options.php

@@ -1347,6 +1347,7 @@ function gp_admin() {
     <?php screen_icon('options-general'); ?>
         <h2><?php _e('Theme Options', 'gp_lang'); ?></h2>
 
+        <?php if(0) : ?>
         <div id="message" class="error">
 
             <p><?php _e('Need help? First check the', 'gp_lang'); ?> <a href="http://ghostpool.com/help/<?php echo $dirname; ?>/help.html" target="_blank"><?php _e('help file', 'gp_lang'); ?></a><?php _e(', then visit the', 'gp_lang'); ?> <a href="http://ghostpool.com/support" target="_blank"><?php _e('support forum', 'gp_lang'); ?></a>.</p>
@@ -1358,7 +1359,8 @@ function gp_admin() {
             <p class="textright"><a href="#TB_inline?height=300&amp;width=500&amp;inlineId=import_export" title="<?php _e('Import/Export Theme Options', 'gp_lang'); ?>" class="thickbox" onclick="return false;"><?php _e('Import/Export Theme Options', 'gp_lang'); ?></a></p>
 
         </div>
-
+        <?php endif; ?>
+        
         <div id="import_export" class="hide-if-js">
 
             <h3><?php _e('Import Theme Options', 'gp_lang'); ?></h3>

wp-content/themes/score/lib/admin/inc/theme-widgets.php

@@ -14,13 +14,54 @@ class SidebarPosts extends WP_Widget {
         $this->WP_Widget('sidebar-posts-widget', __('GP Sidebar Posts', 'gp_lang'), $widget_ops);
     }
 
-    function string_limit_words($string, $word_limit) {
-        $words = explode(' ', $string, ($word_limit + 1));
-        if (count($words) > $word_limit)
-            array_pop($words);
-        return implode(' ', $words);
-    }
+    function htmlwrap(&$str, $maxLength, $char='<br />'){
+        $count = 0;
+        $newStr = '';
+        $openTag = false;
+        $lenstr = strlen($str);
+        for($i=0; $i<$lenstr; $i++){
+            $newStr .= $str{$i};
+            if($str{$i} == '<'){
+                $openTag = true;
+                continue;
+            }
+            if(($openTag) && ($str{$i} == '>')){
+                $openTag = false;
+                continue;
+            }
+            if(!$openTag){
+                if($str{$i} == ' '){
+                    if ($count == 0) {
+                        $newStr = substr($newStr,0, -1);
+                        continue;
+                    } else {
+                        $lastspace = $count + 1;
+                    }
+                }
+                $count++;
+                if($count==$maxLength){
+                    if ($str{$i+1} != ' ' && $lastspace && ($lastspace < $count)) {
+                        $tmp = ($count - $lastspace)* -1;
+                        $newStr = substr($newStr,0, $tmp) . $char . substr($newStr,$tmp);
+                        $count = $tmp * -1;
+                    } else {
+                        $newStr .= $char;
+                        $count = 0;
+                    }
+                    $lastspace = 0;
+                }
+            } 
+        }
 
+        return $newStr;
+    }    
+    
+    function cutstr($str, $length, $ellipsis=''){
+    $cut = (array)explode('\n\n', $this->htmlwrap($str, $length, '\n\n'));
+    return $cut[0].((strlen($cut)<strlen($str))?$ellipsis:'');
+    }
+    
+    
     function widget($args, $instance) {
         global $gp_settings, $post, $wp_query, $paged;
         extract($args);
@@ -112,9 +153,7 @@ class SidebarPosts extends WP_Widget {
                                 $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
                                 $artist_song = $artist . '. ' . $song;
                                 $artist_song_span = '<span>'.$artist.'</span>'.'. '.$song;
-                                $new_name = $this->string_limit_words($artist_song_span, 6);
-                                if ($new_name != $artist_song_span)
-                                    $new_name .= '...';
+                                $new_name = $this->cutstr($artist_song_span, 30, '...');
                             ?>
                                 
                                 <a href="<?php the_permalink(); ?>" class="post-artist-song" title="<?php echo $artist_song; ?>"><?php echo $new_name; ?></a>

wp-content/themes/score/style-asong2u.css

@@ -3,7 +3,7 @@
 /* Page Styling */
 body {
     border-top: 1px solid #616161;
-    background: #fff url(lib/images/background.png) left -15px repeat-x;
+    background: #fff url(lib/images/background.png) left -25px repeat-x;
     font-family: Arial, Helvetica,sans-serif; 
 }
 
@@ -32,6 +32,7 @@ input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hove
 #page-wrapper {
     padding-top: 0;
     width: 940px;
+    text-align: left;
 }
 
 #page-shadow {
@@ -48,7 +49,7 @@ input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hove
 /*************************** Header ***************************/
 
 #header {
-    margin-bottom: 0px;
+    margin-bottom: 10px;
 }
 
 /* Header */
@@ -133,29 +134,26 @@ input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hove
 ul.navmenu {
     width: 269px;
     float: right;
+    margin-bottom: 10px;    
 }
 
 ul.navmenu li {
     float: left;
-    width: 50px;
-    height: 100px;
+    width: 51px;
+    height: 85px;
     margin-left: 15px;
-    box-shadow: 2px 1px 4px #999;    
+    /*box-shadow: 2px 1px 4px #999;    
     background: #1586ae;
     border: 1px solid #1b7695;
-    border-top: 0;
+    border-top: 0;*/
     /*background: url(lib/images/bg-header.png) repeat-x;*/
 }
 
 ul.navmenu li a {  
     background-color: transparent;
     display: block;  
-    width: 50px;
-    height: 100px;
-}
-
-ul.navmenu li a:hover, ul.navmenu li a:active {
-    background-color: #488cbd;
+    width: 51px;
+    height: 85px;
 }
 
 ul.navmenu li a span {
@@ -163,29 +161,54 @@ ul.navmenu li a span {
 }
 
 ul.navmenu li a.friends {
-    background-image: url(lib/images/friends-icon.png);
-    background-position: 50% 40%;
+    background-image: url(lib/images/icons.png);
+    background-position: 0px -255px;
+    background-repeat: no-repeat;
+}
+
+ul.navmenu li a.friends:hover {
+    background-image: url(lib/images/icons.png);
+    background-position: -52px -255px;
     background-repeat: no-repeat;
 }
 
 ul.navmenu li a.groups {
-    background-image: url(lib/images/forum-icon.png);
-    background-position: 50% 20%;
+    background-image: url(lib/images/icons.png);
+    background-position: 0px -85px;
     background-repeat: no-repeat;
 }
 
-ul.navmenu li a.dedications {
-    background-image: url(lib/images/dedications-icon.png);
-    background-position: 50% 40%;
+ul.navmenu li a.groups:hover {
+    background-image: url(lib/images/icons.png);
+    background-position: -52px -85px;
+    background-repeat: no-repeat;
+}
+
+ul.navmenu li a.events {
+    background-image: url(lib/images/icons.png);
+    background-position: 0px 0px;
+    background-repeat: no-repeat;
+}
+
+ul.navmenu li a.events:hover {
+    background-image: url(lib/images/icons.png);
+    background-position: -52px 0px;
     background-repeat: no-repeat;
 }
 
 ul.navmenu li a.profile {
-    background-image: url(lib/images/profile-icon.png);
-    background-position: 50% 30%;
-    background-repeat: no-repeat;    
+    background-image: url(lib/images/icons.png);
+    background-position: 0px -170px;
+    background-repeat: no-repeat;
 }
 
+ul.navmenu li a.profile:hover {
+    background-image: url(lib/images/icons.png);
+    background-position: -52px -170px;
+    background-repeat: no-repeat;
+}
+
+
 .login-name {
     color: #596a7c;
     width: 40%;
@@ -441,17 +464,25 @@ ul.navmenu li a.profile {
 	color: #077dc8;
 }
 /*************************** Footer ***************************/
-#footer .page-wrapper {
-    background: url("lib/images/bg-header-overlay.png") no-repeat center top transparent;
-}
-
-/* Footer Widgets */
-#footer-widgets {
+#footer {
+    width: 100%;
+    text-align: center;
     background: #e7e7e7;
-    padding-right: 0px;
     border: 2px solid #349BBC;
     border-left: none;
     border-right: none;
+    margin-top: 15px;
+}
+
+
+/* Footer Widgets */
+#footer-widgets {
+    padding: 10px;    
+    background: transparent;        
+    margin: 0 auto;
+    float: none;
+    font-weight: bold;
+    color: #576a7b;
 }
 
 #footer-widgets h3 {
@@ -461,8 +492,22 @@ ul.navmenu li a.profile {
     background: transparent;       
 }
 
+#footer-widgets #nav_menu-4 h3 {
+    color: #ef54ca !important;
+}
+
+#footer-widgets #nav_menu-5 h3 {
+    color: #f0776f !important;
+}
+
+#footer-widgets #nav_menu-6 h3 {
+    color: #7dafc6 !important;
+}
+
+
 #footer-widgets .widget li {
-    padding-top: 8px;
+    padding-top: 4px;
+    text-align: left;
 }
 
 .footer-widgets-border-right {
@@ -476,11 +521,11 @@ ul.navmenu li a.profile {
 }
 
 #footer .widget a {
-    color: #8ad0e8;
+    color: #576a7b;
 }
 
 #footer .widget a:hover {
-    color: #fff;
+    color: #4B8CC6;
 }
 
 /* Footer Bottom */
@@ -623,11 +668,11 @@ ul.navmenu li a.profile {
     text-align: center;    
 }
 
-.widget.sidebarposts h3,
-.widget.sidebarposts .post-loop .post-text {
+#sidebar-home .widget.sidebarposts h3,
+#sidebar-home .widget.sidebarposts .post-loop .post-text {
     color: #34a089 !important;
     text-align: left;
-    font-size: 12px;
+    font-size: 12px;    
 }
 
 .widget.sidebarposts a {
@@ -641,6 +686,7 @@ ul.navmenu li a.profile {
 .widget.sidebarposts .post-loop .post-meta {
     color: #34a089;
     white-space: nowrap;
+    line-height: 19px;    
 }
 
 .widget.sidebarposts .post-loop .post-meta span a {
@@ -660,6 +706,8 @@ ul.navmenu li a.profile {
 
 .widget.sidebarposts .post-text .post-artist-song {
     white-space: nowrap;
+    line-height: 19px;
+
 }
 
 .widget.widget_specialrecentposts {
@@ -726,12 +774,19 @@ a.button {
 }
 
 a.button:hover {
-    background: #879db1;
-    border: 1px outset #34404b;    
+    background: -moz-linear-gradient(
+		top,
+		#7cb9d0 0%,
+		#466b94);
+    background: -webkit-gradient(
+            linear, left top, left bottom, 
+            from(#7cb9d0),
+            to(#466b94));
+    border: 1px outset #7CB9D0;
 }
 
 a.button:active {
-    background: #685f6e;
+    background: #0f3d5f;
     border: 1px inset #34404b;    
     -moz-box-shadow:    inset 0 0 10px #262630;
     -webkit-box-shadow: inset 0 0 10px #262630;
@@ -747,7 +802,7 @@ a.button:active {
 }
 
 h3.comments {
-    border-bottom: 1px solid #e5e5e5;
+    border-bottom: none;
 }
 
 .comment-box {
@@ -795,6 +850,12 @@ h3.comments {
     font-weight: bold;
 }
 
+#respond h3 {
+    margin: 0;
+    border-bottom: none;
+}
+
+
 /*************************** Page/Post ***************************/
 
 /* Posts */