Permalink
Browse files

Merge branch 'master' of https://github.com/Foxaii/roots

  • Loading branch information...
2 parents 80ffa5b + 4d64cbe commit f7128c6836e5fa152c8db8957c01c2e29a416324 @retlehs retlehs committed Dec 2, 2012
Showing with 25 additions and 5 deletions.
  1. +12 −2 templates/comments.php
  2. +13 −3 templates/content.php
View
@@ -44,8 +44,18 @@
<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
<nav id="comments-nav" class="pager">
- <div class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></div>
- <div class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></div>
+ <ul class="pager">
+ <?php if (get_previous_comments_link()) : ?>
+ <li class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></li>
+ <?php else: ?>
+ <li class="previous disabled"><a><?php _e('&larr; Older comments', 'roots'); ?></a></li>
+ <?php endif; ?>
+ <?php if (get_next_comments_link()) : ?>
+ <li class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></li>
+ <?php else: ?>
+ <li class="next disabled"><a><?php _e('Newer comments &rarr;', 'roots'); ?></a></li>
+ <?php endif; ?>
+ </ul>
</nav>
<?php endif; // check for comment navigation ?>
View
@@ -22,8 +22,18 @@
<?php endwhile; ?>
<?php if ($wp_query->max_num_pages > 1) : ?>
- <nav id="post-nav" class="pager">
- <div class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></div>
- <div class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></div>
+ <nav id="post-nav">
+ <ul class="pager">
+ <?php if (get_next_posts_link()) : ?>
+ <li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
+ <?php else: ?>
+ <li class="previous disabled"><a><?php _e('&larr; Older posts', 'roots'); ?></a></li>
+ <?php endif; ?>
+ <?php if (get_previous_posts_link()) : ?>
+ <li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
+ <?php else: ?>
+ <li class="next disabled"><a><?php _e('Newer posts &rarr;', 'roots'); ?></a></li>
+ <?php endif; ?>
+ </ul>
</nav>
<?php endif; ?>

0 comments on commit f7128c6

Please sign in to comment.