diff --git a/wp-content/plugins/bp-dedication/functions.php b/wp-content/plugins/bp-dedication/functions.php index ef71f2a..15fe98e 100644 --- a/wp-content/plugins/bp-dedication/functions.php +++ b/wp-content/plugins/bp-dedication/functions.php @@ -30,13 +30,11 @@ function bp_dedication_get_dedications_to_user( $user_id ) { if ( !$user_id ) return false; - $user_info = get_userdata($user_id); - $args = array( 'numberposts' => -1, 'category' => 'dedication', - 'meta_key' => 'ghostpool_destination_user_email', - 'meta_value' => $user_info->user_email + 'meta_key' => 'ghostpool_destination_user', + 'meta_value' => $user_id ); $posts_array = get_posts( $args ); diff --git a/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php b/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php index a4ed43e..9829fd8 100644 --- a/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php +++ b/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php @@ -55,13 +55,14 @@ function bp_dedication_create_new_dedication() { $videoData = array(); $videoID = getVideoID($video_url); + if (checkYoutubeId($videoID) == 1) { $xml = getVideoDetails($videoID); if ($xml->title != 'YouTube Videos') { $videoData['videoURL'] = $video_url; $videoData['title'] = $xml->title; $videoData['description'] = $xml->content; - $videoData['thumbnail'] = "http://i.ytimg.com/vi/" . $videoID . "/0.jpg"; + $videoData['thumbnail'] = "http://i.ytimg.com/vi/" . $videoID . "/hqdefault.jpg"; } } @@ -71,7 +72,6 @@ function bp_dedication_create_new_dedication() { 'post_title' => wp_strip_all_tags($title), 'post_content' => '', 'post_category' => array($category->term_id), //Dedication - 'post_status' => 'publish', 'post_status' => $post_status, 'post_type' => 'post' //'post',page' or use a custom post type if you want to ); @@ -83,9 +83,9 @@ function bp_dedication_create_new_dedication() { add_post_meta($post_id, 'ghostpool_dedication_artist', $artist_name); add_post_meta($post_id, 'ghostpool_dedication_song', $song_name); add_post_meta($post_id, 'ghostpool_dedication_url', $videoData['videoURL']); - - + $friend_info = get_userdata($friend_ids[1]); + add_post_meta($post_id, 'ghostpool_destination_user', $friend_info->ID); add_post_meta($post_id, 'ghostpool_destination_user_name', $friend_info->user_login); add_post_meta($post_id, 'ghostpool_destination_user_email', $friend_info->user_email); @@ -124,7 +124,7 @@ function bp_dedication_create_new_dedication() { wp_update_attachment_metadata($attach_id, $attach_data); update_post_meta($post_id, '_thumbnail_id', $attach_id); } catch (Exception $e) { - $error = '

' . $e->getMessage() . '

'; + throw new Exception('

' . $e->getMessage() . '

'); return false; } diff --git a/wp-content/plugins/bp-dedication/includes/bp-dedication-functions.php b/wp-content/plugins/bp-dedication/includes/bp-dedication-functions.php index d545cef..79823dd 100644 --- a/wp-content/plugins/bp-dedication/includes/bp-dedication-functions.php +++ b/wp-content/plugins/bp-dedication/includes/bp-dedication-functions.php @@ -2,22 +2,11 @@ function getVideoID($url) { $url = trim($url); - // make sure url has http on it - if (substr($url, 0, 4) != "http") { - $url = "http://" . $url; - } - // make sure it has the www on it - if (substr($url, 7, 4) != "www.") { - $url = str_replace('http://', 'http://www.', $url); + preg_match('#(\.be/|/embed/|/v/|/watch\?v=)([A-Za-z0-9_-]{5,11})#', $url, $matches); + if(isset($matches[2]) && $matches[2] != '') { + return $matches[2]; } - - // extract the youtube ID from the url - if (substr($url, 0, 31) == "http://www.youtube.com/watch?v=") { - $id = substr($url, 31, 11); - } - - return $id; } function checkYoutubeId($id) { diff --git a/wp-content/plugins/bp-dedication/includes/bp-dedication-screens.php b/wp-content/plugins/bp-dedication/includes/bp-dedication-screens.php index 94b8da2..24a0e06 100644 --- a/wp-content/plugins/bp-dedication/includes/bp-dedication-screens.php +++ b/wp-content/plugins/bp-dedication/includes/bp-dedication-screens.php @@ -73,9 +73,10 @@ function bp_dedication_new_dedication() { if (bp_dedication_create_new_dedication()) { bp_core_add_message( __( 'Your dedication was created!', 'bp-dedication' ) ); + bp_core_redirect( bp_loggedin_user_domain() . bp_get_dedication_slug()); + } else { + } - - bp_core_redirect( bp_loggedin_user_domain() . bp_get_dedication_slug()); } do_action( 'bp_dedication_new_dedication' ); diff --git a/wp-content/plugins/bp-dedication/includes/js/dedication-script.js b/wp-content/plugins/bp-dedication/includes/js/dedication-script.js index b6ce049..46160b4 100644 --- a/wp-content/plugins/bp-dedication/includes/js/dedication-script.js +++ b/wp-content/plugins/bp-dedication/includes/js/dedication-script.js @@ -30,6 +30,12 @@ jQuery(document).ready(function(){ j("#dedicate_to_input").autocomplete(options); + j("#dedicate_to_input").change(function(){ + if(j('#dedicate_to_input').val() == '') { + j('#friend_ids').val(''); + } + }); + var url = ''; j('#video_url').change(function(){ diff --git a/wp-content/themes/score/dedications/single/dedicated-2-me.php b/wp-content/themes/score/dedications/single/dedicated-2-me.php index 9480458..3979f43 100644 --- a/wp-content/themes/score/dedications/single/dedicated-2-me.php +++ b/wp-content/themes/score/dedications/single/dedicated-2-me.php @@ -6,16 +6,20 @@ $dedications = bp_dedication_get_dedications_to_user( $bp->displayed_user->id ); - - + + +
>
thumbnail-no-wrap"> - + <?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 {
diff --git a/wp-content/themes/score/dedications/single/my-dedications.php b/wp-content/themes/score/dedications/single/my-dedications.php
index 4647b52..208ca80 100644
--- a/wp-content/themes/score/dedications/single/my-dedications.php
+++ b/wp-content/themes/score/dedications/single/my-dedications.php
@@ -6,16 +6,21 @@ $dedications = bp_dedication_get_dedications_from_user($bp->displayed_user->id);
 
 <?php foreach ($dedications as $post) : ?>
     <?php setup_postdata($post); ?>
+
+    <?php 
+	$gp_settings['thumbnail_width'] = $theme_cat_thumbnail_width;
+	$gp_settings['thumbnail_height'] = $theme_cat_thumbnail_height;
+    ?>
+
     <?php include(dirname(__FILE__).'/../../loop-dedication-data.php'); ?>
 
-    <?php $gp_settings['image_width'] = 280; ?>
 
     <div <?php post_class('post-loop'); ?>>
         <!--Begin Image-->
         <?php if (has_post_thumbnail()) { ?>					
             <div class= thumbnail-no-wrap"> - + <?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 {
diff --git a/wp-content/themes/score/index.php b/wp-content/themes/score/index.php
index 3200f34..4db8e29 100644
--- a/wp-content/themes/score/index.php
+++ b/wp-content/themes/score/index.php
@@ -34,8 +34,8 @@ query_posts($args);
                              <?php 
                              $artist = get_post_meta($post->ID, 'ghostpool_dedication_artist', true);
                              $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
-                             $to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true);
-                             $to_user = get_user_by ('email', $to_user_email);
+                             $to_user_id = get_post_meta($post->ID, 'ghostpool_destination_user', true);
+                             $to_user = get_user_by ('id', $to_user_id);
                              ?>
                             <h2><a href=" title=""> @@ -43,7 +43,7 @@ query_posts($args); TO: ID); ?> - TO: ID, 'ghostpool_destination_user_name', true); ?> + TO: user_nicename; ?>
diff --git a/wp-content/themes/score/lib/admin/inc/theme-update-notification.php b/wp-content/themes/score/lib/admin/inc/theme-update-notification.php index c3d8842..81505aa 100644 --- a/wp-content/themes/score/lib/admin/inc/theme-update-notification.php +++ b/wp-content/themes/score/lib/admin/inc/theme-update-notification.php @@ -31,7 +31,7 @@ function gp_update_notifier_menu() { } } } -add_action('admin_menu', 'gp_update_notifier_menu'); +//add_action('admin_menu', 'gp_update_notifier_menu'); @@ -51,7 +51,7 @@ function gp_update_notifier_bar_menu() { } } } -add_action( 'admin_bar_menu', 'gp_update_notifier_bar_menu', 1000 ); +//add_action( 'admin_bar_menu', 'gp_update_notifier_bar_menu', 1000 ); diff --git a/wp-content/themes/score/lib/admin/inc/theme-widgets.php b/wp-content/themes/score/lib/admin/inc/theme-widgets.php index d5cea67..dbea5c5 100644 --- a/wp-content/themes/score/lib/admin/inc/theme-widgets.php +++ b/wp-content/themes/score/lib/admin/inc/theme-widgets.php @@ -1,570 +1,662 @@ 'sidebarposts', 'description' => __('Enhanced display for your sidebar posts.', 'gp_lang')); - $this->WP_Widget('sidebar-posts-widget', __('GP Sidebar Posts', 'gp_lang'), $widget_ops); - } - function widget($args, $instance) { - global $gp_settings, $post, $wp_query, $paged; - extract($args); - $title = apply_filters('widget_title', $instance['title']); - $cats = $instance['cats']; - $number = $instance['number']; - $images = $instance['images']; - $image_width = $instance['image_width']; - $image_height = $instance['image_height']; - $post_title = $instance['post_title']; - $post_artist_song = $instance['post_artist_song']; - $post_from_to = $instance['post_from_to']; - $post_cats = $instance['post_cats']; - $post_meta = $instance['post_meta']; - $gd_sort = $instance['gd_sort']; - $gd_order = $instance['gd_order']; - $after_text = htmlspecialchars_decode($instance['after_text']); - - require(ghostpool_inc . 'options.php'); - - // Begin Widget - echo $before_widget; ?> - -
- - 'sidebarposts', 'description' => __('Enhanced display for your sidebar posts.', 'gp_lang')); + $this->WP_Widget('sidebar-posts-widget', __('GP Sidebar Posts', 'gp_lang'), $widget_ops); + } - $args=array( - 'posts_per_page' => $number, - 'gdsr_sort' => $gd_sort, - 'gdsr_order' => $gd_order, - 'cat' => $cats - ); - - $temp = $wp_query; - $wp_query = null; - $wp_query = new WP_Query(); - $wp_query->query($args); - - // Column Width - $column_width = "300"; - - if($wp_query->have_posts()) : while($wp_query->have_posts()) : $wp_query->the_post(); $counter++; + function string_limit_words($string, $word_limit) { + $words = explode(' ', $string, ($word_limit + 1)); + if (count($words) > $word_limit) + array_pop($words); + return implode(' ', $words); + } - // Post Type - $gp_settings['post_type'] = get_post_meta($post->ID, 'ghostpool_post_type', true); - - // Display First Image - if($images == "First Image") { - $image_counter = $counter == 1; - } else { - $image_counter = ""; - } - ?> - -
> + function widget($args, $instance) { + global $gp_settings, $post, $wp_query, $paged; + extract($args); + $title = apply_filters('widget_title', $instance['title']); + $cats = $instance['cats']; + $number = $instance['number']; + $images = $instance['images']; + $image_width = $instance['image_width']; + $image_height = $instance['image_height']; + $post_title = $instance['post_title']; + $post_artist_song = $instance['post_artist_song']; + $post_from_to = $instance['post_from_to']; + $post_cats = $instance['post_cats']; + $post_meta = $instance['post_meta']; + $gd_sort = $instance['gd_sort']; + $gd_order = $instance['gd_order']; + $after_text = htmlspecialchars_decode($instance['after_text']); - - -
- - - <?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(); } ?> - -
- - - - -
- - - - - - - - ID, 'ghostpool_dedication_artist', true); - $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);?> - - - + require(ghostpool_inc . 'options.php'); - ID, 'ghostpool_destination_user_email', true); - $to_user = get_user_by ('email', $to_user_email);?> - - - - -
- - - - - - - + // Begin Widget + echo $before_widget; + ?> -
- - -
- - -
- - - -
- - - function update($new_instance, $old_instance) { - $instance = $old_instance; - $instance['title'] = strip_tags($new_instance['title']); - $instance['cats'] = strip_tags($new_instance['cats']); - $instance['number'] = strip_tags($new_instance['number']); - $instance['images'] = $_POST['images']; - $instance['image_width'] = strip_tags($new_instance['image_width']); - $instance['image_height'] = strip_tags($new_instance['image_height']); - $instance['post_title'] = $_POST['post_title']; - $instance['post_artist_song'] = $_POST['post_artist_song']; - $instance['post_from_to'] = $_POST['post_from_to']; - $instance['post_cats'] = $_POST['post_cats']; - $instance['post_meta'] = $_POST['post_meta']; - $instance['score_type'] = $_POST['score_type']; - $instance['gd_sort'] = $_POST['gd_sort']; - $instance['gd_order'] = $_POST['gd_order']; - $instance['after_text'] = htmlspecialchars($new_instance['after_text']); - return $instance; - } + $number, + 'gdsr_sort' => $gd_sort, + 'gdsr_order' => $gd_order, + 'cat' => $cats + ); - $defaults = array( - 'title' => '', - 'cats' => '', - 'number' => 1, - 'images' => __('All Images', 'gp_lang'), - 'image_width' => '50', - 'image_height' => '0', - 'post_title' => __('No', 'gp_lang'), - 'post_artist_song' => __('Yes', 'gp_lang'), - 'post_from_to' => __('Yes', 'gp_lang'), - 'post_cats' => __('Yes', 'gp_lang'), - 'score_type' => __('Site Score', 'gp_lang'), - 'post_meta' => __('Yes', 'gp_lang'), - 'gd_sort' => 'review', - 'gd_order' => 'desc', - 'after_text' => '' - ); - $instance = wp_parse_args((array) $instance, $defaults); ?> + $temp = $wp_query; + $wp_query = null; + $wp_query = new WP_Query(); + $wp_query->query($args); -

