_s: Move post meta separators inside conditionals ensuring that separators will not be orphaned. Use consistent 'edit link' whitespace in image.php as well.

git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@9087 d957f892-c61d-0410-b221-f235e6eecf30
This commit is contained in:
Michael Fields 2012-03-06 14:40:49 +00:00
parent 10314c8cb4
commit 34c55ff465
2 changed files with 4 additions and 5 deletions

View File

@ -37,7 +37,6 @@
<span class="cat-links"> <span class="cat-links">
<?php printf( __( 'Posted in %1$s', '_s' ), $categories_list ); ?> <?php printf( __( 'Posted in %1$s', '_s' ), $categories_list ); ?>
</span> </span>
<span class="sep"> | </span>
<?php endif; // End if categories ?> <?php endif; // End if categories ?>
<?php <?php
@ -45,18 +44,18 @@
$tags_list = get_the_tag_list( '', __( ', ', '_s' ) ); $tags_list = get_the_tag_list( '', __( ', ', '_s' ) );
if ( $tags_list ) : if ( $tags_list ) :
?> ?>
<span class="sep"> | </span>
<span class="tag-links"> <span class="tag-links">
<?php printf( __( 'Tagged %1$s', '_s' ), $tags_list ); ?> <?php printf( __( 'Tagged %1$s', '_s' ), $tags_list ); ?>
</span> </span>
<span class="sep"> | </span>
<?php endif; // End if $tags_list ?> <?php endif; // End if $tags_list ?>
<?php endif; // End if 'post' == get_post_type() ?> <?php endif; // End if 'post' == get_post_type() ?>
<?php if ( comments_open() || ( '0' != get_comments_number() && ! comments_open() ) ) : ?> <?php if ( comments_open() || ( '0' != get_comments_number() && ! comments_open() ) ) : ?>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
<span class="sep"> | </span> <span class="sep"> | </span>
<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
<?php endif; ?> <?php endif; ?>
<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?> <?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
</footer><!-- #entry-meta --> </footer><!-- #entry-meta -->
</article><!-- #post-<?php the_ID(); ?> --> </article><!-- #post-<?php the_ID(); ?> -->