golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code is Poetry. 

WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2017-11-30 23:11:00 +00:00
parent d009df70b3
commit f9d0b32a36
21 changed files with 366 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
404.php
View File

@ -26,4 +26,4 @@ get_header(); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary --> </div><!-- #primary -->
<?php get_footer(); ?> <?php get_footer(); ?>

13
archive.php
View File

@ -24,9 +24,10 @@ get_header(); ?>
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<header class="archive-header"> <header class="archive-header">
<h1 class="archive-title"><?php <h1 class="archive-title">
if ( is_day() ) : <?php
printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' ); if ( is_day() ) :
printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
elseif ( is_month() ) : elseif ( is_month() ) :
printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' ); printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
elseif ( is_year() ) : elseif ( is_year() ) :
@ -34,12 +35,14 @@ get_header(); ?>
else : else :
_e( 'Archives', 'twentytwelve' ); _e( 'Archives', 'twentytwelve' );
endif; endif;
?></h1> ?>
</h1>
</header><!-- .archive-header --> </header><!-- .archive-header -->
<?php <?php
/* Start the Loop */ /* Start the Loop */
while ( have_posts() ) : the_post(); while ( have_posts() ) :
the_post();
/* Include the post format-specific template for the content. If you want to /* Include the post format-specific template for the content. If you want to
* this in a child theme then include a file called content-___.php * this in a child theme then include a file called content-___.php

8
author.php
View File

@ -44,7 +44,8 @@ get_header(); ?>
<?php <?php
// If a user has filled out their description, show a bio on their entries. // If a user has filled out their description, show a bio on their entries.
if ( get_the_author_meta( 'description' ) ) : ?> if ( get_the_author_meta( 'description' ) ) :
?>
<div class="author-info"> <div class="author-info">
<div class="author-avatar"> <div class="author-avatar">
<?php <?php
@ -67,7 +68,10 @@ get_header(); ?>
<?php endif; ?> <?php endif; ?>
<?php /* Start the Loop */ ?> <?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', get_post_format() ); ?> <?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?> <?php endwhile; ?>

3
category.php
View File

@ -27,7 +27,8 @@ get_header(); ?>
<?php <?php
/* Start the Loop */ /* Start the Loop */
while ( have_posts() ) : the_post(); while ( have_posts() ) :
the_post();
/* Include the post format-specific template for the content. If you want to /* Include the post format-specific template for the content. If you want to
* this in a child theme then include a file called content-___.php * this in a child theme then include a file called content-___.php

25
comments.php
View File

@ -17,8 +17,9 @@
* the visitor has not yet entered the password we will * the visitor has not yet entered the password we will
* return early without loading the comments. * return early without loading the comments.
*/ */
if ( post_password_required() ) if ( post_password_required() ) {
return; return;
}
?> ?>
<div id="comments" class="comments-area"> <div id="comments" class="comments-area">
@ -28,13 +29,22 @@ if ( post_password_required() )
<?php if ( have_comments() ) : ?> <?php if ( have_comments() ) : ?>
<h2 class="comments-title"> <h2 class="comments-title">
<?php <?php
printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ), printf(
number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' ); _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
);
?> ?>
</h2> </h2>
<ol class="commentlist"> <ol class="commentlist">
<?php wp_list_comments( array( 'callback' => 'twentytwelve_comment', 'style' => 'ol' ) ); ?> <?php
wp_list_comments(
array(
'callback' => 'twentytwelve_comment',
'style' => 'ol',
)
);
?>
</ol><!-- .commentlist --> </ol><!-- .commentlist -->
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@ -49,12 +59,13 @@ if ( post_password_required() )
/* If there are no comments and comments are closed, let's leave a note. /* If there are no comments and comments are closed, let's leave a note.
* But we only want the note on posts and pages that had comments in the first place. * But we only want the note on posts and pages that had comments in the first place.
*/ */
if ( ! comments_open() && get_comments_number() ) : ?> if ( ! comments_open() && get_comments_number() ) :
<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentytwelve' ); ?></p> ?>
<p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
<?php endif; ?> <?php endif; ?>
<?php endif; // have_comments() ?> <?php endif; // have_comments() ?>
<?php comment_form(); ?> <?php comment_form(); ?>
</div><!-- #comments .comments-area --> </div><!-- #comments .comments-area -->

