Tarea #942 -> Poder ver más dedicatorias en la lista de la página de inicio pero sin interrumpir el video

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@45 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
This commit is contained in:
David Arranz 2012-07-28 12:07:58 +00:00
parent 846bfef61b
commit b604c0b377
3 changed files with 94 additions and 64 deletions

View File

@ -603,4 +603,5 @@ function cutstr($str, $length, $ellipsis=''){
return $cut[0].((strlen($cut)<strlen($str))?$ellipsis:'');
}
?>

View File

@ -1,53 +1,74 @@
<?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;
$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 } ?>">
@ -71,7 +92,9 @@ $urls_video = array();
<?php endwhile; ?>
<?php
if($gp_settings['pagination'] == "0") { gp_pagination(); } else { ?>
if($gp_settings['pagination'] == "0") {
gp_pagination();
} else { ?>
<div class="more-posts">
<?php
$category_id = get_cat_ID( DEDICATION_CATEGORY_SLUG );
@ -82,16 +105,12 @@ $urls_video = array();
<?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(); ?>

View File

@ -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(); ?>';