WordPress.org
Get WordPress

Make WordPress Core

Ticket #17748: 17748.diff

File 17748.diff, 12.7 KB (added by dd32, 14 years ago)

  • wp-content/themes/twentyeleven/content-aside.php

     
    3939                        <?php twentyeleven_posted_on(); ?>
    4040                        <?php if ( comments_open() ) : ?>
    4141                        <span class="sep"> | </span>
    42                         <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     42                        <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    4343                        <?php endif; ?>
    4444                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
    4545                </footer><!-- #entry-meta -->

  • wp-content/themes/twentyeleven/content-gallery.php

     
    8484                <?php if ( $show_sep ) : ?>
    8585                <span class="sep"> | </span>
    8686                <?php endif; // End if $show_sep ?>
    87                 <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     87                <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    8888                <?php endif; // End if comments_open() ?>
    8989
    9090                <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

  • wp-content/themes/twentyeleven/content-link.php

     
    3939                        <?php twentyeleven_posted_on(); ?>
    4040                        <?php if ( comments_open() ) : ?>
    4141                        <span class="sep"> | </span>
    42                         <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     42                        <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    4343                        <?php endif; ?>
    4444                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
    4545                </footer><!-- #entry-meta -->

  • wp-content/themes/twentyeleven/content-page.php

     
    1616        <div class="entry-content">
    1717                <?php the_content(); ?>
    1818                <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
     19        </div><!-- .entry-content -->
     20        <footer class="entry-meta">
    1921                <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
    20         </div><!-- .entry-content -->
     22        </footer><!-- .entry-meta -->
    2123</article><!-- #post-<?php the_ID(); ?> -->

  • wp-content/themes/twentyeleven/content-quote.php

     
    6666                        <?php if ( $show_sep ) : ?>
    6767                        <span class="sep"> | </span>
    6868                        <?php endif; // End if $show_sep ?>
    69                         <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     69                        <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    7070                        <?php endif; // End if comments_open() ?>
    7171
    7272                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

  • wp-content/themes/twentyeleven/content-single.php

     
    2727        <footer class="entry-meta">
    2828                <?php
    2929                        /* translators: used between list items, there is a space after the comma */
     30                        $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
     31
     32                        /* translators: used between list items, there is a space after the comma */
    3033                        $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
    3134                        if ( '' != $tag_list ) {
    3235                                $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
     36                        } elseif ( '' != $categories_list ) {
     37                                $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
    3338                        } else {
    34                                 $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
     39                                $utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
    3540                        }
     41
    3642                        printf(
    3743                                $utility_text,
    38                                 /* translators: used between list items, there is a space after the comma */
    39                                 get_the_category_list( __( ', ', 'twentyeleven' ) ),
     44                                $categories_list,
    4045                                $tag_list,
    4146                                esc_url( get_permalink() ),
    4247                                the_title_attribute( 'echo=0' ),

  • wp-content/themes/twentyeleven/content-status.php

     
    4040                        <?php twentyeleven_posted_on(); ?>
    4141                        <?php if ( comments_open() ) : ?>
    4242                        <span class="sep"> | </span>
    43                         <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     43                        <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    4444                        <?php endif; ?>
    4545                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
    4646                </footer><!-- #entry-meta -->

  • wp-content/themes/twentyeleven/content.php

     
    7474                        <?php if ( $show_sep ) : ?>
    7575                        <span class="sep"> | </span>
    7676                        <?php endif; // End if $show_sep ?>
    77                         <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
     77                        <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
    7878                        <?php endif; // End if comments_open() ?>
    7979
    8080                        <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

  • wp-content/themes/twentyeleven/functions.php

     
    497497                case 'trackback' :
    498498        ?>
    499499        <li class="post pingback">
    500                 <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyeleven' ), ' ' ); ?></p>
     500                <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( _x( 'Edit', 'Comment edit link', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
    501501        <?php
    502502                        break;
    503503                default :
    … …  
    525525                                                );
    526526                                        ?>
    527527
    528                                         <?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
     528                                        <?php edit_comment_link( _x( 'Edit', 'Comment edit link', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
    529529                                </div><!-- .comment-author .vcard -->
    530530
    531531                                <?php if ( $comment->comment_approved == '0' ) : ?>

  • wp-content/themes/twentyeleven/rtl.css

     
    337337        float: left;
    338338}
    339339#respond input#submit {
    340         right: 30px;
     340        left: 0px;
     341        right: auto;
    341342        padding: 5px 22px 5px 42px;
    342343}
    343344#respond #cancel-comment-reply-link {
    … …  
    375376}
    376377
    377378/* Simplify the showcase template when small feature */
    378         section.featured-post .attachment-small-feature,
    379         .one-column section.featured-post .attachment-small-feature {
     379section.featured-post .attachment-small-feature,
     380.one-column section.featured-post .attachment-small-feature {
    380381        float: right;
    381382}
    382383article.feature-image.small {

  • wp-content/themes/twentyeleven/showcase.php

     
    191191                                                <li class="entry-title">
    192192                                                        <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
    193193                                                        <span class="comments-link">
    194                                                                 <?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
     194                                                                <?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?>
    195195                                                        </span>
    196196                                                </li>
    197197

  • wp-content/themes/twentyeleven/style.css

     
    822822.page-link span {
    823823        margin-right: 6px;
    824824}
    825 .entry-meta .edit-link a {
     825.entry-meta .edit-link a,
     826.commentlist .edit-link a {
    826827        background: #eee;
    827828        -moz-border-radius: 3px;
    828829        border-radius: 3px;
    829830        color: #666;
    830831        float: right;
    831832        font-size: 12px;
     833        line-height: 1.5em;
    832834        font-weight: 300;
    833835        text-decoration: none;
    834836        padding: 0px 8px;
    835837}
    836 .entry-meta .edit-link a:hover {
     838.entry-meta .edit-link a:hover,
     839.commentlist .edit-link a:hover {
    837840        background: #888;
    838         color: #fff;
     841        color: #fff !important;
    839842}
    840843.entry-content .edit-link {
    841844        clear: both;
    … …  
    12151218        margin-bottom: 0;
    12161219}
    12171220.indexed.format-image footer.entry-meta {
    1218         background: #e0e6e8;
     1221        background: #ddd;
    12191222        margin-top: -7px;
    12201223        padding: 20px 30px;
    12211224        overflow: hidden;
    … …  
    18921895        padding: 1.625em;
    18931896        position: relative;
    18941897}
    1895 .commentlist .children li.comment .fn {
    1896         display: block;
    1897 }
    18981898.comment-meta .fn {
    18991899        font-style: normal;
    19001900}
    … …  
    19921992        border-radius: 3px;
    19931993        margin: 0 auto 1.625em;
    19941994        padding: 1.625em;
     1995        padding-bottom: 2.5em;
    19951996        position: relative;
    19961997        width: 68.9%;
    19971998}
    … …  
    20802081        color: #eee;
    20812082        cursor: pointer;
    20822083        font-size: 15px;
    2083         left: 30px;
    2084         margin: 20px 0;
    20852084        padding: 5px 42px 5px 22px;
    2086         position: relative;
     2085        position: absolute;
     2086        right: 0px;
     2087        bottom: 0px;
    20872088        text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
    20882089}
    20892090#respond input#submit:active {