9
content-page.php
View File

@ -18,7 +18,14 @@
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?> <?php
wp_link_pages(
array(
'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
'after' => '</div>',
)
);
?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<footer class="entry-meta"> <footer class="entry-meta">
<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>

15
content.php
View File

@ -17,9 +17,11 @@
</div> </div>
<?php endif; ?> <?php endif; ?>
<header class="entry-header"> <header class="entry-header">
<?php if ( ! post_password_required() && ! is_attachment() ) : <?php
if ( ! post_password_required() && ! is_attachment() ) :
the_post_thumbnail(); the_post_thumbnail();
endif; ?> endif;
?>
<?php if ( is_single() ) : ?> <?php if ( is_single() ) : ?>
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
@ -42,7 +44,14 @@
<?php else : ?> <?php else : ?>
<div class="entry-content"> <div class="entry-content">
<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?> <?php
wp_link_pages(
array(
'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
'after' => '</div>',
)
);
?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<?php endif; ?> <?php endif; ?>

2
footer.php
View File

@ -20,4 +20,4 @@
<?php wp_footer(); ?> <?php wp_footer(); ?>
</body> </body>
</html> </html>

356
functions.php
View File

@ -23,8 +23,9 @@
*/ */
// Set up the content width value based on the theme's design and stylesheet. // Set up the content width value based on the theme's design and stylesheet.
if ( ! isset( $content_width ) ) if ( ! isset( $content_width ) ) {
$content_width = 625; $content_width = 625;
}
/** /**
* Twenty Twelve setup. * Twenty Twelve setup.
@ -35,7 +36,7 @@ if ( ! isset( $content_width ) )
* @uses load_theme_textdomain() For translation/localization support. * @uses load_theme_textdomain() For translation/localization support.
* @uses add_editor_style() To add a Visual Editor stylesheet. * @uses add_editor_style() To add a Visual Editor stylesheet.
* @uses add_theme_support() To add support for post thumbnails, automatic feed links, * @uses add_theme_support() To add support for post thumbnails, automatic feed links,
* custom background, and post formats. * custom background, and post formats.
* @uses register_nav_menu() To add support for navigation menus. * @uses register_nav_menu() To add support for navigation menus.
* @uses set_post_thumbnail_size() To set a custom post thumbnail size. * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
* *
@ -67,9 +68,11 @@ function twentytwelve_setup() {
* This theme supports custom background color and image, * This theme supports custom background color and image,
* and here we also set up the default background color. * and here we also set up the default background color.
*/ */
add_theme_support( 'custom-background', array( add_theme_support(
'default-color' => 'e6e6e6', 'custom-background', array(
) ); 'default-color' => 'e6e6e6',
)
);
// This theme uses a custom image size for featured images, displayed on "standard" posts. // This theme uses a custom image size for featured images, displayed on "standard" posts.
add_theme_support( 'post-thumbnails' ); add_theme_support( 'post-thumbnails' );
@ -109,18 +112,19 @@ function twentytwelve_get_font_url() {
*/ */
$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' ); $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
if ( 'cyrillic' == $subset ) if ( 'cyrillic' == $subset ) {
$subsets .= ',cyrillic,cyrillic-ext'; $subsets .= ',cyrillic,cyrillic-ext';
elseif ( 'greek' == $subset ) } elseif ( 'greek' == $subset ) {
$subsets .= ',greek,greek-ext'; $subsets .= ',greek,greek-ext';
elseif ( 'vietnamese' == $subset ) } elseif ( 'vietnamese' == $subset ) {
$subsets .= ',vietnamese'; $subsets .= ',vietnamese';
}
$query_args = array( $query_args = array(
'family' => 'Open+Sans:400italic,700italic,400,700', 'family' => 'Open+Sans:400italic,700italic,400,700',
'subset' => $subsets, 'subset' => $subsets,
); );
$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
} }
return $font_url; return $font_url;
@ -138,15 +142,17 @@ function twentytwelve_scripts_styles() {
* Adds JavaScript to pages with the comment form to support * Adds JavaScript to pages with the comment form to support
* sites with threaded comments (when in use). * sites with threaded comments (when in use).
*/ */
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
wp_enqueue_script( 'comment-reply' ); wp_enqueue_script( 'comment-reply' );
}
// Adds JavaScript for handling the navigation menu hide-and-show behavior. // Adds JavaScript for handling the navigation menu hide-and-show behavior.
wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true ); wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
$font_url = twentytwelve_get_font_url(); $font_url = twentytwelve_get_font_url();
if ( ! empty( $font_url ) ) if ( ! empty( $font_url ) ) {
wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null ); wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
}
// Loads our main stylesheet. // Loads our main stylesheet.
wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() ); wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
@ -197,11 +203,13 @@ add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
function twentytwelve_mce_css( $mce_css ) { function twentytwelve_mce_css( $mce_css ) {
$font_url = twentytwelve_get_font_url(); $font_url = twentytwelve_get_font_url();
if ( empty( $font_url ) ) if ( empty( $font_url ) ) {
return $mce_css; return $mce_css;
}
if ( ! empty( $mce_css ) ) if ( ! empty( $mce_css ) ) {
$mce_css .= ','; $mce_css .= ',';
}
$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) ); $mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
@ -224,20 +232,23 @@ add_filter( 'mce_css', 'twentytwelve_mce_css' );
function twentytwelve_wp_title( $title, $sep ) { function twentytwelve_wp_title( $title, $sep ) {
global $paged, $page; global $paged, $page;
if ( is_feed() ) if ( is_feed() ) {
return $title; return $title;
}
// Add the site name. // Add the site name.
$title .= get_bloginfo( 'name', 'display' ); $title .= get_bloginfo( 'name', 'display' );
// Add the site description for the home/front page. // Add the site description for the home/front page.
$site_description = get_bloginfo( 'description', 'display' ); $site_description = get_bloginfo( 'description', 'display' );
if ( $site_description && ( is_home() || is_front_page() ) ) if ( $site_description && ( is_home() || is_front_page() ) ) {
$title = "$title $sep $site_description"; $title = "$title $sep $site_description";
}
// Add a page number if necessary. // Add a page number if necessary.
if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) ); $title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
}
return $title; return $title;
} }
@ -251,8 +262,9 @@ add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
*/ */
function twentytwelve_page_menu_args( $args ) { function twentytwelve_page_menu_args( $args ) {
if ( ! isset( $args['show_home'] ) ) if ( ! isset( $args['show_home'] ) ) {
$args['show_home'] = true; $args['show_home'] = true;
}
return $args; return $args;
} }
add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' ); add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
@ -265,168 +277,190 @@ add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
*/ */
function twentytwelve_widgets_init() { function twentytwelve_widgets_init() {
register_sidebar( array( register_sidebar(
'name' => __( 'Main Sidebar', 'twentytwelve' ), array(
'id' => 'sidebar-1', 'name' => __( 'Main Sidebar', 'twentytwelve' ),
'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ), 'id' => 'sidebar-1',
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
'after_widget' => '</aside>', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'before_title' => '<h3 class="widget-title">', 'after_widget' => '</aside>',
'after_title' => '</h3>', 'before_title' => '<h3 class="widget-title">',
) ); 'after_title' => '</h3>',
)
);
register_sidebar( array( register_sidebar(
'name' => __( 'First Front Page Widget Area', 'twentytwelve' ), array(
'id' => 'sidebar-2', 'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ), 'id' => 'sidebar-2',
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
'after_widget' => '</aside>', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'before_title' => '<h3 class="widget-title">', 'after_widget' => '</aside>',
'after_title' => '</h3>', 'before_title' => '<h3 class="widget-title">',
) ); 'after_title' => '</h3>',
)
);
register_sidebar( array( register_sidebar(
'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ), array(
'id' => 'sidebar-3', 'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ), 'id' => 'sidebar-3',
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
'after_widget' => '</aside>', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'before_title' => '<h3 class="widget-title">', 'after_widget' => '</aside>',
'after_title' => '</h3>', 'before_title' => '<h3 class="widget-title">',
) ); 'after_title' => '</h3>',
)
);
} }
add_action( 'widgets_init', 'twentytwelve_widgets_init' ); add_action( 'widgets_init', 'twentytwelve_widgets_init' );
if ( ! function_exists( 'twentytwelve_content_nav' ) ) : if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
/** /**
* Displays navigation to next/previous pages when applicable. * Displays navigation to next/previous pages when applicable.
* *
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
*/ */
function twentytwelve_content_nav( $html_id ) { function twentytwelve_content_nav( $html_id ) {
global $wp_query; global $wp_query;
if ( $wp_query->max_num_pages > 1 ) : ?> if ( $wp_query->max_num_pages > 1 ) : ?>
<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation"> <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div> <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
</nav><!-- .navigation --> </nav><!-- .navigation -->
<?php endif; <?php
} endif;
}
endif; endif;
if ( ! function_exists( 'twentytwelve_comment' ) ) : if ( ! function_exists( 'twentytwelve_comment' ) ) :
/** /**
* Template for comments and pingbacks. * Template for comments and pingbacks.
* *
* To override this walker in a child theme without modifying the comments template * To override this walker in a child theme without modifying the comments template
* simply create your own twentytwelve_comment(), and that function will be used instead. * simply create your own twentytwelve_comment(), and that function will be used instead.
* *
* Used as a callback by wp_list_comments() for displaying the comments. * Used as a callback by wp_list_comments() for displaying the comments.
* *
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
*/ */
function twentytwelve_comment( $comment, $args, $depth ) { function twentytwelve_comment( $comment, $args, $depth ) {
$GLOBALS['comment'] = $comment; $GLOBALS['comment'] = $comment;
switch ( $comment->comment_type ) : switch ( $comment->comment_type ) :
case 'pingback' : case 'pingback':
case 'trackback' : case 'trackback':
// Display trackbacks differently than normal comments. // Display trackbacks differently than normal comments.
?> ?>
<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>"> <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p> <p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
<?php <?php
break; break;
default : default:
// Proceed with normal comments. // Proceed with normal comments.
global $post; global $post;
?> ?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
<article id="comment-<?php comment_ID(); ?>" class="comment"> <article id="comment-<?php comment_ID(); ?>" class="comment">
<header class="comment-meta comment-author vcard"> <header class="comment-meta comment-author vcard">
<?php <?php
echo get_avatar( $comment, 44 ); echo get_avatar( $comment, 44 );
printf( '<cite><b class="fn">%1$s</b> %2$s</cite>', printf(
'<cite><b class="fn">%1$s</b> %2$s</cite>',
get_comment_author_link(), get_comment_author_link(),
// If current post author is also comment author, make it known visually. // If current post author is also comment author, make it known visually.
( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : '' ( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
); );
printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>', printf(
'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
esc_url( get_comment_link( $comment->comment_ID ) ), esc_url( get_comment_link( $comment->comment_ID ) ),
get_comment_time( 'c' ), get_comment_time( 'c' ),
/* translators: 1: date, 2: time */ /* translators: 1: date, 2: time */
sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() ) sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
); );
?> ?>
</header><!-- .comment-meta --> </header><!-- .comment-meta -->
<?php if ( '0' == $comment->comment_approved ) : ?> <?php if ( '0' == $comment->comment_approved ) : ?>
<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p> <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
<?php endif; ?> <?php endif; ?>
<section class="comment-content comment"> <section class="comment-content comment">
<?php comment_text(); ?> <?php comment_text(); ?>
<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?> <?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
</section><!-- .comment-content --> </section><!-- .comment-content -->
<div class="reply"> <div class="reply">
<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> <?php
</div><!-- .reply --> comment_reply_link(
</article><!-- #comment-## --> array_merge(
<?php $args, array(
break; 'reply_text' => __( 'Reply', 'twentytwelve' ),
endswitch; // end comment_type check 'after' => ' <span>&darr;</span>',
} 'depth' => $depth,
'max_depth' => $args['max_depth'],
)
)
);
?>
</div><!-- .reply -->
</article><!-- #comment-## -->
<?php
break;
endswitch; // end comment_type check
}
endif; endif;
if ( ! function_exists( 'twentytwelve_entry_meta' ) ) : if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
/** /**
* Set up post entry meta. * Set up post entry meta.
* *
* Prints HTML with meta information for current post: categories, tags, permalink, author, and date. * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
* *
* Create your own twentytwelve_entry_meta() to override in a child theme. * Create your own twentytwelve_entry_meta() to override in a child theme.
* *
* @since Twenty Twelve 1.0 * @since Twenty Twelve 1.0
*/ */
function twentytwelve_entry_meta() { function twentytwelve_entry_meta() {
// Translators: used between list items, there is a space after the comma. // Translators: used between list items, there is a space after the comma.
$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) ); $categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
// Translators: used between list items, there is a space after the comma. // Translators: used between list items, there is a space after the comma.
$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) ); $tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>', $date = sprintf(
esc_url( get_permalink() ), '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
esc_attr( get_the_time() ), esc_url( get_permalink() ),
esc_attr( get_the_date( 'c' ) ), esc_attr( get_the_time() ),
esc_html( get_the_date() ) esc_attr( get_the_date( 'c' ) ),
); esc_html( get_the_date() )
);
$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>', $author = sprintf(
esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ), esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
get_the_author() esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
); get_the_author()
);
// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name. // Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
if ( $tag_list ) { if ( $tag_list ) {
$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' ); $utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
} elseif ( $categories_list ) { } elseif ( $categories_list ) {
$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' ); $utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
} else { } else {
$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' ); $utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
}
printf(
$utility_text,
$categories_list,
$tag_list,
$date,
$author
);
} }
printf(
$utility_text,
$categories_list,
$tag_list,
$date,
$author
);
}
endif; endif;
/** /**
@ -450,30 +484,36 @@ function twentytwelve_body_class( $classes ) {
$background_color = get_background_color(); $background_color = get_background_color();
$background_image = get_background_image(); $background_image = get_background_image();
if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) {
$classes[] = 'full-width'; $classes[] = 'full-width';
}
if ( is_page_template( 'page-templates/front-page.php' ) ) { if ( is_page_template( 'page-templates/front-page.php' ) ) {
$classes[] = 'template-front-page'; $classes[] = 'template-front-page';
if ( has_post_thumbnail() ) if ( has_post_thumbnail() ) {
$classes[] = 'has-post-thumbnail'; $classes[] = 'has-post-thumbnail';
if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) }
if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) {
$classes[] = 'two-sidebars'; $classes[] = 'two-sidebars';
}
} }
if ( empty( $background_image ) ) { if ( empty( $background_image ) ) {
if ( empty( $background_color ) ) if ( empty( $background_color ) ) {
$classes[] = 'custom-background-empty'; $classes[] = 'custom-background-empty';
elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) } elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
$classes[] = 'custom-background-white'; $classes[] = 'custom-background-white';
}
} }
// Enable custom font class only if the font CSS is queued to load. // Enable custom font class only if the font CSS is queued to load.
if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) {
$classes[] = 'custom-font-enabled'; $classes[] = 'custom-font-enabled';
}
if ( ! is_multi_author() ) if ( ! is_multi_author() ) {
$classes[] = 'single-author'; $classes[] = 'single-author';
}
return $classes; return $classes;
} }
@ -510,16 +550,20 @@ function twentytwelve_customize_register( $wp_customize ) {
$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage'; $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
if ( isset( $wp_customize->selective_refresh ) ) { if ( isset( $wp_customize->selective_refresh ) ) {
$wp_customize->selective_refresh->add_partial( 'blogname', array( $wp_customize->selective_refresh->add_partial(
'selector' => '.site-title > a', 'blogname', array(
'container_inclusive' => false, 'selector' => '.site-title > a',
'render_callback' => 'twentytwelve_customize_partial_blogname', 'container_inclusive' => false,
) ); 'render_callback' => 'twentytwelve_customize_partial_blogname',
$wp_customize->selective_refresh->add_partial( 'blogdescription', array( )
'selector' => '.site-description', );
'container_inclusive' => false, $wp_customize->selective_refresh->add_partial(
'render_callback' => 'twentytwelve_customize_partial_blogdescription', 'blogdescription', array(
) ); 'selector' => '.site-description',
'container_inclusive' => false,
'render_callback' => 'twentytwelve_customize_partial_blogdescription',
)
);
} }
} }
add_action( 'customize_register', 'twentytwelve_customize_register' ); add_action( 'customize_register', 'twentytwelve_customize_register' );

11
header.php
View File

@ -42,7 +42,14 @@
<nav id="site-navigation" class="main-navigation" role="navigation"> <nav id="site-navigation" class="main-navigation" role="navigation">
<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button> <button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a> <a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?> <?php
wp_nav_menu(
array(
'theme_location' => 'primary',
'menu_class' => 'nav-menu',
)
);
?>
</nav><!-- #site-navigation --> </nav><!-- #site-navigation -->
<?php if ( get_header_image() ) : ?> <?php if ( get_header_image() ) : ?>
@ -50,4 +57,4 @@
<?php endif; ?> <?php endif; ?>
</header><!-- #masthead --> </header><!-- #masthead -->
<div id="main" class="wrapper"> <div id="main" class="wrapper">

63
image.php
View File

@ -14,7 +14,10 @@ get_header(); ?>
<div id="primary" class="site-content"> <div id="primary" class="site-content">
<div id="content" role="main"> <div id="content" role="main">
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
<header class="entry-header"> <header class="entry-header">
@ -23,7 +26,8 @@ get_header(); ?>
<footer class="entry-meta"> <footer class="entry-meta">
<?php <?php
$metadata = wp_get_attachment_metadata(); $metadata = wp_get_attachment_metadata();
printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ), printf(
__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
esc_attr( get_the_date( 'c' ) ), esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ), esc_html( get_the_date() ),
esc_url( wp_get_attachment_url() ), esc_url( wp_get_attachment_url() ),
@ -52,10 +56,22 @@ get_header(); ?>
* Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery, * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
* or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
*/ */
$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) ); $attachments = array_values(
get_children(
array(
'post_parent' => $post->post_parent,
'post_status' => 'inherit',
'post_type' => 'attachment',
'post_mime_type' => 'image',
'order' => 'ASC',
'orderby' => 'menu_order ID',
)
)
);
foreach ( $attachments as $k => $attachment ) : foreach ( $attachments as $k => $attachment ) :
if ( $attachment->ID == $post->ID ) if ( $attachment->ID == $post->ID ) {
break; break;
}
endforeach; endforeach;
// If there is more than 1 attachment in a gallery // If there is more than 1 attachment in a gallery
@ -73,20 +89,22 @@ else :
$next_attachment_url = wp_get_attachment_url(); $next_attachment_url = wp_get_attachment_url();
endif; endif;
?> ?>
<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
/** <?php
* Filter the image attachment size to use. /**
* * Filter the image attachment size to use.
* @since Twenty Twelve 1.0 *
* * @since Twenty Twelve 1.0
* @param array $size { *
* @type int The attachment height in pixels. * @param array $size {
* @type int The attachment width in pixels. * @type int The attachment height in pixels.
* } * @type int The attachment width in pixels.
*/ * }
$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) ); */
echo wp_get_attachment_image( $post->ID, $attachment_size ); $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
?></a> echo wp_get_attachment_image( $post->ID, $attachment_size );
?>
</a>
<?php if ( ! empty( $post->post_excerpt ) ) : ?> <?php if ( ! empty( $post->post_excerpt ) ) : ?>
<div class="entry-caption"> <div class="entry-caption">
@ -99,7 +117,14 @@ endif;
<div class="entry-description"> <div class="entry-description">
<?php the_content(); ?> <?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?> <?php
wp_link_pages(
array(
'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
'after' => '</div>',
)
);
?>
</div><!-- .entry-description --> </div><!-- .entry-description -->
</div><!-- .entry-content --> </div><!-- .entry-content -->

