Skip to content

Commit

Permalink
Fix some issue in file comments.php
Browse files Browse the repository at this point in the history
  • Loading branch information
@overclokk
overclokk committed Jun 30, 2014
1 parent 7748869 commit 177e803
Show file tree
Hide file tree
Showing 7 changed files with 345 additions and 189 deletions.
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ http://www.overclokk.net/italystrap-wordpress-starter-theme

##Changelog

###1.8.2

+ Fix some issue in file comments.php (comment-reply.js)

###1.8.1

+ Add File readme.txt (Correct theme check issue)
Expand Down
345 changes: 162 additions & 183 deletions comments.php
View file
Original file line number Diff line number Diff line change
@@ -1,195 +1,174 @@
<?php if(!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) : ?>
<?php die('Non puoi accedere a questa pagina direttamente!'); ?>
<?php endif; ?>

<?php if(!empty($post->post_password)) : ?>
<?php if($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) : ?>
<p>Questo post &egrave; protetto da password. Per leggerlo inserisci password per visualizzare i commenti<p>
<?php endif; ?>
<?php endif; ?>
<!-- Puoi cominciare le modifiche da qui. -->
<?php
$count = 0;
$comment_entries = get_comments(array( 'type'=> 'comment', 'post_id' => $post->ID ));
if(count($comment_entries) > 0){
foreach($comment_entries as $comment){
if($comment->comment_approved)
$count++;
}
/**
* The template for displaying Comments
*
* The area of the page that contains comments and the comment form.
*
* @package WordPress
* @subpackage ItalyStrap
* @since ItalyStrap 1.8.1
*/

/*
* If the current post is protected by a password and the visitor has not yet
* entered the password we will return early without loading the comments.
*/
if ( post_password_required() ) {
return;
}
?>
<section>
<div id="comments">
<?php if (comments_open() ){
if($count == 0){
echo "";
}
else if($count == 1){
echo "<h3>$count Commento</h3>";
}
else echo "<h3>$count Commenti</h3>";
}
<section id="comments">

<?php
// $count = 0;
// $comment_entries = get_comments(array( 'type'=> 'comment', 'post_id' => $post->ID ));
// if(count($comment_entries) > 0){
// foreach($comment_entries as $comment){
// if($comment->comment_approved)
// $count++;
// }
// }

// if (comments_open() ){
// if($count == 0){
// echo "";
// }
// else if($count == 1){
// echo "<h3>$count Commento</h3>";
// }
// else echo "<h3>$count Commenti</h3>";
// }
?>
<div class="row">
<?php
if ( have_comments() ) :
if(!empty($comment_entries)){
wp_list_comments( array( 'type'=> 'comment', 'callback' => 'ItalyStrap_custom_comment' ) );
} ?>
<ul class="pagination pagination-sm">
<?php
/**
*http://wordpress.stackexchange.com/questions/125389/return-paginate-comments-links-as-array
* Then I modify below code, now print bootstrap style correctly
*/
$pages = paginate_comments_links( array( 'echo' => false, 'type' => 'array', 'prev_text' => __('&laquo; Previous comments' , 'italystrap'), 'next_text' => __('Next comments &raquo;', 'italystrap'),) );
foreach($pages as $page){
$position = strpos($page, '<span');
if ( $position === false ) {
echo '<li>' . $page . '</li>';
} else {
echo '<li class="active">' . $page . '</li>';
}
}
?>
</ul>
<?php endif;?>
<div class="row">
<div class="col-md-12">
<?php if ( have_comments() ) : ?>

<h3><?php printf(_n('One Response to &ldquo;%2$s&rdquo;', '%1$s Responses to &ldquo;%2$s&rdquo;', get_comments_number(), 'ItalyStrap'), number_format_i18n( get_comments_number() ), get_the_title() ); ?></h3>

<?php
// if( !empty( $comment_entries ) ){
wp_list_comments(
array(
'walker' => new ItalyStrap_Walker_Comment,
// 'type'=> 'comment',
// 'callback' => 'ItalyStrap_custom_comment'
)
);
// }
?>

<?php if ( get_comment_pages_count() > 1 && get_option('page_comments') ) : ?>
<nav itemscope itemtype="http://schema.org/SiteNavigationElement">
<ul class="pagination pagination-sm">
<?php
/**
* http://wordpress.stackexchange.com/questions/125389/return-paginate-comments-links-as-array
* Then I modify below code, now print bootstrap style correctly
*/
$pages = paginate_comments_links(
array(
'echo' => false,
'type' => 'array',
'prev_text' => __('&laquo; Previous comments' , 'italystrap'),
'next_text' => __('Next comments &raquo;', 'italystrap'),
)
);
if ( is_array( $pages ) ){
$pages = str_replace('<a', '<a itemprop="url"', $pages);
foreach($pages as $page){
$position = strpos($page, '<span');
if ( $position === false ) {
echo '<li itemprop="name">' . $page . '</li>';
} else {
echo '<li class="active" itemprop="name">' . $page . '</li>';
}
}
}
?>
</ul>
</nav>
<?php endif; // Pagination ?>

<?php endif;?>
</div>
</div>
<?php
/**
* ItalyStrap_custom_comment()
* @return
*/
function ItalyStrap_custom_comment($comment, $args, $depth)
{
$GLOBALS['comment'] = $comment;
switch ($comment->comment_type) :
case 'pingback' :
case 'trackback' : ?>

<li class="comment media" id="comment-<?php comment_ID(); ?>">
<div class="media-body">
<p>
<?php _e('Pingback:', 'ItalyStrap'); ?> <?php comment_author_link(); ?>
</p>
</div><!--/.media-body -->
<?php
break;
default :
// Proceed with normal comments.
global $post; ?>


<div class="<?php if($depth == 1) echo 'col-md-12'; else echo 'col-md-11 col-md-offset-1'; ?>">
<div class="row margin-bottom-25 padding-15 <?php if ($comment->user_id === $post->post_author) { echo 'bg-color-author';} ?>"itemscope itemtype="http://schema.org/Comment">
<div class="col-md-2"><?php echo get_avatar($comment, '92') ?></div>
<div class="col-md-10">
<ul class="list-inline margin-bottom-10">
<li>
<h4 class="media-heading">
<a class="url" rel="external nofollow" href="<?php comment_author_url(); ?>" itemprop="url"><span itemprop="author" itemscope itemtype="http://schema.org/Person"><?php echo get_comment_author() ?><meta itemprop="image" content="<?php $thumbnailUrl = get_avatar($comment); echo estraiUrlsGravatar($thumbnailUrl);?>"/></span></a>
<?php
printf(
// If current post author is also comment author, make it known visually.
($comment->user_id === $post->post_author) ? '<span class="label label-danger"> ' . __(
'The Boss :-)',
'ItalyStrap'
) . '</span> ' : ''); ?>
</h4>

</li>
<li><time datetime="<?php comment_date('Y-m-d', $comment) ?>" itemprop="datePublished"><?php comment_date('j M Y', $comment) ?></time></li>
<?php edit_comment_link(__('Modifica','ItalyStrap'),'<span class="btn btn-sm btn-info pull-right"><i class="glyphicon glyphicon-pencil"></i> ','</span>') ?>
</ul>
<p itemprop="text"><?php echo get_comment_text($comment); ?></p>
<?php if ($comment->comment_approved == '0') : ?>
<span class="alert alert-success">Il tuo commento &egrave; in attesa di moderazione.</span>
<?php endif; ?>
<p class="reply btn btn-small btn-success pull-right">
<?php
comment_reply_link(
array_merge(
$args,
array(
'reply_text' => __('Rispondi <i class="glyphicon glyphicon-arrow-down"></i>', 'ItalyStrap'),
'depth' => $depth,
'max_depth' => $args['max_depth'],
'class' => _('btn'),
)
),
$comment->comment_ID
);
// $reply = get_comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth'])), $comment->comment_ID);
// echo $reply;
?>
</p>
</div>
</div>

</div>
<?php
break;
endswitch;
}
?>
</div>
</section><!-- /#comments -->

<section id="respond">
<?php
/**
* Form dei commenti
*
*/
if ( comments_open() ) : ?>

<h3><?php comment_form_title( __("E tu cosa ne pensi?","ItalyStrap"), __("Rispondi a ","ItalyStrap") . ' %s' ); ?></h3>

<p><?php new_cancel_comment_reply_link( __("Annulla" , "ItalyStrap") ); ?></p>

<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
<p class="alert alert-warning margin-top-25">Devi essere <a href="<?php echo wp_login_url( get_permalink() ); ?>" class="alert-link" ><?php _e("loggato","ItalyStrap"); ?></a> per scrivere il tuo commento :-)</p>
<?php else : ?>