- -
-

-

- -
-

-

- -
-

-

- - -

-

- -
-

-

- -
-

-

- - -

-

- - -

-

- - -

+ // Column Width + $column_width = "300"; -

- - -

- - -

- - -

-

- - -

-

- - -

-

- - -

- - - - have_posts()) : while ($wp_query->have_posts()) : $wp_query->the_post(); + $counter++; + + // Post Type + $gp_settings['post_type'] = get_post_meta($post->ID, 'ghostpool_post_type', true); + + // Display First Image + if ($images == "First Image") { + $image_counter = $counter == 1; + } else { + $image_counter = ""; + } + ?> + +
> + + + +
+ + + <?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();
+                    } ?> + +
+ + + + +
+ + + + + + + + ID, 'ghostpool_dedication_artist', true); + $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true); + $artist_song = $artist . '. ' . $song; + ?> + + + + + ID, 'ghostpool_destination_user', true); + $to_user = get_user_by('id', $to_user_id); + ?> + + + + +
+ + + + + + + + +
+ + +
+ + +
+ + + +
+ + '', + 'cats' => '', + 'number' => 1, + 'images' => __('All Images', 'gp_lang'), + 'image_width' => '50', + 'image_height' => '0', + 'post_title' => __('No', 'gp_lang'), + 'post_artist_song' => __('Yes', 'gp_lang'), + 'post_from_to' => __('Yes', 'gp_lang'), + 'post_cats' => __('Yes', 'gp_lang'), + 'score_type' => __('Site Score', 'gp_lang'), + 'post_meta' => __('Yes', 'gp_lang'), + 'gd_sort' => 'review', + 'gd_order' => 'desc', + 'after_text' => '' + ); + $instance = wp_parse_args((array) $instance, $defaults); + ?> + +