31
inc/custom-header.php
View File

@ -54,8 +54,9 @@ add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
*/ */
function twentytwelve_custom_header_fonts() { function twentytwelve_custom_header_fonts() {
$font_url = twentytwelve_get_font_url(); $font_url = twentytwelve_get_font_url();
if ( ! empty( $font_url ) ) if ( ! empty( $font_url ) ) {
wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null ); wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
}
} }
add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' ); add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
@ -70,24 +71,25 @@ function twentytwelve_header_style() {
$text_color = get_header_textcolor(); $text_color = get_header_textcolor();
// If no custom options for text are set, let's bail // If no custom options for text are set, let's bail
if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
return; return;
}
// If we get this far, we have custom styles. // If we get this far, we have custom styles.
?> ?>
<style type="text/css" id="twentytwelve-header-css"> <style type="text/css" id="twentytwelve-header-css">
<?php <?php
// Has the text been hidden? // Has the text been hidden?
if ( ! display_header_text() ) : if ( ! display_header_text() ) :
?> ?>
.site-title, .site-title,
.site-description { .site-description {
position: absolute; position: absolute;
clip: rect(1px 1px 1px 1px); /* IE7 */ clip: rect(1px 1px 1px 1px); /* IE7 */
clip: rect(1px, 1px, 1px, 1px); clip: rect(1px, 1px, 1px, 1px);
} }
<?php <?php
// If the user has set a custom color for the text, use that. // If the user has set a custom color for the text, use that.
else : else :
?> ?>
.site-header h1 a, .site-header h1 a,
@ -155,9 +157,12 @@ function twentytwelve_admin_header_image() {
<div id="headimg"> <div id="headimg">
<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1> <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2> <h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
<?php $header_image = get_header_image(); <?php
if ( ! empty( $header_image ) ) : ?> $header_image = get_header_image();
if ( ! empty( $header_image ) ) :
?>
<img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" /> <img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php } <?php
}

