1 removal.4 additions.
<?php <?php
/** /**
* Twenty Eleven functions and definitions * Twenty Eleven functions and definitions
* *
* Sets up the theme and provides some helper functions. Some helper functions * Sets up the theme and provides some helper functions. Some helper functions
* are used in the theme as custom template tags. Others are attached to action and * are used in the theme as custom template tags. Others are attached to action and
* filter hooks in WordPress to change core functionality. * filter hooks in WordPress to change core functionality.
* *
* The first function, twentyeleven_setup(), sets up the theme by registering support * The first function, twentyeleven_setup(), sets up the theme by registering support
* for various features in WordPress, such as post thumbnails, navigation menus, and the like. * for various features in WordPress, such as post thumbnails, navigation menus, and the like.
* *
* When using a child theme (see http://codex.wordpress.org/Theme_Development and * When using a child theme (see http://codex.wordpress.org/Theme_Development and
* http://codex.wordpress.org/Child_Themes), you can override certain functions * http://codex.wordpress.org/Child_Themes), you can override certain functions
* (those wrapped in a function_exists() call) by defining them first in your child theme's * (those wrapped in a function_exists() call) by defining them first in your child theme's
* functions.php file. The child theme's functions.php file is included before the parent * functions.php file. The child theme's functions.php file is included before the parent
* theme's file, so the child theme functions would be used. * theme's file, so the child theme functions would be used.
* *
* Functions that are not pluggable (not wrapped in function_exists()) are instead attached * Functions that are not pluggable (not wrapped in function_exists()) are instead attached
* to a filter or action hook. The hook can be removed by using remove_action() or * to a filter or action hook. The hook can be removed by using remove_action() or
* remove_filter() and you can attach your own function to the hook. * remove_filter() and you can attach your own function to the hook.
* *
* We can remove the parent theme's hook only after it is attached, which means we need to * We can remove the parent theme's hook only after it is attached, which means we need to
* wait until setting up the child theme: * wait until setting up the child theme:
* *
* <code> * <code>
* add_action( 'after_setup_theme', 'my_child_theme_setup' ); * add_action( 'after_setup_theme', 'my_child_theme_setup' );
* function my_child_theme_setup() { * function my_child_theme_setup() {
* // We are providing our own filter for excerpt_length (or using the unfiltered value) * // We are providing our own filter for excerpt_length (or using the unfiltered value)
* remove_filter( 'excerpt_length', 'twentyeleven_excerpt_length' ); * remove_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
* ... * ...
* } * }
* </code> * </code>
* *
* For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API. * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
* *
* @package WordPress * @package WordPress
* @subpackage Twenty_Eleven * @subpackage Twenty_Eleven
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
/** /**
* Set the content width based on the theme's design and stylesheet. * Set the content width based on the theme's design and stylesheet.
*/ */
if ( ! isset( $content_width ) ) if ( ! isset( $content_width ) )
$content_width = 584; $content_width = 584;
/** /**
* Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run. * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
*/ */
add_action( 'after_setup_theme', 'twentyeleven_setup' ); add_action( 'after_setup_theme', 'twentyeleven_setup' );
if ( ! function_exists( 'twentyeleven_setup' ) ): if ( ! function_exists( 'twentyeleven_setup' ) ):
/** /**
* Sets up theme defaults and registers support for various WordPress features. * Sets up theme defaults and registers support for various WordPress features.
* *
* Note that this function is hooked into the after_setup_theme hook, which runs * Note that this function is hooked into the after_setup_theme hook, which runs
* before the init hook. The init hook is too late for some features, such as indicating * before the init hook. The init hook is too late for some features, such as indicating
* support post thumbnails. * support post thumbnails.
* *
* To override twentyeleven_setup() in a child theme, add your own twentyeleven_setup to your child theme's * To override twentyeleven_setup() in a child theme, add your own twentyeleven_setup to your child theme's
* functions.php file. * functions.php file.
* *
* @uses load_theme_textdomain() For translation/localization support. * @uses load_theme_textdomain() For translation/localization support.
* @uses add_editor_style() To style the visual editor. * @uses add_editor_style() To style the visual editor.
* @uses add_theme_support() To add support for post thumbnails, automatic feed links, custom headers * @uses add_theme_support() To add support for post thumbnails, automatic feed links, custom headers
* and backgrounds, and post formats. * and backgrounds, and post formats.
* @uses register_nav_menus() To add support for navigation menus. * @uses register_nav_menus() To add support for navigation menus.
* @uses register_default_headers() To register the default custom header images provided with the theme. * @uses register_default_headers() To register the default custom header images provided with the theme.
* @uses set_post_thumbnail_size() To set a custom post thumbnail size. * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_setup() { function twentyeleven_setup() {
/* Make Twenty Eleven available for translation. /* Make Twenty Eleven available for translation.
* Translations can be added to the /languages/ directory. * Translations can be added to the /languages/ directory.
* If you're building a theme based on Twenty Eleven, use a find and replace * If you're building a theme based on Twenty Eleven, use a find and replace
* to change 'twentyeleven' to the name of your theme in all the template files. * to change 'twentyeleven' to the name of your theme in all the template files.
*/ */
load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' ); load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
// This theme styles the visual editor with editor-style.css to match the theme style. // This theme styles the visual editor with editor-style.css to match the theme style.
add_editor_style(); add_editor_style();
// Load up our theme options page and related code. // Load up our theme options page and related code.
require( get_template_directory() . '/inc/theme-options.php' ); require( get_template_directory() . '/inc/theme-options.php' );
// Grab Twenty Eleven's Ephemera widget. // Grab Twenty Eleven's Ephemera widget.
require( get_template_directory() . '/inc/widgets.php' ); require( get_template_directory() . '/inc/widgets.php' );
// Add default posts and comments RSS feed links to <head>. // Add default posts and comments RSS feed links to <head>.
add_theme_support( 'automatic-feed-links' ); add_theme_support( 'automatic-feed-links' );
// This theme uses wp_nav_menu() in one location. // This theme uses wp_nav_menu() in one location.
register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) ); register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
// Add support for a variety of post formats // Add support for a variety of post formats
add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) ); add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
$theme_options = twentyeleven_get_theme_options(); $theme_options = twentyeleven_get_theme_options();
if ( 'dark' == $theme_options['color_scheme'] ) if ( 'dark' == $theme_options['color_scheme'] )
$default_background_color = '1d1d1d'; $default_background_color = '1d1d1d';
else else
$default_background_color = 'f1f1f1'; $default_background_color = 'f1f1f1';
// Add support for custom backgrounds. // Add support for custom backgrounds.
add_theme_support( 'custom-background', array( add_theme_support( 'custom-background', array(
// Let WordPress know what our default background color is. // Let WordPress know what our default background color is.
// This is dependent on our current color scheme. // This is dependent on our current color scheme.
'default-color' => $default_background_color, 'default-color' => $default_background_color,
) ); ) );
// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
add_theme_support( 'post-thumbnails' ); add_theme_support( 'post-thumbnails' );
// Add support for custom headers. // Add support for custom headers.
$custom_header_support = array( $custom_header_support = array(
// The default header text color. // The default header text color.
'default-text-color' => '000', 'default-text-color' => '000',
// The height and width of our custom header. // The height and width of our custom header.
'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ), 'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
'height' => apply_filters( 'twentyeleven_header_image_height', 288 ), 'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
// Support flexible heights. // Support flexible heights.
'flex-height' => true, 'flex-height' => true,
// Random image rotation by default. // Random image rotation by default.
'random-default' => true, 'random-default' => true,
// Callback for styling the header. // Callback for styling the header.
'wp-head-callback' => 'twentyeleven_header_style', 'wp-head-callback' => 'twentyeleven_header_style',
// Callback for styling the header preview in the admin. // Callback for styling the header preview in the admin.
'admin-head-callback' => 'twentyeleven_admin_header_style', 'admin-head-callback' => 'twentyeleven_admin_header_style',
// Callback used to display the header preview in the admin. // Callback used to display the header preview in the admin.
'admin-preview-callback' => 'twentyeleven_admin_header_image', 'admin-preview-callback' => 'twentyeleven_admin_header_image',
); );
add_theme_support( 'custom-header', $custom_header_support ); add_theme_support( 'custom-header', $custom_header_support );
if ( ! function_exists( 'get_custom_header' ) ) { if ( ! function_exists( 'get_custom_header' ) ) {
// This is all for compatibility with versions of WordPress prior to 3.4. // This is all for compatibility with versions of WordPress prior to 3.4.
define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] ); define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
define( 'HEADER_IMAGE', '' ); define( 'HEADER_IMAGE', '' );
define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] ); define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] ); define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] ); add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
add_custom_background(); add_theme_support( 'custom-background', $args );
} }
// We'll be using post thumbnails for custom header images on posts and pages. // We'll be using post thumbnails for custom header images on posts and pages.
// We want them to be the size of the header image that we just defined // We want them to be the size of the header image that we just defined
// Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php. // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true ); set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
// Add Twenty Eleven's custom image sizes. // Add Twenty Eleven's custom image sizes.
// Used for large feature (header) images. // Used for large feature (header) images.
add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true ); add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
// Used for featured posts if a large-feature doesn't exist. // Used for featured posts if a large-feature doesn't exist.
add_image_size( 'small-feature', 500, 300 ); add_image_size( 'small-feature', 500, 300 );
// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI. // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
register_default_headers( array( register_default_headers( array(
'wheel' => array( 'wheel' => array(
'url' => '%s/images/headers/wheel.jpg', 'url' => '%s/images/headers/wheel.jpg',
'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Wheel', 'twentyeleven' ) 'description' => __( 'Wheel', 'twentyeleven' )
), ),
'shore' => array( 'shore' => array(
'url' => '%s/images/headers/shore.jpg', 'url' => '%s/images/headers/shore.jpg',
'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Shore', 'twentyeleven' ) 'description' => __( 'Shore', 'twentyeleven' )
), ),
'trolley' => array( 'trolley' => array(
'url' => '%s/images/headers/trolley.jpg', 'url' => '%s/images/headers/trolley.jpg',
'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Trolley', 'twentyeleven' ) 'description' => __( 'Trolley', 'twentyeleven' )
), ),
'pine-cone' => array( 'pine-cone' => array(
'url' => '%s/images/headers/pine-cone.jpg', 'url' => '%s/images/headers/pine-cone.jpg',
'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Pine Cone', 'twentyeleven' ) 'description' => __( 'Pine Cone', 'twentyeleven' )
), ),
'chessboard' => array( 'chessboard' => array(
'url' => '%s/images/headers/chessboard.jpg', 'url' => '%s/images/headers/chessboard.jpg',
'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Chessboard', 'twentyeleven' ) 'description' => __( 'Chessboard', 'twentyeleven' )
), ),
'lanterns' => array( 'lanterns' => array(
'url' => '%s/images/headers/lanterns.jpg', 'url' => '%s/images/headers/lanterns.jpg',
'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Lanterns', 'twentyeleven' ) 'description' => __( 'Lanterns', 'twentyeleven' )
), ),
'willow' => array( 'willow' => array(
'url' => '%s/images/headers/willow.jpg', 'url' => '%s/images/headers/willow.jpg',
'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Willow', 'twentyeleven' ) 'description' => __( 'Willow', 'twentyeleven' )
), ),
'hanoi' => array( 'hanoi' => array(
'url' => '%s/images/headers/hanoi.jpg', 'url' => '%s/images/headers/hanoi.jpg',
'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg', 'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
/* translators: header image description */ /* translators: header image description */
'description' => __( 'Hanoi Plant', 'twentyeleven' ) 'description' => __( 'Hanoi Plant', 'twentyeleven' )
) )
) ); ) );
} }
endif; // twentyeleven_setup endif; // twentyeleven_setup
if ( ! function_exists( 'twentyeleven_header_style' ) ) : if ( ! function_exists( 'twentyeleven_header_style' ) ) :
/** /**
* Styles the header image and text displayed on the blog * Styles the header image and text displayed on the blog
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_header_style() { function twentyeleven_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 == HEADER_TEXTCOLOR ) if ( $text_color == HEADER_TEXTCOLOR )
return; return;
// If we get this far, we have custom styles. Let's do this. // If we get this far, we have custom styles. Let's do this.
?> ?>
<style type="text/css"> <style type="text/css">
<?php <?php
// Has the text been hidden? // Has the text been hidden?
if ( 'blank' == $text_color ) : if ( 'blank' == $text_color ) :
?> ?>
#site-title, #site-title,
#site-description { #site-description {
position: absolute !important; position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px 1px 1px 1px); /* IE6, 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-title a, #site-title a,
#site-description { #site-description {
color: #<?php echo $text_color; ?> !important; color: #<?php echo $text_color; ?> !important;
} }
<?php endif; ?> <?php endif; ?>
</style> </style>
<?php <?php
} }
endif; // twentyeleven_header_style endif; // twentyeleven_header_style
if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) : if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
/** /**
* Styles the header image displayed on the Appearance > Header admin panel. * Styles the header image displayed on the Appearance > Header admin panel.
* *
* Referenced via add_theme_support('custom-header') in twentyeleven_setup(). * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_admin_header_style() { function twentyeleven_admin_header_style() {
?> ?>
<style type="text/css"> <style type="text/css">
.appearance_page_custom-header #headimg { .appearance_page_custom-header #headimg {
border: none; border: none;
} }
#headimg h1, #headimg h1,
#desc { #desc {
font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif; font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
} }
#headimg h1 { #headimg h1 {
margin: 0; margin: 0;
} }
#headimg h1 a { #headimg h1 a {
font-size: 32px; font-size: 32px;
line-height: 36px; line-height: 36px;
text-decoration: none; text-decoration: none;
} }
#desc { #desc {
font-size: 14px; font-size: 14px;
line-height: 23px; line-height: 23px;
padding: 0 0 3em; padding: 0 0 3em;
} }
<?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
if ( get_header_textcolor() != HEADER_TEXTCOLOR ) : if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
?> ?>
#site-title a, #site-title a,
#site-description { #site-description {
color: #<?php echo get_header_textcolor(); ?>; color: #<?php echo get_header_textcolor(); ?>;
} }
<?php endif; ?> <?php endif; ?>
#headimg img { #headimg img {
max-width: 1000px; max-width: 1000px;
height: auto; height: auto;
width: 100%; width: 100%;
} }
</style> </style>
<?php <?php
} }
endif; // twentyeleven_admin_header_style endif; // twentyeleven_admin_header_style
if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) : if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
/** /**
* Custom header image markup displayed on the Appearance > Header admin panel. * Custom header image markup displayed on the Appearance > Header admin panel.
* *
* Referenced via add_theme_support('custom-header') in twentyeleven_setup(). * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_admin_header_image() { ?> function twentyeleven_admin_header_image() { ?>
<div id="headimg"> <div id="headimg">
<?php <?php
$color = get_header_textcolor(); $color = get_header_textcolor();
$image = get_header_image(); $image = get_header_image();
if ( $color && $color != 'blank' ) if ( $color && $color != 'blank' )
$style = ' style="color:#' . $color . '"'; $style = ' style="color:#' . $color . '"';
else else
$style = ' style="display:none"'; $style = ' style="display:none"';
?> ?>
<h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1> <h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
<div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> <div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
<?php if ( $image ) : ?> <?php if ( $image ) : ?>
<img src="<?php echo esc_url( $image ); ?>" alt="" /> <img src="<?php echo esc_url( $image ); ?>" alt="" />
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php } <?php }
endif; // twentyeleven_admin_header_image endif; // twentyeleven_admin_header_image
/** /**
* Sets the post excerpt length to 40 words. * Sets the post excerpt length to 40 words.
* *
* To override this length in a child theme, remove the filter and add your own * To override this length in a child theme, remove the filter and add your own
* function tied to the excerpt_length filter hook. * function tied to the excerpt_length filter hook.
*/ */
function twentyeleven_excerpt_length( $length ) { function twentyeleven_excerpt_length( $length ) {
return 40; return 40;
} }
add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' ); add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
/** /**
* Returns a "Continue Reading" link for excerpts * Returns a "Continue Reading" link for excerpts
*/ */
function twentyeleven_continue_reading_link() { function twentyeleven_continue_reading_link() {
return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>'; return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
} }
/** /**
* Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis and twentyeleven_continue_reading_link(). * Replaces "[...]" (appended to automatically generated excerpts) with an ellipsis and twentyeleven_continue_reading_link().
* *
* To override this in a child theme, remove the filter and add your own * To override this in a child theme, remove the filter and add your own
* function tied to the excerpt_more filter hook. * function tied to the excerpt_more filter hook.
*/ */
function twentyeleven_auto_excerpt_more( $more ) { function twentyeleven_auto_excerpt_more( $more ) {
return ' &hellip;' . twentyeleven_continue_reading_link(); return ' &hellip;' . twentyeleven_continue_reading_link();
} }
add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' ); add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
/** /**
* Adds a pretty "Continue Reading" link to custom post excerpts. * Adds a pretty "Continue Reading" link to custom post excerpts.
* *
* To override this link in a child theme, remove the filter and add your own * To override this link in a child theme, remove the filter and add your own
* function tied to the get_the_excerpt filter hook. * function tied to the get_the_excerpt filter hook.
*/ */
function twentyeleven_custom_excerpt_more( $output ) { function twentyeleven_custom_excerpt_more( $output ) {
if ( has_excerpt() && ! is_attachment() ) { if ( has_excerpt() && ! is_attachment() ) {
$output .= twentyeleven_continue_reading_link(); $output .= twentyeleven_continue_reading_link();
} }
return $output; return $output;
} }
add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' ); add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
/** /**
* Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link. * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
*/ */
function twentyeleven_page_menu_args( $args ) { function twentyeleven_page_menu_args( $args ) {
$args['show_home'] = true; $args['show_home'] = true;
return $args; return $args;
} }
add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' ); add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
/** /**
* Register our sidebars and widgetized areas. Also register the default Epherma widget. * Register our sidebars and widgetized areas. Also register the default Epherma widget.
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_widgets_init() { function twentyeleven_widgets_init() {
register_widget( 'Twenty_Eleven_Ephemera_Widget' ); register_widget( 'Twenty_Eleven_Ephemera_Widget' );
register_sidebar( array( register_sidebar( array(
'name' => __( 'Main Sidebar', 'twentyeleven' ), 'name' => __( 'Main Sidebar', 'twentyeleven' ),
'id' => 'sidebar-1', 'id' => 'sidebar-1',
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => "</aside>", 'after_widget' => "</aside>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
register_sidebar( array( register_sidebar( array(
'name' => __( 'Showcase Sidebar', 'twentyeleven' ), 'name' => __( 'Showcase Sidebar', 'twentyeleven' ),
'id' => 'sidebar-2', 'id' => 'sidebar-2',
'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ), 'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => "</aside>", 'after_widget' => "</aside>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
register_sidebar( array( register_sidebar( array(
'name' => __( 'Footer Area One', 'twentyeleven' ), 'name' => __( 'Footer Area One', 'twentyeleven' ),
'id' => 'sidebar-3', 'id' => 'sidebar-3',
'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ), 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => "</aside>", 'after_widget' => "</aside>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
register_sidebar( array( register_sidebar( array(
'name' => __( 'Footer Area Two', 'twentyeleven' ), 'name' => __( 'Footer Area Two', 'twentyeleven' ),
'id' => 'sidebar-4', 'id' => 'sidebar-4',
'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ), 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => "</aside>", 'after_widget' => "</aside>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
register_sidebar( array( register_sidebar( array(
'name' => __( 'Footer Area Three', 'twentyeleven' ), 'name' => __( 'Footer Area Three', 'twentyeleven' ),
'id' => 'sidebar-5', 'id' => 'sidebar-5',
'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ), 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">', 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => "</aside>", 'after_widget' => "</aside>",
'before_title' => '<h3 class="widget-title">', 'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>', 'after_title' => '</h3>',
) ); ) );
} }
add_action( 'widgets_init', 'twentyeleven_widgets_init' ); add_action( 'widgets_init', 'twentyeleven_widgets_init' );
if ( ! function_exists( 'twentyeleven_content_nav' ) ) : if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
/** /**
* Display navigation to next/previous pages when applicable * Display navigation to next/previous pages when applicable
*/ */
function twentyeleven_content_nav( $nav_id ) { function twentyeleven_content_nav( $nav_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 $nav_id; ?>"> <nav id="<?php echo $nav_id; ?>">
<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3> <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div> <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
</nav><!-- #nav-above --> </nav><!-- #nav-above -->
<?php endif; <?php endif;
} }
endif; // twentyeleven_content_nav endif; // twentyeleven_content_nav
/** /**
* Return the URL for the first link found in the post content. * Return the URL for the first link found in the post content.
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
* @return string|bool URL or false when no link is present. * @return string|bool URL or false when no link is present.
*/ */
function twentyeleven_url_grabber() { function twentyeleven_url_grabber() {
if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) ) if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
return false; return false;
return esc_url_raw( $matches[1] ); return esc_url_raw( $matches[1] );
} }
/** /**
* Count the number of footer sidebars to enable dynamic classes for the footer * Count the number of footer sidebars to enable dynamic classes for the footer
*/ */
function twentyeleven_footer_sidebar_class() { function twentyeleven_footer_sidebar_class() {
$count = 0; $count = 0;
if ( is_active_sidebar( 'sidebar-3' ) ) if ( is_active_sidebar( 'sidebar-3' ) )
$count++; $count++;
if ( is_active_sidebar( 'sidebar-4' ) ) if ( is_active_sidebar( 'sidebar-4' ) )
$count++; $count++;
if ( is_active_sidebar( 'sidebar-5' ) ) if ( is_active_sidebar( 'sidebar-5' ) )
$count++; $count++;
$class = ''; $class = '';
switch ( $count ) { switch ( $count ) {
case '1': case '1':
$class = 'one'; $class = 'one';
break; break;
case '2': case '2':
$class = 'two'; $class = 'two';
break; break;
case '3': case '3':
$class = 'three'; $class = 'three';
break; break;
} }
if ( $class ) if ( $class )
echo 'class="' . $class . '"'; echo 'class="' . $class . '"';
} }
if ( ! function_exists( 'twentyeleven_comment' ) ) : if ( ! function_exists( 'twentyeleven_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 twentyeleven_comment(), and that function will be used instead. * simply create your own twentyeleven_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 Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_comment( $comment, $args, $depth ) { function twentyeleven_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' :
?> ?>
<li class="post pingback"> <li class="post pingback">
<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p> <p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
<?php <?php
break; break;
default : default :
?> ?>
<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">
<footer class="comment-meta"> <footer class="comment-meta">
<div class="comment-author vcard"> <div class="comment-author vcard">
<?php <?php
$avatar_size = 68; $avatar_size = 68;
if ( '0' != $comment->comment_parent ) if ( '0' != $comment->comment_parent )
$avatar_size = 39; $avatar_size = 39;
echo get_avatar( $comment, $avatar_size ); echo get_avatar( $comment, $avatar_size );
/* translators: 1: comment author, 2: date and time */ /* translators: 1: comment author, 2: date and time */
printf( __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ), printf( __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
sprintf( '<span class="fn">%s</span>', get_comment_author_link() ), sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
sprintf( '<a href="%1$s"><time pubdate datetime="%2$s">%3$s</time></a>', sprintf( '<a href="%1$s"><time pubdate 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', 'twentyeleven' ), get_comment_date(), get_comment_time() ) sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
) )
); );
?> ?>
<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?> <?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .comment-author .vcard --> </div><!-- .comment-author .vcard -->
<?php if ( $comment->comment_approved == '0' ) : ?> <?php if ( $comment->comment_approved == '0' ) : ?>
<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em> <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
<br /> <br />
<?php endif; ?> <?php endif; ?>
</footer> </footer>
<div class="comment-content"><?php comment_text(); ?></div> <div class="comment-content"><?php comment_text(); ?></div>
<div class="reply"> <div class="reply">
<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> <?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
</div><!-- .reply --> </div><!-- .reply -->
</article><!-- #comment-## --> </article><!-- #comment-## -->
<?php <?php
break; break;
endswitch; endswitch;
} }
endif; // ends check for twentyeleven_comment() endif; // ends check for twentyeleven_comment()
if ( ! function_exists( 'twentyeleven_posted_on' ) ) : if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
/** /**
* Prints HTML with meta information for the current post-date/time and author. * Prints HTML with meta information for the current post-date/time and author.
* Create your own twentyeleven_posted_on to override in a child theme * Create your own twentyeleven_posted_on to override in a child theme
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_posted_on() { function twentyeleven_posted_on() {
printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s" pubdate>%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ), printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s" pubdate>%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
esc_url( get_permalink() ), esc_url( get_permalink() ),
esc_attr( get_the_time() ), esc_attr( get_the_time() ),
esc_attr( get_the_date( 'c' ) ), esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ), esc_html( get_the_date() ),
esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ), esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
get_the_author() get_the_author()
); );
} }
endif; endif;
/** /**
* Adds two classes to the array of body classes. * Adds two classes to the array of body classes.
* The first is if the site has only had one author with published posts. * The first is if the site has only had one author with published posts.
* The second is if a singular post being displayed * The second is if a singular post being displayed
* *
* @since Twenty Eleven 1.0 * @since Twenty Eleven 1.0
*/ */
function twentyeleven_body_classes( $classes ) { function twentyeleven_body_classes( $classes ) {
if ( function_exists( 'is_multi_author' ) && ! is_multi_author() ) if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
$classes[] = 'single-author'; $classes[] = 'single-author';
if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) ) if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
$classes[] = 'singular'; $classes[] = 'singular';
return $classes; return $classes;
} }
add_filter( 'body_class', 'twentyeleven_body_classes' ); add_filter( 'body_class', 'twentyeleven_body_classes' );
ORIGINAL TEXT
CHANGED TEXT