<div class="form-actions">
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform" role="form">

<?php if ( is_user_logged_in() ) : ?>

<p class="comments-logged-in-as"><?php _e("Loggato come","ItalyStrap"); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e("Esci","ItalyStrap"); ?>" class="btn btn-default btn-xs">Esci &raquo;</a></p>

<?php else : ?>

<div class="form-group">
<label for="author" class="sr-only"><?php _e('Name','ItalyStrap'); ?> <?php if ($req) _e(' (required)', 'ItalyStrap'); ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>

<input type="text" class="form-control" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" placeholder="<?php _e('Name','ItalyStrap'); ?> <?php if ($req) _e(' (required)', 'ItalyStrap'); ?>" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
</div>
</div>

<?php if ( comments_open() ) : ?>
<h3><?php comment_form_title( __("E tu cosa ne pensi?","ItalyStrap"), __("Rispondi a ","ItalyStrap") . ' %s' ); ?></h3>
<p><?php new_cancel_comment_reply_link( __("Annulla" , "ItalyStrap") ); ?></p>
<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
<p class="alert margin-top-25">Devi essere <a href="<?php echo wp_login_url( get_permalink() ); ?>"><?php _e("loggato","ItalyStrap"); ?></a> per scrivere il tuo commento :-)</p>
<?php else : ?>
<div class="form-actions">
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform" role="form">
<?php if ( is_user_logged_in() ) : ?>
<p class="comments-logged-in-as"><?php _e("Loggato come","ItalyStrap"); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e("Esci","ItalyStrap"); ?>">Esci &raquo;</a></p>