11
index.php
View File

@ -21,7 +21,10 @@ get_header(); ?>
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<?php /* Start the Loop */ ?> <?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', get_post_format() ); ?> <?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?> <?php endwhile; ?>
@ -31,7 +34,8 @@ get_header(); ?>
<article id="post-0" class="post no-results not-found"> <article id="post-0" class="post no-results not-found">
<?php if ( current_user_can( 'edit_posts' ) ) : <?php
if ( current_user_can( 'edit_posts' ) ) :
// Show a different message to a logged-in user who can add posts. // Show a different message to a logged-in user who can add posts.
?> ?>
<header class="entry-header"> <header class="entry-header">
@ -42,7 +46,8 @@ get_header(); ?>
<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p> <p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
</div><!-- .entry-content --> </div><!-- .entry-content -->
<?php else : <?php
else :
// Show the default message to everyone else. // Show the default message to everyone else.
?> ?>
<header class="entry-header"> <header class="entry-header">

7
page-templates/front-page.php
View File

@ -17,7 +17,10 @@ get_header(); ?>
<div id="primary" class="site-content"> <div id="primary" class="site-content">
<div id="content" role="main"> <div id="content" role="main">
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php if ( has_post_thumbnail() ) : ?> <?php if ( has_post_thumbnail() ) : ?>
<div class="entry-page-image"> <div class="entry-page-image">
<?php the_post_thumbnail(); ?> <?php the_post_thumbnail(); ?>
@ -32,4 +35,4 @@ get_header(); ?>
</div><!-- #primary --> </div><!-- #primary -->
<?php get_sidebar( 'front' ); ?> <?php get_sidebar( 'front' ); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

