framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Ben Word
2014-06-30 00:24:08 -05:00
parent 17ee6e42d8 aceb4bd1cd
commit bb91236440
8 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/comment.php
View File

@@ -1,7 +1,7 @@
<?php echo get_avatar($comment, $size = '64'); ?>
<div class="media-body">
<h4 class="media-heading"><?php echo get_comment_author_link(); ?></h4>
<time datetime="<?php echo comment_date('c'); ?>"><a href="<?php echo htmlspecialchars(get_comment_link($comment->comment_ID)); ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(), get_comment_time()); ?></a></time>
<time datetime="<?php echo get_comment_date('c'); ?>"><a href="<?php echo htmlspecialchars(get_comment_link($comment->comment_ID)); ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(), get_comment_time()); ?></a></time>
<?php edit_comment_link(__('(Edit)', 'roots'), '', ''); ?>
<?php if ($comment->comment_approved == '0') : ?>

51
templates/comments.php
View File

@@ -2,9 +2,10 @@
if (post_password_required()) {
return;
}
?>
if (have_comments()) : ?>
<section id="comments">
<section id="comments">
<?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(), 'roots'), number_format_i18n(get_comments_number()), get_the_title()); ?></h3>
<ol class="media-list">
@@ -12,36 +13,32 @@
</ol>
<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : ?>
<nav>
<ul class="pager">
<?php if (get_previous_comments_link()) : ?>
<li class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></li>
<?php endif; ?>
<?php if (get_next_comments_link()) : ?>
<li class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></li>
<?php endif; ?>
</ul>
</nav>
<nav>
<ul class="pager">
<?php if (get_previous_comments_link()) : ?>
<li class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></li>
<?php endif; ?>
<?php if (get_next_comments_link()) : ?>
<li class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></li>
<?php endif; ?>
</ul>
</nav>
<?php endif; ?>
<?php if (!comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) : ?>
<div class="alert alert-warning">
<?php _e('Comments are closed.', 'roots'); ?>
</div>
<div class="alert alert-warning">
<?php _e('Comments are closed.', 'roots'); ?>
</div>
<?php endif; ?>
</section><!-- /#comments -->
<?php endif; ?>
<?php if (!have_comments() && !comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) : ?>
<section id="comments">
<?php elseif(!comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) : ?>
<div class="alert alert-warning">
<?php _e('Comments are closed.', 'roots'); ?>
</div>
</section><!-- /#comments -->
<?php endif; ?>
<?php endif; ?>
</section><!-- /#comments -->
<?php if (comments_open()) : ?>
<section id="respond">
<section id="respond">
<?php if (comments_open()) : ?>
<h3><?php comment_form_title(__('Leave a Reply', 'roots'), __('Leave a Reply to %s', 'roots')); ?></h3>
<p class="cancel-comment-reply"><?php cancel_comment_reply_link(); ?></p>
<?php if (get_option('comment_registration') && !is_user_logged_in()) : ?>
@@ -51,7 +48,7 @@
<?php if (is_user_logged_in()) : ?>
<p>
<?php printf(__('Logged in as <a href="%s/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?>
<a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php __('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a>
<a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a>
</p>
<?php else : ?>
<div class="form-group">
@@ -76,5 +73,5 @@
<?php do_action('comment_form', $post->ID); ?>
</form>
<?php endif; ?>
</section><!-- /#respond -->
<?php endif; ?>
<?php endif; ?>
</section><!-- /#respond -->

1
templates/footer.php
View File

@@ -1,7 +1,6 @@
<footer class="content-info" role="contentinfo">
<div class="container">
<?php dynamic_sidebar('sidebar-footer'); ?>
<p>&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?></p>
</div>
</footer>