+ +
+

+

+ +
+

+

+ +
+

+

+ + +

+

+ +
+

+

+ +
+

+

+ + +

+

+ + +

+

+ + +

+ +

+ + +

+ + +

+ + +

+

+ + +

+

+ + +

+

+ + +

+ + + + 'footerposts', 'description' => __('Enhanced display for your footer posts.', 'gp_lang')); + $this->WP_Widget('footer-posts-widget', __('GP Footer Posts', 'gp_lang'), $widget_ops); + } + + function widget($args, $instance) { + global $gp_settings, $post, $wp_query, $paged; + extract($args); + $title = apply_filters('widget_title', $instance['title']); + $cats = $instance['cats']; + $number = $instance['number']; + $images = $instance['images']; + $image_width = $instance['image_width']; + $image_height = $instance['image_height']; + $post_cats = $instance['post_cats']; + $post_meta = $instance['post_meta']; + $score_type = $instance['score_type']; + $gd_sort = $instance['gd_sort']; + $gd_order = $instance['gd_order']; + + require(ghostpool_inc . 'options.php'); + + // Begin Widget + echo $before_widget; + ?> + +
+ + $number, + 'gdsr_sort' => $gd_sort, + 'gdsr_order' => $gd_order, + 'cat' => $cats + ); + + $temp = $wp_query; + $wp_query = null; + $wp_query = new WP_Query(); + $wp_query->query($args); + + // Widget Width + if (is_active_sidebar('footer-1') && is_active_sidebar('footer-2') && is_active_sidebar('footer-3') && is_active_sidebar('footer-4')) { + $column_width = "207.5"; + } elseif (is_active_sidebar('footer-1') && is_active_sidebar('footer-2') && is_active_sidebar('footer-3')) { + $column_width = "286.6"; + } elseif (is_active_sidebar('footer-1') && is_active_sidebar('footer-2')) { + $column_width = "445"; + } elseif (is_active_sidebar('footer-1')) { + $column_width = "920"; + } + + if ($wp_query->have_posts()) : while ($wp_query->have_posts()) : $wp_query->the_post(); + $counter++; + + // Post Type + $gp_settings['post_type'] = get_post_meta($post->ID, 'ghostpool_post_type', true); + + if (defined('STARRATING_INSTALLED')) { + + $gp_gdsr = wp_gdsr_rating_article(); + + // Site Score Colors + if ($gp_gdsr->review <= $theme_score_range_2) { + $site_score_color = ' style="background: ' . $theme_site_score_color_1 . ';"'; + } elseif ($gp_gdsr->review >= $theme_score_range_3 && $gp_gdsr->review <= $theme_score_range_4) { + $site_score_color = ' style="background: ' . $theme_site_score_color_2 . ';"'; + } elseif ($gp_gdsr->review >= $theme_score_range_5 && $gp_gdsr->review <= $theme_score_range_6) { + $site_score_color = ' style="background: ' . $theme_site_score_color_3 . ';"'; + } elseif ($gp_gdsr->review >= $theme_score_range_7) { + $site_score_color = ' style="background: ' . $theme_site_score_color_4 . ';"'; + } + + // User Score Colors + if ($gp_gdsr->rating <= $theme_score_range_2) { + $user_score_color = ' style="background: ' . $theme_user_score_color_1 . ';"'; + } elseif ($gp_gdsr->rating >= $theme_score_range_3 && $gp_gdsr->rating <= $theme_score_range_4) { + $user_score_color = ' style="background: ' . $theme_user_score_color_2 . ';"'; + } elseif ($gp_gdsr->rating >= $theme_score_range_5 && $gp_gdsr->rating <= $theme_score_range_6) { + $user_score_color = ' style="background: ' . $theme_user_score_color_3 . ';"'; + } elseif ($gp_gdsr->rating >= $theme_score_range_7) { + $user_score_color = ' style="background: ' . $theme_user_score_color_4 . ';"'; + } + } + + // Display First Image + if ($images == "First Image") { + $image_counter = $counter == 1; + } else { + $image_counter = ""; + } + + // Post Text Width + if (!has_post_thumbnail() OR $images == "No Images" OR ($images == "First Image" && !$image_counter) OR $image_width >= 175) { + $post_text_width = $column_width; + } else { + $post_text_width = $column_width - $image_width - 17; + } + + // Post Left Width + if ($gp_settings['post_type'] == "Review" && ($score_type == "Site Score" && $gp_gdsr->review > 0) OR ($score_type == "User Score" && $gp_settings['user_voting'] != "Users cannot vote") OR ($score_type == "Site & User Score" && ($gp_gdsr->review > 0 OR $gp_settings['user_voting'] != "Users cannot vote"))) { + $post_left_width = $post_text_width - 49; + } else { + $post_left_width = $post_text_width; + } + ?> + +
> + + + +
+ + + + <?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();
+                    } ?> + +
+ + + + +
review <= 0 && $gp_settings['user_voting'] == "Users cannot vote"))) { ?> hidden" style="width: px;"> + +
+ + + + +
+ + + + + + +
+ + + review > 0 OR $gp_settings['user_voting'] != "Users cannot vote"))) { ?> + +
+ + + review > 0) { ?> +
> + review; ?> +
+ + + + + +
> + rating; ?> +
+ + + +
+ + + + +
+ + +
+ + + +
+ + '', 'cats' => '', 'number' => 5, 'images' => __('All Images', 'gp_lang'), 'image_width' => '50', 'image_height' => '0', 'post_cats' => __('Yes', 'gp_lang'), 'score_type' => __('Site Score', 'gp_lang'), 'post_meta' => __('Yes', 'gp_lang'), 'gd_sort' => 'review', 'gd_order' => 'desc'); + $instance = wp_parse_args((array) $instance, $defaults); + ?> + +