7
page-templates/full-width.php
View File

@ -19,7 +19,10 @@ get_header(); ?>
<div id="primary" class="site-content"> <div id="primary" class="site-content">
<div id="content" role="main"> <div id="content" role="main">
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', 'page' ); ?> <?php get_template_part( 'content', 'page' ); ?>
<?php comments_template( '', true ); ?> <?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
@ -27,4 +30,4 @@ get_header(); ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary --> </div><!-- #primary -->
<?php get_footer(); ?> <?php get_footer(); ?>

7
page.php
View File

@ -17,7 +17,10 @@ get_header(); ?>
<div id="primary" class="site-content"> <div id="primary" class="site-content">
<div id="content" role="main"> <div id="content" role="main">
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', 'page' ); ?> <?php get_template_part( 'content', 'page' ); ?>
<?php comments_template( '', true ); ?> <?php comments_template( '', true ); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
@ -26,4 +29,4 @@ get_header(); ?>
</div><!-- #primary --> </div><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

7
search.php
View File

@ -21,7 +21,10 @@ get_header(); ?>
<?php twentytwelve_content_nav( 'nav-above' ); ?> <?php twentytwelve_content_nav( 'nav-above' ); ?>
<?php /* Start the Loop */ ?> <?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', get_post_format() ); ?> <?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?> <?php endwhile; ?>
@ -46,4 +49,4 @@ get_header(); ?>
</section><!-- #primary --> </section><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

