Archivado/ASong2U_Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tarea #928 -> Habilitar dedicatorias con videos Vimeo

Browse Source 
Tarea #929 -> Revisar títulos muy largos para poner "..."
Tarea #930 -> Poner "FROM" y "TO" en todas las dedicatorias excepto cuando salgan en el perfil del usuario

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@35 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
This commit is contained in:
David Arranz 2012-07-26 10:17:11 +00:00
parent 271ea08e86
commit a0daf83960
16 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-content/themes/score/dedications/single/dedicated-2-me.php
View File

@ -32,7 +32,7 @@ $dedications = bp_dedication_get_dedications_to_user( $bp->displayed_user->id );
<!--Begin Post Text-->
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><span><?php echo $gp_settings['artist']; ?></span>.&nbsp;<?php echo $gp_settings['song']; ?></a></h2>
<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['to_flag']; ?>
<span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
</div>

2
wp-content/themes/score/dedications/single/home-column-dedicated-2-me.php
View File

@ -40,7 +40,7 @@ $dedication_link = bp_core_get_userlink($bp->displayed_user->id, false, true) .
<!--Begin Post Text-->
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><span><?php echo $gp_settings['artist']; ?></span>.&nbsp;<?php echo $gp_settings['song']; ?></a></h2>
<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['to_flag']; ?>
<span>FROM: <?php echo $gp_settings['from_user_link']; ?></span>
</div>

2
wp-content/themes/score/dedications/single/home-column-my-dedications.php
View File

@ -38,7 +38,7 @@ $dedication_link = bp_core_get_userlink($bp->displayed_user->id, false, true) .
<!--Begin Post Text-->
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><span><?php echo $gp_settings['artist']; ?></span>.&nbsp;<?php echo $gp_settings['song']; ?></a></h2>
<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['to_flag']; ?>
<span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
</div>

2
wp-content/themes/score/dedications/single/my-dedications.php
View File

@ -33,7 +33,7 @@ $dedications = bp_dedication_get_dedications_from_user($bp->displayed_user->id);
<!--Begin Post Text-->
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" title="<?php echo $gp_settings['artist_song']; ?>"><span><?php echo $gp_settings['artist']; ?></span>.&nbsp;<?php echo $gp_settings['song']; ?></a></h2>
<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['to_flag']; ?>
<span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
</div>

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

@ -63,7 +63,13 @@ global $bp;
<input name="private_dedication" type="checkbox" />This dedication is private.
</li>
<li>
<label for="video_url">Video for dedication</label>
<label for="video_url">Video for dedication
<div id="youtube_vimeo_links">
<a href="http://www.youtube.com" title="Go to YouTube!" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/lib/images/youtube.png" alt="YouTube"/></a>
<a href="http://www.vimeo.com" title="Go to Vimeo!" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/lib/images/vimeo.png" alt="Vimeo"/></a>
</div>
</label>
<div class="clear"></div>
<input type="text" name="video_url" class="video_url required url" id="video_url" value="<?php echo $video_url; ?>"/>
<div id="thumbs"></div>
<div class="clear"></div>

2
wp-content/themes/score/functions.php
View File

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

8
wp-content/themes/score/header.php
View File