<?php else : ?>
<ul id="comment-form-elements" class="clearfix list-unstyled">

<li>
<div class="form-group">
<label for="author" class="sr-only"><?php _e("Nome","ItalyStrap"); ?> <?php if ($req) echo "(Richiesto)"; ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" class="form-control" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" placeholder="<?php _e("Il tuo nome (Richiesto)","ItalyStrap"); ?>" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
</div>
</div>
</li>
<li>
<div class="form-group">
<label for="email" class="sr-only"><?php _e("Mail","ItalyStrap"); ?> <?php if ($req) echo "(Richiesta)"; ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
<input type="email" class="form-control" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" placeholder="<?php _e("La tua mail (Richiesta)","ItalyStrap"); ?>" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
</div>
</div>
</li>
<li>
<div class="form-group">
<label for="url" class="sr-only"><?php _e("Sito web","ItalyStrap"); ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-home"></i></span>
<input type="url" class="form-control" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" placeholder="<?php _e("Il tuo sito web (opzionale)","ItalyStrap"); ?>" tabindex="3" />
</div>
</div>
</li>
</ul>
<?php endif; ?>
<textarea class="form-control" name="comment" id="comment" placeholder="Scrivi il tuo commento qui" tabindex="4" rows="6"></textarea>
<input class="btn btn-large btn-primary margin-top-25" name="submit" type="submit" id="submit" tabindex="5" value="Invia il commento" />
<?php comment_id_fields(); ?>

<?php
//comment_form();
do_action('comment_form()', $post->ID);
<div class="form-group">
<label for="email" class="sr-only"><?php _e('Email (will not be published)','ItalyStrap'); ?> <?php if ($req) _e(' (required)', 'ItalyStrap'); ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>

?>
</form>
<input type="email" class="form-control" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" placeholder="<?php _e('Email (will not be published)','ItalyStrap'); ?> <?php if ($req) _e(' (required)', 'ItalyStrap'); ?>" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
</div>
</div>

<div class="form-group">
<label for="url" class="sr-only"><?php _e( 'Website' ,'ItalyStrap'); ?></label>
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-home"></i></span>

<input type="url" class="form-control" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" placeholder="<?php _e( 'Website (optional)' ,'ItalyStrap'); ?>" tabindex="3" />
</div>
</div>

<?php endif; ?>

<div class="form-group">
<label for="comment" class="sr-only"><?php _e('Comment', 'ItalyStrap'); ?></label>
<textarea class="form-control" name="comment" id="comment" placeholder="<?php _e( 'Scrivi il tuo commento qui' ,'ItalyStrap'); ?>" tabindex="4" rows="6"></textarea>
</div>

<input class="btn btn-large btn-primary" name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'ItalyStrap'); ?>" />

<?php comment_id_fields(); ?>

<?php do_action('comment_form()', $post->ID); ?>

</form>
</div>

<?php endif; // If registration required and not logged in ?>
<?php endif; // If registration required and not logged in ?>

<?php else: ?>

<div class="alert alert-warning">
<?php _e('Comments are closed.', 'ItalyStrap'); ?>
</div>

<?php endif; // Comment open ?>
</section>
3 changes: 2 additions & 1 deletion functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
require_once locate_template('/lib/schema.php'); // Function for Schema.org and OG
require_once locate_template('/lib/custom_taxonomy.php'); // Custom taxonomy
require_once locate_template('/lib/images.php'); // Custom function for images
require_once locate_template('/lib/comment_reply.php'); // new_get_cancel_comment_reply_link
require_once locate_template('/lib/comment_reply.php'); // new_get_cancel_comment_reply_link
require_once locate_template('/lib/comments.php'); // Walker comments
require_once locate_template('/lib/tag_cloud.php'); // New style for tag cloud
//require_once locate_template('/lib/css-above-the-fold.php'); //
require_once locate_template('/lib/debug.php'); // Function for debugging
Expand Down
Loading

0 comments on commit 177e803

Please sign in to comment.