+ +
+

+

+ +
+

+

+ +
+

+

+ + +

+

+ +
+

+

+ +
+

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+ + + + 'footerposts', 'description' => __('Enhanced display for your footer posts.', 'gp_lang')); - $this->WP_Widget('footer-posts-widget', __('GP Footer Posts', 'gp_lang'), $widget_ops); - } - - function widget($args, $instance) { - global $gp_settings, $post, $wp_query, $paged; - extract($args); - $title = apply_filters('widget_title', $instance['title']); - $cats = $instance['cats']; - $number = $instance['number']; - $images = $instance['images']; - $image_width = $instance['image_width']; - $image_height = $instance['image_height']; - $post_cats = $instance['post_cats']; - $post_meta = $instance['post_meta']; - $score_type = $instance['score_type']; - $gd_sort = $instance['gd_sort']; - $gd_order = $instance['gd_order']; - - require(ghostpool_inc . 'options.php'); - - // Begin Widget - echo $before_widget; ?> - -
- - $number, - 'gdsr_sort' => $gd_sort, - 'gdsr_order' => $gd_order, - 'cat' => $cats - ); - - $temp = $wp_query; - $wp_query = null; - $wp_query = new WP_Query(); - $wp_query->query($args); - - // Widget Width - if(is_active_sidebar('footer-1') && is_active_sidebar('footer-2') && is_active_sidebar('footer-3') && is_active_sidebar('footer-4')) { - $column_width = "207.5"; - } - elseif(is_active_sidebar('footer-1') && is_active_sidebar('footer-2') && is_active_sidebar('footer-3')) { - $column_width = "286.6"; - } - elseif(is_active_sidebar('footer-1') && is_active_sidebar('footer-2')) { - $column_width = "445"; - } - elseif(is_active_sidebar('footer-1')) { - $column_width = "920"; - } - - if($wp_query->have_posts()) : while($wp_query->have_posts()) : $wp_query->the_post(); $counter++; - - // Post Type - $gp_settings['post_type'] = get_post_meta($post->ID, 'ghostpool_post_type', true); - - if(defined('STARRATING_INSTALLED')) { - - $gp_gdsr = wp_gdsr_rating_article(); - - // Site Score Colors - if($gp_gdsr->review <= $theme_score_range_2) { - $site_score_color = ' style="background: '.$theme_site_score_color_1.';"'; - } elseif($gp_gdsr->review >= $theme_score_range_3 && $gp_gdsr->review <= $theme_score_range_4) { - $site_score_color = ' style="background: '.$theme_site_score_color_2.';"'; - } elseif($gp_gdsr->review >= $theme_score_range_5 && $gp_gdsr->review <= $theme_score_range_6) { - $site_score_color = ' style="background: '.$theme_site_score_color_3.';"'; - } elseif($gp_gdsr->review >= $theme_score_range_7) { - $site_score_color = ' style="background: '.$theme_site_score_color_4.';"'; - } - - // User Score Colors - if($gp_gdsr->rating <= $theme_score_range_2) { - $user_score_color = ' style="background: '.$theme_user_score_color_1.';"'; - } elseif($gp_gdsr->rating >= $theme_score_range_3 && $gp_gdsr->rating <= $theme_score_range_4) { - $user_score_color = ' style="background: '.$theme_user_score_color_2.';"'; - } elseif($gp_gdsr->rating >= $theme_score_range_5 && $gp_gdsr->rating <= $theme_score_range_6) { - $user_score_color = ' style="background: '.$theme_user_score_color_3.';"'; - } elseif($gp_gdsr->rating >= $theme_score_range_7) { - $user_score_color = ' style="background: '.$theme_user_score_color_4.';"'; - } - - } - - // Display First Image - if($images == "First Image") { - $image_counter = $counter == 1; - } else { - $image_counter = ""; - } - - // Post Text Width - if(!has_post_thumbnail() OR $images == "No Images" OR ($images == "First Image" && !$image_counter) OR $image_width >= 175) { - $post_text_width = $column_width; - - } else { - $post_text_width = $column_width - $image_width - 17; - } - - // Post Left Width - if($gp_settings['post_type'] == "Review" && ($score_type == "Site Score" && $gp_gdsr->review > 0) OR ($score_type == "User Score" && $gp_settings['user_voting'] != "Users cannot vote") OR ($score_type == "Site & User Score" && ($gp_gdsr->review > 0 OR $gp_settings['user_voting'] != "Users cannot vote"))) { - $post_left_width = $post_text_width - 49; - } else { - $post_left_width = $post_text_width; - } - - ?> - -
> - - - -
- - - - <?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(); } ?> - -
- - - - -
review <= 0 && $gp_settings['user_voting'] == "Users cannot vote"))) { ?> hidden" style="width: px;"> - -
- - - - -
- - - - - - -
- - - review > 0 OR $gp_settings['user_voting'] != "Users cannot vote"))) { ?> - -
- - - review > 0) { ?> -
> - review; ?> -
- - - - - -
> - rating; ?> -
- - - -
- - - - -
- - -
- - - -
- - '', 'cats' => '', 'number' => 5, 'images' => __('All Images', 'gp_lang'), 'image_width' => '50', 'image_height' => '0', 'post_cats' => __('Yes', 'gp_lang'), 'score_type' => __('Site Score', 'gp_lang'), 'post_meta' => __('Yes', 'gp_lang'), 'gd_sort' => 'review', 'gd_order' => 'desc'); - $instance = wp_parse_args((array) $instance, $defaults); ?> - -

