Subida a producción de la maqueta

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@9 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
This commit is contained in:
David Arranz 2012-07-16 15:58:15 +00:00
parent 40b6105f9d
commit 8acf4ea66a
7 changed files with 208 additions and 124 deletions

View File

@ -280,7 +280,7 @@ class Top_Members extends WP_Widget {
$defaults = array(
'title' => __( 'Top Members', 'top_members'),
'number' => __(1, 'top_members'),
'template' => __('<li>Thanks %firstname% %lastname% !!!<br/><a href="%linktoposts%">%gravatar% %firstname% %lastname% </a> has recommended us to %nrofposts% friends!!!</li>', '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'),
'linkbase' => 'buddypress/members',
'author_link' => 'username',
'before' => __('<ul>', 'top_members'),

View File

@ -98,10 +98,11 @@
<?php if(is_home() || is_front_page()) { ?>
<?php require('video-slider.php'); ?>
<div id="precontent-wrapper">
<div id="dedicationComments_container" class="columns two first blank text-left">&nbsp;</div>
<div id="sidebar-home" class="columns two last blank text-left">
<div id="dedicationComments_container" class="columns two first text-left">&nbsp;</div>
<div id="sidebar-home" class="columns two last text-left">
<?php dynamic_sidebar('homepage-1'); ?>
</div>
<div class="clear"></div>
</div>
<div class="clear"></div>

View File

@ -1,72 +1,71 @@
<?php
// Do not delete these lines
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
die('Please do not load this page directly. Thanks!');
if (post_password_required()) {
?>
<?php
return;
}
?>
<?php
/* * ************************* Comment Template ************************** */
global $current_user, $gp_settings;
require(ghostpool_inc . 'options.php');
$comment_array = array_reverse(get_approved_comments(get_the_ID()));
$count = 1;
?>
<?php if ($comment_array) { ?>
<div id="comments">
<h3 class="comments">
<?php comments_number(__('No Comments', 'gp_lang'), __('1 Comment', 'gp_lang'), __('% Comments', 'gp_lang')); ?>
<?php if (count($comment_array) > 2) : ?>
/ <a href="<?php the_permalink(); ?>" class="read-more" title="<?php the_title(); ?>"><?php _e('Read More', 'gp_lang'); ?> &raquo;</a>
<?php endif; ?>
</h3>
<ol id="commentlist">
<?php foreach($comment_array as $comment) { ?>
<?php if ($count++ <= 2) { ?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
<div id="comment-<?php comment_ID() ?>" class="comment-box">
<div class="comment-avatar">
<?php echo get_avatar($comment,$size='50'); ?>
</div>
<div class="comment-meta">
<span class="comment-author">
<?php printf(__('%s', 'gp_lang'), comment_author_link()) ?>
</span>
<span class="post-author">(<?php _e('Author', 'gp_lang'); ?>)</span>
<div class="clear"></div>
<div class="comment-date">
<?php comment_time(get_option('date_format')); ?>, <?php comment_time(get_option('time_format')); ?>
</div>
</div>
<div class="clear"></div>
<div class="comment-text">
<?php comment_text(); ?>
<?php if($comment->comment_approved == '0') { ?>
<div class="moderation">
<?php _e('Your comment is awaiting moderation.', 'gp_lang'); ?>
</div>
<?php } ?>
</div>
</div>
</li>
<?php } ?>
<?php } ?>
</ol>
</div>
<?php } else { ?>
&nbsp;
<?php } ?>
<?php
// Do not delete these lines
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
die('Please do not load this page directly. Thanks!');
if (post_password_required()) {
?>
<?php
return;
}
?>
<?php
/* * ************************* Comment Template ************************** */
global $current_user, $gp_settings;
require(ghostpool_inc . 'options.php');
$comment_array = array_reverse(get_approved_comments(get_the_ID()));
$count = 1;
?>
<?php if ($comment_array) { ?>
<div id="comments">
<ol id="commentlist">
<?php foreach ($comment_array as $comment) { ?>
<?php if ($count++ <= 2) { ?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
<div id="comment-<?php comment_ID() ?>" class="comment-box">
<div class="comment-avatar">
<?php echo get_avatar($comment, $size = '50'); ?>
</div>
<div class="comment-meta">
<span class="comment-author">
<?php printf(__('%s', 'gp_lang'), comment_author_link()) ?>
</span>
<div class="clear"></div>
<div class="comment-date">
<?php comment_time(get_option('date_format')); ?>, <?php comment_time(get_option('time_format')); ?>
</div>
<div class="clear"></div>
<div class="comment-text">
<?php comment_text(); ?>
<?php if ($comment->comment_approved == '0') { ?>
<div class="moderation">
<?php _e('Your comment is awaiting moderation.', 'gp_lang'); ?>
</div>
<?php } ?>
</div>
</div>
<div class="clear"></div>
</div>
</li>
<?php } ?>
<?php } ?>
</ol>
<?php if (count($comment_array) > 2) : ?>
<div class="more-comments">
<a href="<?php the_permalink(); ?>" class="read-more" title="<?php the_title(); ?>"><?php _e('See More', 'gp_lang'); ?> &raquo;</a>
</div>
<?php endif; ?>
</div>
<?php } else { ?>
&nbsp;
<?php } ?>

View File

@ -10,7 +10,7 @@
position:absolute;
top:0px;
left:0px;
width:900px;
width:100%;
height:500px;
overflow:hidden;
}
@ -191,8 +191,8 @@
position:absolute;
top:50%;
left:50%;
margin:-25px 0px 0px -75px;
background:#000 url('../data/loader.gif') no-repeat center center;
margin:-25px 0px 0px -25px;
background:url('../data/loader.gif') no-repeat center center;
width:50px;
height:50px;
z-index:999;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -4,6 +4,7 @@
body {
border-top: 1px solid #616161;
background: #fff url(lib/images/background.png) left -15px repeat-x;
font-family: Arial, Helvetica,sans-serif;
}
/* Text Styling */
@ -15,7 +16,7 @@ a:hover {
}
h1, h2, h3, h4, h5, h6,
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
color: #58697b !important;
color: #576a7b !important;
}
h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {
color: #1eadff;
@ -86,7 +87,7 @@ input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hove
/* Main Content */
#content {
width: 720px;
width: 775px;
margin-bottom: 20px;
}
@ -99,7 +100,7 @@ input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hove
/* Sidebar */
#sidebar {
width: 230px;
width: 155px; /*230px;*/
}
@ -162,6 +163,7 @@ ul.navmenu li a.profile {
}
.login-name {
color: #596a7c;
width: 40%;
float: left;
margin-top: 50px;
@ -287,26 +289,29 @@ ul.navmenu li a.profile {
#dedicationFooter_container .last .button {
float: right;
margin-left: 6px;
margin-top: 44px;
width: 190px;
margin-left: 5px;
margin-top: 48px;
width: 155px;
font-size: 13px;
font-weight: bold;
padding: 3px 0;
}
#dedicationFooter_container h3 {
margin: 10px 0 5px 15px;
margin: 10px 0 5px 8px;
font-size: 24px;
}
#dedicationFooter_container h4 {
margin: 0px 0 0 15px;
margin: 0px 0 0 8px;
}
#slider-wrapper {
margin-bottom: 30px;
margin-bottom: 15px;
border-top: none;
padding: 0;
height: 650px;
width: 100%;
width: 978px;
border: 1px solid #349bbc;
/*box-shadow:inset 0 0 3px #989898;
-moz-box-shadow:inset 0 0 3px #989898;*/
@ -346,6 +351,11 @@ ul.navmenu li a.profile {
#dedicationComments_container {
display: inline-block;
width: 67.64% !important;
}
#dedicationComments_container #comments {
}
/*************************** Page/Post ***************************/
@ -474,7 +484,7 @@ ul.navmenu li a.profile {
/* General Widget Styling */
.widget h3 {
text-align: center;
width: 100%;
width: 153px;
background: #cce6f5;
border: 1px solid #2c85c7;
color: #7da0b6;
@ -485,9 +495,13 @@ ul.navmenu li a.profile {
font-size: 14px;
}
#sidebar-home {
width: 32.36% !important;
}
/* Homepage Widget Styling */
#sidebar-home .widget {
width: 230px;
width: 155px;
/*width: 47%;
margin-left: 3%;*/
margin-bottom: 30px;
@ -509,7 +523,12 @@ ul.navmenu li a.profile {
/* Top members widget */
#sidebar-home .widget.top_members {
color: #bf2d2d;
width: 240px;
width: 155px;
float: left;
}
#sidebar-home .widget.top_members .post-text {
text-align: center;
}
#sidebar-home .widget.top_members a.button {
@ -523,13 +542,18 @@ ul.navmenu li a.profile {
}
/* Sidebarposts widget */
#sidebar-home .widget.sidebarposts {
float: right;
}
.widget.top_members img,
.widget.sidebarposts img {
padding: 0;
border: 0;
margin: 5px 0;
}
.widget.top_members .post-loop,
.widget.sidebarposts .post-loop {
width: 100% !important;
max-height: 150px;
@ -538,14 +562,17 @@ ul.navmenu li a.profile {
padding-bottom: 0;
}
.widget.top_members .post-loop .post-meta,
.widget.sidebarposts .post-loop .post-meta {
margin: 0;
}
.widget.top_members .post-loop .post-thumbnail,
.widget.sidebarposts .post-loop .post-thumbnail {
margin: 0;
}
.widget.top_members .post-loop .post-thumbnail,
.widget.sidebarposts .post-loop .post-thumbnail {
text-align: center;
}
@ -600,41 +627,92 @@ ul.navmenu li a.profile {
/*************************** Others ***************************/
.button {
a.button {
text-align: center;
padding: 5px 20px;
padding: 5px 10px;
cursor: pointer;
color: #ffffff;
background: -moz-linear-gradient(
color: #ffffff;
/*background: #576a7b;*/
background: -moz-linear-gradient(
top,
#179dc2 0%,
#085988);
background: -webkit-gradient(
linear, left top, left bottom,
from(#179dc2),
to(#085988));
border-radius: 0px;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border: 1px solid #0f3c5f;
/*-moz-box-shadow:
0px 3px 11px rgba(000,000,000,0.5),
inset 0px 0px 0px rgba(255,000,217,0);
-webkit-box-shadow:
0px 3px 11px rgba(000,000,000,0.5),
inset 0px 0px 0px rgba(255,000,217,0);*/
text-shadow:
0px 1px 1px rgba(15,60,95,0.8),
0px 1px 0px rgba(255,255,255,0.3);
#0f3d5f);
background: -webkit-gradient(
linear, left top, left bottom,
from(#179dc2),
to(#0f3d5f));
border: 1px outset #34404b;
}
a.button:hover {
background: #879db1;
border: 1px outset #34404b;
}
a.button:active {
background: #685f6e;
border: 1px inset #34404b;
-moz-box-shadow: inset 0 0 10px #262630;
-webkit-box-shadow: inset 0 0 10px #262630;
box-shadow: inset 0 0 10px #262630;
}
/*************************** Comments Section ***************************/
/* Comment List */
#comments {
margin: 0;
}
h3.comments {
border-bottom: 1px solid #e5e5e5;
}
.comment-box {
margin: 0 0 15px;
padding: 0;
border: none;
color: #576A7B;
}
.comment-meta {
width: 405px;
}
.comment-author {
font-size: 16px;
}
.comment-date {
margin: 0;
font-size: 12px;
}
.comment-text {
padding: 0;
font-size: 14px;
}
.comment-text p {
line-height: 16px;
}
.comment-text p:first-child {
margin: 0;
}
.more-comments {
width: 66%;
text-align: right;
padding-right: 34%;
}
.more-comments a {
color: #f5b00c;
font-size: 14px;
font-weight: bold;
}
/*************************** Page/Post ***************************/

View File

@ -55,8 +55,12 @@ if (have_posts()) {
$to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true);
// Usuario actual puede ver la dedicatoria?
if (($current_user->ID == $from_user_id) || ($current_user->user_email == $to_user_email)) {
if (get_post_status($post-ID) == 'private') {
if (($current_user->ID != $from_user_id) && ($current_user->user_email != $to_user_email)) {
continue; // me salto esta dedicatoria
}
}
$video = get_post_meta($post->ID, 'ghostpool_dedication_url', true);
$artist = get_post_meta($post->ID, 'ghostpool_dedication_artist', true);
$song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
@ -109,7 +113,6 @@ if (have_posts()) {
</span>
</li>
<?php } $slide_counter++; ?>
<?php } // if Usuario actual puede ver la dedicatoria? ?>
<?php endwhile; ?>
</ul>
</div> <!-- componentPlaylist -->
@ -138,9 +141,9 @@ if (have_posts()) {
<h4 id="dedicationSong"></h4>
</div>
<div class="columns two last">
<?php if(function_exists('bp_is_active')) { ?>
<a href="<?php echo bp_loggedin_user_domain() . bp_get_dedication_slug() ?>/new-dedication/" class="button">Dedicate a song</a>
<?php if(function_exists('bp_is_active')) { ?>
<a 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>
<?php } ?>
</div>
@ -221,12 +224,14 @@ if (have_posts()) {
jQuery('#dedicationSong').html(song);
}
);
jQuery('#dedicationFooter_container').slideDown();
jQuery('#dedicationFooter_container').slideDown(
'fast',
function() {}
);
jQuery('#dedicationTitle').html(new_title);
shrinkTitle();
jQuery('#dedicationTitle').jTypeWriter();
jQuery('#dedicationTitle').html(new_title);
shrinkTitle();
jQuery('#dedicationTitle').jTypeWriter();
jQuery('#dedicationComments_container').slideUp(
'fast',
function() { jQuery('#dedicationComments_container').html(comments); }
@ -240,13 +245,14 @@ if (have_posts()) {
var textH1 = document.getElementById("dedicationTitle");
var textDiv = document.getElementById("dedicationTitle_container");
textH1.style.fontSize = 46+"px";
textH1.style.fontSize = 42+"px";
while(textH1.offsetWidth > textDiv.offsetWidth)
{
size = parseInt(textH1.style.fontSize.replace("px",""));
size -= 1;
textH1.style.fontSize = size+"px";
}
textH1.style.fontSize -= 10+"px";
}