From b604c0b377cb8d78e192caa3bc72c5658b82fe51 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Sat, 28 Jul 2012 12:07:58 +0000
Subject: [PATCH] =?UTF-8?q?Tarea=20#942=20->=20Poder=20ver=20m=C3=A1s=20de?=
 =?UTF-8?q?dicatorias=20en=20la=20lista=20de=20la=20p=C3=A1gina=20de=20ini?=
 =?UTF-8?q?cio=20pero=20sin=20interrumpir=20el=20video?=
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@45 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
---
 wp-content/themes/score/functions.php         |   3 +-
 wp-content/themes/score/index.php             | 145 ++++++++++--------
 .../themes/score/lib/scripts/custom.php       |  10 ++
 3 files changed, 94 insertions(+), 64 deletions(-)

diff --git a/wp-content/themes/score/functions.php b/wp-content/themes/score/functions.php
index 8503a33..ad1bb00 100644
--- a/wp-content/themes/score/functions.php
+++ b/wp-content/themes/score/functions.php
@@ -411,7 +411,7 @@ function gp_pagination($pages = '', $range = 2) {
     $showitems = ($range * 2) + 1;
 
     global $paged;
-
+    
     if (get_query_var('paged')) {
         $paged = get_query_var('paged');
     } elseif (get_query_var('page')) {
@@ -603,4 +603,5 @@ function cutstr($str, $length, $ellipsis=''){
     return $cut[0].((strlen($cut)<strlen($str))?$ellipsis:'');
 }
 
+
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/score/index.php b/wp-content/themes/score/index.php
index 87228cc..e4e69ed 100644
--- a/wp-content/themes/score/index.php
+++ b/wp-content/themes/score/index.php
@@ -1,97 +1,116 @@
-<?php get_header();
+<?php 
 
+get_header();
 global $gp_settings, $post, $current_user;
 get_currentuserinfo();
-
 $_ishome = (is_home() OR is_front_page());
 
 ?>
 
 <?php 
 
-$args = "cat=".$gp_settings['cats']."&caller_get_posts=1&orderby=$orderby&order=$order&gdsr_sort=$gdsr_sort&gdsr_order=$gdsr_order&paged=$paged&posts_per_page=-1";
+//$args = "cat=".$gp_settings['cats']."&caller_get_posts=1&orderby=$orderby&order=$order&gdsr_sort=$gdsr_sort&gdsr_order=$gdsr_order&paged=$paged&posts_per_page=-1";
+$args = array(
+    "cat" => $gp_settings['cats'],
+    "caller_get_posts" => 1,
+    "orderby" => $orderby,
+    "order" => $order,
+    "gdsr_sort" => $gdsr_sort,
+    "gdsr_order" => $gdsr_order,
+    "paged" => $paged,
+    "posts_per_page" => -1
+);
+
 query_posts($args); 
-$contador = 0;
 $urls_video = array();
-?>
+$ids_descartados = array();
 
-<div id="content"<?php if($gp_settings['dropdown_filter'] == "0") { ?> class="shift-down"<?php } ?>>
-
-	<?php if (have_posts()) : while (have_posts()) : the_post(); include('loop-dedication-data.php'); ?>
-        <?php
-        if ($contador == $gp_settings['posts_per_page']) {
-            break;
-        }
-
-        //$displayed_id = bp_displayed_user_id();
-        
+if (have_posts()) : 
+    while (have_posts()) : 
+        the_post(); 
+        include('loop-dedication-data.php');
+    
         // Usuario actual puede ver la dedicatoria?
         if ($post->post_status == 'private') {
             if (($current_user->ID != $gp_settings['from_user_id']) && ($current_user->ID != $gp_settings['to_user_id'])) {
-                continue; // me salto esta dedicatoria
+                $ids_descartados[] = $post->ID;
             }
-        }        
-        
-        $video = get_post_meta($post->ID, 'ghostpool_dedication_url', true);
+        }
+
         if ($_ishome) {
             if ($theme_homepage_not_repeat_videos) {
                 // Si la URL del video ya ha salido en una dedicatoria anterior, me la salto
-                if (in_array($video, $urls_video)) {
-                        continue;
+                if (in_array($gp_settings['video'], $urls_video)) {
+                    $ids_descartados[] = $post->ID;
                 }
             }
         }
-        $urls_video[] = $video;
-        $contador += 1;
-        ?>
-    
-	
-		<div <?php post_class('post-loop'); ?>>
-		
-			<!--Begin Image-->
-			<?php if(has_post_thumbnail()) { ?>					
-				<div class="post-thumbnail<?php if($gp_settings['image_wrap'] == "Disable") { ?> thumbnail-no-wrap<?php } ?>">					
-					<a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>">
-						<?php $image = vt_resize(get_post_thumbnail_id(), '', $gp_settings['image_width'], $gp_settings['image_height'], true); ?>
-						<img src="<?php echo $image[url]; ?>" alt="<?php if(get_post_meta(get_post_thumbnail_id(), '_wp_attachment_image_alt', true)) { echo get_post_meta(get_post_thumbnail_id(), '_wp_attachment_image_alt', true); } else { echo get_the_title(); } ?>" />		
-					</a>				
-				</div>					
-			<?php } ?>
-			<!--End Image-->
-			
-			<!--Begin Post Text-->
-			<div class="post-text">
-                            <h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><?php echo $gp_settings['artist_song_span_short']; ?></a></h2>                            
-                            <?php echo $gp_settings['from_flag']; ?><span>FROM: <?php echo $gp_settings['from_user_link']; ?></span>&nbsp;
-                            <?php echo $gp_settings['to_flag']; ?><span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
-			</div>
-			<!--End Post Text-->
-		
-		</div>
+
+        $urls_video[] = $gp_settings['video'];
+    endwhile;
+endif;
+
+$args = array(
+    "cat" => $gp_settings['cats'],
+    "caller_get_posts" => 1,
+    "orderby" => $orderby,
+    "order" => $order,
+    "gdsr_sort" => $gdsr_sort,
+    "gdsr_order" => $gdsr_order,
+    "paged" => $paged,
+    "posts_per_page" => $gp_settings['posts_per_page'],
+    "post__not_in" => $ids_descartados
+);
+
+query_posts($args); 
+?>
+
+<div id="content"<?php if($gp_settings['dropdown_filter'] == "0") { ?> class="shift-down"<?php } ?>>
+    <div id="contentInner">
+	<?php if (have_posts()) : while (have_posts()) : the_post(); include('loop-dedication-data.php'); ?>
+            <div <?php post_class('post-loop'); ?>>
+                    <!--Begin Image-->
+                    <?php if(has_post_thumbnail()) { ?>					
+                            <div class="post-thumbnail<?php if($gp_settings['image_wrap'] == "Disable") { ?> thumbnail-no-wrap<?php } ?>">					
+                                    <a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>">
+                                            <?php $image = vt_resize(get_post_thumbnail_id(), '', $gp_settings['image_width'], $gp_settings['image_height'], true); ?>
+                                            <img src="<?php echo $image[url]; ?>" alt="<?php if(get_post_meta(get_post_thumbnail_id(), '_wp_attachment_image_alt', true)) { echo get_post_meta(get_post_thumbnail_id(), '_wp_attachment_image_alt', true); } else { echo get_the_title(); } ?>" />		
+                                    </a>				
+                            </div>					
+                    <?php } ?>
+                    <!--End Image-->
+
+                    <!--Begin Post Text-->
+                    <div class="post-text">
+                        <h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><?php echo $gp_settings['artist_song_span_short']; ?></a></h2>                            
+                        <?php echo $gp_settings['from_flag']; ?><span>FROM: <?php echo $gp_settings['from_user_link']; ?></span>&nbsp;
+                        <?php echo $gp_settings['to_flag']; ?><span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
+                    </div>
+                    <!--End Post Text-->
+
+            </div>
 	<?php endwhile; ?>
         
+        <?php 
+        if($gp_settings['pagination'] == "0") {                     
+            gp_pagination(); 
+        } else { ?>
+            <div class="more-posts">
                 <?php 
-                if($gp_settings['pagination'] == "0") { gp_pagination(); } else { ?>
-                    <div class="more-posts">
-                        <?php 
-                            $category_id = get_cat_ID( DEDICATION_CATEGORY_SLUG );
-                            $category_link = get_category_link( $category_id );
-                        ?>
-                        <a href="<?php echo esc_url( $category_link ); ?>" class="read-more" title="<?php _e('See More', 'gp_lang'); ?>"><?php _e('See More', 'gp_lang'); ?> &raquo;</a>
-                    </div>
-                <?php } ?>
+                    $category_id = get_cat_ID( DEDICATION_CATEGORY_SLUG );
+                    $category_link = get_category_link( $category_id );
+                ?>
+                <a href="<?php echo esc_url( $category_link ); ?>" class="read-more" title="<?php _e('See More', 'gp_lang'); ?>"><?php _e('See More', 'gp_lang'); ?> &raquo;</a>
+            </div>
+        <?php } ?>
 
-		<?php if($gp_settings['dropdown_filter'] == "0") { require_once('dropdown-filter.php'); } ?>
-	
+        <?php if($gp_settings['dropdown_filter'] == "0") { require_once('dropdown-filter.php'); } ?>
 	<?php else : ?>	
-
 		<h4><?php _e('Try searching for a different term.', 'gp_lang'); ?></h4>
-		
 	<?php endif; ?>
         <?php wp_reset_query(); ?>
-
+    </div>
 </div>
 	
 <?php get_sidebar(); ?>
-				
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/wp-content/themes/score/lib/scripts/custom.php b/wp-content/themes/score/lib/scripts/custom.php
index 65efd32..a1b1657 100644
--- a/wp-content/themes/score/lib/scripts/custom.php
+++ b/wp-content/themes/score/lib/scripts/custom.php
@@ -1,5 +1,15 @@
 <script>
 
+
+jQuery(document).ready(function(){
+    jQuery('.wp-pagenavi a').live('click', function(e){
+        e.preventDefault();
+        link = jQuery(this).attr('href');
+        jQuery('#content').html('Loading...');
+        jQuery('#content').load(link + ' #contentInner');
+    });
+});
+
 /*************************** File Directories ***************************/
 
 var rootFolder='<?php echo get_template_directory_uri(); ?>';