- -
-

-

- -
-

-

- -
-

-

- - -

-

- -
-

-

- -
-

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

- - - - \ No newline at end of file diff --git a/wp-content/themes/score/loop-dedication-data.php b/wp-content/themes/score/loop-dedication-data.php index 0fd466c..2bca261 100644 --- a/wp-content/themes/score/loop-dedication-data.php +++ b/wp-content/themes/score/loop-dedication-data.php @@ -28,8 +28,9 @@ $gp_settings['from_user_link'] = bp_core_get_userlink($gp_settings['from_user_id $gp_settings['from_flag'] = gp_get_the_flag($gp_settings['from_user_id']); // to user +$gp_settings['to_user_id'] = get_post_meta($post->ID, 'ghostpool_destination_user', true); $gp_settings['to_user_email'] = get_post_meta($post->ID, 'ghostpool_destination_user_email', true); -$gp_settings['to_user'] = get_user_by ('email', $gp_settings['to_user_email']); +$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); diff --git a/wp-content/themes/score/members/single/home.php b/wp-content/themes/score/members/single/home.php index 37b67bc..6a5a61f 100644 --- a/wp-content/themes/score/members/single/home.php +++ b/wp-content/themes/score/members/single/home.php @@ -8,7 +8,6 @@ */ ?> -
diff --git a/wp-content/themes/score/post-loop-dedication.php b/wp-content/themes/score/post-loop-dedication.php index efad736..9e0ece9 100644 --- a/wp-content/themes/score/post-loop-dedication.php +++ b/wp-content/themes/score/post-loop-dedication.php @@ -30,7 +30,7 @@
thumbnail-no-wrap"> - + <?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(); } ?>
diff --git a/wp-content/themes/score/style-asong2u.css b/wp-content/themes/score/style-asong2u.css index 9e02cb7..68d7efe 100644 --- a/wp-content/themes/score/style-asong2u.css +++ b/wp-content/themes/score/style-asong2u.css @@ -360,6 +360,10 @@ ul.navmenu li a.profile { /*************************** Page/Post ***************************/ +.page-title { + border: none; +} + /* Share */ #share-review-link a { color: #077dc8; @@ -527,8 +531,21 @@ ul.navmenu li a.profile { float: left; } +#sidebar-home .widget.top_members a { + color: #bf2d2d; +} + +#sidebar-home .widget.top_members h3 { + color: #bf2d2d !important; + font-size: 12px; + text-transform: uppercase; +} + #sidebar-home .widget.top_members .post-text { text-align: center; + font-size: 12px; + font-weight: bold; + float: none; } #sidebar-home .widget.top_members a.button { @@ -537,13 +554,15 @@ ul.navmenu li a.profile { background: #f4d2e3; border: 1px solid #eaa5ba; display: inline-block; + font-size: 14px; line-height: 14px; - font-weight: bold; + font-weight: bold; } /* Sidebarposts widget */ #sidebar-home .widget.sidebarposts { float: right; + overflow: hidden; } .widget.top_members img, @@ -560,6 +579,7 @@ ul.navmenu li a.profile { min-height: 150px; margin: 0; padding-bottom: 0; + border: none; } .widget.top_members .post-loop .post-meta, @@ -580,7 +600,25 @@ ul.navmenu li a.profile { .widget.sidebarposts h3, .widget.sidebarposts .post-loop .post-text { color: #34a089 !important; - text-align: center; + text-align: left; + font-size: 12px; +} + +.widget.sidebarposts a { + color: #34a089 !important; +} + +.widget.sidebarposts a span { + font-weight: bold; +} + +.widget.sidebarposts .post-loop .post-meta { + color: #34a089; + white-space: nowrap; +} + +.widget.sidebarposts .post-loop .post-meta span a { + font-weight: bold; } .widget.sidebarposts a.button { @@ -594,7 +632,24 @@ ul.navmenu li a.profile { font-weight: bold; } +.widget.sidebarposts .post-text .post-artist-song { + white-space: nowrap; +} +.widget.widget_specialrecentposts { + +} + +.widget.widget_specialrecentposts h4 { + font-size: 13px; + line-height: 110%; + font-family: Georgia, "Times New Roman", Times, serif; +} + +.srp-widget-singlepost { + border: none !important; + margin: 0 !important; +} /*************************** Page Navigation ***************************/ @@ -723,11 +778,13 @@ h3.comments { .category-dedication.post-loop { text-align: left; - max-height:280px; - min-height:280px; + max-height:220px; + min-height:220px; border-bottom: 0; width: 32% !important; - padding-right: 1%; + margin: 0 0 10px 0; + padding: 0; + padding-right: 1%; } .home-page .post-loop { diff --git a/wp-content/themes/score/video-slider.php b/wp-content/themes/score/video-slider.php index 5d67ceb..5164857 100644 --- a/wp-content/themes/score/video-slider.php +++ b/wp-content/themes/score/video-slider.php @@ -53,6 +53,7 @@ if (have_posts()) { $from_user_id = get_the_author_meta('ID'); $to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true); + $to_user = get_post_meta($post->ID, 'ghostpool_destination_user', true); // Usuario actual puede ver la dedicatoria? if (get_post_status($post-ID) == 'private') { @@ -102,7 +103,6 @@ if (have_posts()) { ?> FROM: ID); ?>TO: ID); ?> diff --git a/wp-content/uploads/2012/07/177110469_6401-280x157.jpg b/wp-content/uploads/2012/07/177110469_6401-280x157.jpg index b387a44..5af767a 100644 Binary files a/wp-content/uploads/2012/07/177110469_6401-280x157.jpg and b/wp-content/uploads/2012/07/177110469_6401-280x157.jpg differ