@ -58,10 +58,10 @@
$category_id = get_cat_ID( 'concerts' );
$category_link = get_category_link( $category_id );
?>
<li><a class="events" title="<?php __( 'Concerts', 'buddypress' ); ?>" href="<?php echo esc_url( $category_link ); ?>"><span><?php __( 'Concerts', '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>
<li><a title="<?php _e( 'Concerts', 'gp_lang' ); ?>" class="events" href="<?php echo esc_url( $category_link ); ?>"><span><?php _e( 'Concerts', 'gp_lang' ); ?></span></a></li>
<li><a title="<?php _e( 'Members', 'gp_lang' ); ?>" class="friends" href="<?php echo bp_get_members_directory_permalink(); ?>"><span><?php _e( 'Members', 'gp_lang' ); ?></span></a></li>
<li><a title="<?php _e( 'Groups', 'gp_lang' ); ?>" class="groups" href="<?php echo bp_get_groups_directory_permalink(); ?>"><span><?php _e( 'Groups', 'gp_lang' ); ?></span></a></li>
<li><a title="<?php _e( 'Profile', 'gp_lang' ); ?>" 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; ?>

9
wp-content/themes/score/index.php
View File

@ -7,7 +7,7 @@ $_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";
$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";
query_posts($args);
$contador = 0;
$urls_video = array();
@ -32,8 +32,7 @@ $urls_video = array();
if (($current_user->ID != $from_user_id) && ($current_user->ID != $to_user_id)) {
continue; // me salto esta dedicatoria
}
}
$contador += 1;
}
$video = get_post_meta($post->ID, 'ghostpool_dedication_url', true);
if ($_ishome) {
@ -45,7 +44,7 @@ $urls_video = array();
}
}
$urls_video[] = $video;
$contador += 1;
?>
@ -73,7 +72,7 @@ $urls_video = array();
<h2><a href="<?php the_permalink(); ?>" title="<?php $artist.'. '.$song; ?>"><span><?php echo $artist;?></span>.&nbsp;<?php echo $song; ?></a></h2>
<?php if ($to_user) { gp_the_flag($to_user->ID, 24); ?>
<span>TO: <?php echo bp_core_get_userlink($to_user->ID); ?></span>
<span>TO: <a href="<?php echo bp_core_get_userlink($to_user->ID, false, true); ?>" title="<?php echo bp_core_get_username($to_user->ID); ?>"><?php echo bp_core_get_username($to_user->ID); ?></a></span>
<?php } else { ?>
<?php gp_the_flag('', 24); ?>
<span>TO: <?php echo $to_user->user_nicename; ?></span>

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

@ -118,10 +118,10 @@ class SidebarPosts extends WP_Widget {
$to_user = get_user_by('id', $to_user_id);
?>
<div class="post-meta">
<span>FROM: <?php echo bp_core_get_userlink($from_user_id); ?></span><br/>
<?php if ($to_user) { ?><span>TO: <?php echo bp_core_get_userlink($to_user->ID); ?></span>
<span>FROM: <a href="<?php echo bp_core_get_userlink($from_user_id, false, true); ?>" title="<?php echo bp_core_get_username($from_user_id); ?>"><?php echo bp_core_get_username($from_user_id); ?></a></span><br/>
<?php if ($to_user) { ?><span>TO: <a href="<?php echo bp_core_get_userlink($to_user->ID, false, true); ?>" title="<?php echo bp_core_get_username($to_user->ID); ?>"><?php echo bp_core_get_username($to_user->ID); ?></a></span>
<?php } else { ?>
<span>TO: <?php echo get_post_meta($post->ID, 'ghostpool_destination_user_name', true); ?></span>
<span>TO: <?php echo get_post_meta($post->ID, 'ghostpool_destination_email', true); ?></span>
<?php } ?>
</div>
<?php } ?>

BIN
wp-content/themes/score/lib/images/vimeo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
wp-content/themes/score/lib/images/youtube.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

11
wp-content/themes/score/loop-dedication-data.php
View File

@ -21,10 +21,16 @@ if(get_post_meta($post->ID, 'ghostpool_thumbnail_height', true) && get_post_meta
$gp_settings['artist'] = get_post_meta($post->ID, 'ghostpool_dedication_artist', true);
$gp_settings['song'] = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
$gp_settings['artist_song'] = $gp_settings['artist'] . '. ' . $gp_settings['song'];
$gp_settings['artist_song_span'] = '<span>' . $gp_settings['artist'] . '</span>. ' . $gp_settings['song'];
$gp_settings['artist_song_span_short'] = cutstr($gp_settings['artist_song_span'], 38, '');
if ($gp_settings['artist_song_span_short'] != $gp_settings['artist_song_span']) {
$gp_settings['artist_song_span_short'] .= '...';
}
// from user
$gp_settings['from_user_id'] = get_the_author_meta('ID');
$gp_settings['from_user_link'] = bp_core_get_userlink($gp_settings['from_user_id']);
$gp_settings['from_user_link'] = '<a href="'.bp_core_get_userlink($gp_settings['from_user_id'], false, true).'" title="'.bp_core_get_username($gp_settings['from_user_id']).'">'.bp_core_get_username($gp_settings['from_user_id']).'</a>';
//bp_core_get_userlink($gp_settings['from_user_id']);
$gp_settings['from_flag'] = gp_get_the_flag($gp_settings['from_user_id']);
// to user
@ -34,7 +40,8 @@ $gp_settings['to_user'] = get_user_by ('id', $gp_settings['to_user_id']);
if ($gp_settings['to_user']) {
$gp_settings['to_flag'] = gp_get_the_flag($gp_settings['to_user']->ID, 24);
$gp_settings['to_user_link'] = bp_core_get_userlink($gp_settings['to_user']->ID);
$gp_settings['to_user_link'] = '<a href="'.bp_core_get_userlink($gp_settings['to_user']->ID, false, true).'" title="'.bp_core_get_username($gp_settings['to_user']->ID).'">'.bp_core_get_username($gp_settings['to_user']->ID).'</a>';
//bp_core_get_userlink($gp_settings['to_user']->ID);
} else {
$gp_settings['to_flag'] = gp_get_the_flag('', 24);
$gp_settings['to_user_link'] = get_post_meta($post->ID, 'ghostpool_destination_user_name', true);

2
wp-content/themes/score/members/members-loop.php
View File

@ -44,7 +44,7 @@
<div class="item">
<div class="item-title">
<a href="<?php bp_member_permalink(); ?>"><?php bp_member_name(); ?></a>
<a href="<?php bp_member_permalink(); ?>"><?php bp_member_user_nicename(); ?></a>
<?php if ( bp_get_member_latest_update() ) : ?>

2
wp-content/themes/score/members/single/small-member-header.php
View File

@ -14,7 +14,7 @@
</div>
<div class="columns threefourths last text-left">
<span class="user-nicename"><a href="<?php echo bp_displayed_user_link(); ?>"><?php bp_displayed_user_fullname(); ?></a></span>
<span class="user-nicename"><a href="<?php echo bp_displayed_user_link(); ?>" title="<?php bp_displayed_user_fullname(); ?>"><?php bp_displayed_user_fullname(); ?> (<?php bp_displayed_user_username(); ?>)</a></span>
<div id="item-meta">
<?php if (bp_is_active('dedications')) : ?>
<div class="my-dedications"><?php _e('My dedications:'); ?>&nbsp;<?php echo $bp->dedications->get_count_dedications_from_user(bp_displayed_user_id()); ?></div>

4
wp-content/themes/score/post-loop-dedication.php
View File

@ -65,6 +65,10 @@
<!--Begin Post Text-->
<div class="post-text">
<h2><a href="<?php the_permalink(); ?>" title="<?php echo $artist_song; ?>"><?php echo $new_name; ?></a></h2>
<?php gp_the_flag($from_user_id); ?>
<span>FROM:
<a href="<?php echo bp_core_get_userlink($from_user_id, false, true); ?>" title="<?php echo bp_core_get_username($from_user_id); ?>"><?php echo bp_core_get_username($from_user_id); ?></a>
</span>
<?php echo $gp_settings['to_flag']; ?>
<span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
</div>

12
wp-content/themes/score/video-slider.php
View File

@ -138,11 +138,13 @@ if (have_posts()) {
<?php
gp_the_flag($from_user_id);
?>
<span>FROM: <?php echo bp_core_get_userlink($from_user_id); ?></span>
<span>FROM:
<a href="<?php echo bp_core_get_userlink($from_user_id, false, true); ?>" title="<?php echo bp_core_get_username($from_user_id); ?>"><?php echo bp_core_get_username($from_user_id); ?></a>
</span>
<?php
if ($to_user) {
gp_the_flag($to_user->ID);
?><span>TO: <?php echo bp_core_get_userlink($to_user->ID); ?></span>
gp_the_flag($to_user->ID);
?><span>TO: <a href="<?php echo bp_core_get_userlink($to_user->ID, false, true); ?>" title="<?php echo bp_core_get_username($to_user->ID); ?>"><?php echo bp_core_get_username($to_user->ID); ?></a></span>
<?php } else { ?>
<?php gp_the_flag(); ?>
<span>TO: <?php echo get_post_meta($post->ID, 'ghostpool_destination_user_name', true); ?></span>
@ -179,8 +181,8 @@ if (have_posts()) {
</div>
<div class="columns two last">
<?php if(function_exists('bp_is_active')) { ?>
<a id="dedicate_this_song_button" href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>/new-dedication/" class="button">Dedicate this song</a>
<a href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>/new-dedication/" class="button">Dedicate a song</a>
<a id="dedicate_this_song_button" href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>/new-dedication/" class="button" title="Dedicate this song">Dedicate this song</a>
<a href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>/new-dedication/" class="button" title="Dedicate a song">Dedicate a song</a>
<?php } ?>
</div>