WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
02/14/2012 03:54:46 AM (13 years ago)
Author:
lancewillett
Message:

Twenty Twelve template changes and fixes ... see #19978.

  • Add custom header support
  • header.php: use get_stylesheet_uri() to load stylesheet, props Mamaduka
  • Add full-width template, including adding relevant body_class value as a CSS hook
  • Hide sidebar on all views if no active widgets exist
  • Fix site title output (was missing site title)
  • Remove "featured" title for sticky posts
  • Add content template files for aside, image, link, and quote post formats
  • Indent content-single.php to match content.php
  • Remove sample JPG since Twenty Twelve ships with no default header images

... and style updates, props drewstrojny

  • Better footer styles
  • Styling for full-width layouts
  • Add basic styles for archive views
  • Refine post header/footer styles a bit
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-content/themes/twentytwelve/content-single.php

    r19842 r19915  
    99?>
    1010
    11 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
    12     <header class="entry-header">
    13         <h1 class="entry-title"><?php the_title(); ?></h1>
     11    <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     12        <header class="entry-header">
     13            <h1 class="entry-title"><?php the_title(); ?></h1>
    1414
    15         <?php if ( 'post' == get_post_type() ) : ?>
    16         <div class="entry-meta">
    17             <?php twentytwelve_posted_on(); ?>
    18         </div><!-- .entry-meta -->
    19         <?php endif; ?>
    20     </header><!-- .entry-header -->
     15            <?php if ( 'post' == get_post_type() ) : // Hide entry meta for pages ?>
     16            <div class="entry-meta">
     17                <?php twentytwelve_posted_on(); ?>
     18            </div><!-- .entry-meta -->
     19            <?php endif; ?>
     20        </header><!-- .entry-header -->
    2121
    22     <div class="entry-content">
    23         <?php the_content(); ?>
    24         <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
    25     </div><!-- .entry-content -->
     22        <div class="entry-content">
     23            <?php the_content(); ?>
     24            <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
     25        </div><!-- .entry-content -->
    2626
    27     <footer class="entry-meta">
    28         <?php
    29             /* translators: used between list items, there is a space after the comma */
    30             $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
     27        <footer class="entry-meta">
     28            <?php
     29                /* translators: used between list items, there is a space after the comma */
     30                $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
    3131
    32             /* translators: used between list items, there is a space after the comma */
    33             $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
    34             if ( '' != $tag_list ) {
    35                 $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>.', 'twentytwelve' );
    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>.', 'twentytwelve' );
    38             } else {
    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>.', 'twentytwelve' );
    40             }
     32                /* translators: used between list items, there is a space after the comma */
     33                $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
     34                if ( '' != $tag_list ) {
     35                    $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>.', 'twentytwelve' );
     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>.', 'twentytwelve' );
     38                } else {
     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>.', 'twentytwelve' );
     40                }
    4141
    42             printf(
    43                 $utility_text,
    44                 $categories_list,
    45                 $tag_list,
    46                 esc_url( get_permalink() ),
    47                 the_title_attribute( 'echo=0' ),
    48                 get_the_author(),
    49                 esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
    50             );
    51         ?>
    52         <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
     42                printf(
     43                    $utility_text,
     44                    $categories_list,
     45                    $tag_list,
     46                    esc_url( get_permalink() ),
     47                    the_title_attribute( 'echo=0' ),
     48                    get_the_author(),
     49                    esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
     50                );
     51            ?>
     52            <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
    5353
    54         <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
    55         <div id="author-info">
    56             <div id="author-avatar">
    57                 <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
    58             </div><!-- #author-avatar -->
    59             <div id="author-description">
    60                 <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
    61                 <?php the_author_meta( 'description' ); ?>
    62                 <div id="author-link">
    63                     <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
    64                         <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
    65                     </a>
    66                 </div><!-- #author-link -->
    67             </div><!-- #author-description -->
    68         </div><!-- #entry-author-info -->
    69         <?php endif; ?>
    70     </footer><!-- .entry-meta -->
    71 </article><!-- #post -->
     54            <?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
     55            <div id="author-info">
     56                <div id="author-avatar">
     57                    <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentytwelve_author_bio_avatar_size', 68 ) ); ?>
     58                </div><!-- #author-avatar -->
     59                <div id="author-description">
     60                    <h2><?php printf( __( 'About %s', 'twentytwelve' ), get_the_author() ); ?></h2>
     61                    <?php the_author_meta( 'description' ); ?>
     62                    <div id="author-link">
     63                        <a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
     64                            <?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentytwelve' ), get_the_author() ); ?>
     65                        </a>
     66                    </div><!-- #author-link -->
     67                </div><!-- #author-description -->
     68            </div><!-- #entry-author-info -->
     69            <?php endif; ?>
     70        </footer><!-- .entry-meta -->
     71    </article><!-- #post -->
Note: See TracChangeset for help on using the changeset viewer.