5
sidebar-front.php
View File

@ -15,8 +15,9 @@
* *
* If none of the sidebars have widgets, then let's bail early. * If none of the sidebars have widgets, then let's bail early.
*/ */
if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) {
return; return;
}
// If we get this far, we have widgets. Let do this. // If we get this far, we have widgets. Let do this.
?> ?>
@ -32,4 +33,4 @@ if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
<?php dynamic_sidebar( 'sidebar-3' ); ?> <?php dynamic_sidebar( 'sidebar-3' ); ?>
</div><!-- .second --> </div><!-- .second -->
<?php endif; ?> <?php endif; ?>
</div><!-- #secondary --> </div><!-- #secondary -->

2
sidebar.php
View File

@ -14,4 +14,4 @@
<div id="secondary" class="widget-area" role="complementary"> <div id="secondary" class="widget-area" role="complementary">
<?php dynamic_sidebar( 'sidebar-1' ); ?> <?php dynamic_sidebar( 'sidebar-1' ); ?>
</div><!-- #secondary --> </div><!-- #secondary -->
<?php endif; ?> <?php endif; ?>

7
single.php
View File

@ -12,7 +12,10 @@ get_header(); ?>
<div id="primary" class="site-content"> <div id="primary" class="site-content">
<div id="content" role="main"> <div id="content" role="main">
<?php while ( have_posts() ) : the_post(); ?> <?php
while ( have_posts() ) :
the_post();
?>
<?php get_template_part( 'content', get_post_format() ); ?> <?php get_template_part( 'content', get_post_format() ); ?>
@ -30,4 +33,4 @@ get_header(); ?>
</div><!-- #primary --> </div><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

3
tag.php
View File

@ -27,7 +27,8 @@ get_header(); ?>
<?php <?php
/* Start the Loop */ /* Start the Loop */
while ( have_posts() ) : the_post(); while ( have_posts() ) :
the_post();
/* /*
* Include the post format-specific template for the content. If you want to * Include the post format-specific template for the content. If you want to