Twenty Eleven code review and cleanup, props dd32, fixes #17748
git-svn-id: https://develop.svn.wordpress.org/trunk@18253 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
parent
563e7fb099
commit
9a7f69f2aa
|
|
@ -17,17 +17,6 @@ get_header(); ?>
|
|||
<section id="primary">
|
||||
<div id="content" role="main">
|
||||
|
||||
<?php
|
||||
/* Queue the first post, that way we know
|
||||
* what date we're dealing with (if that is the case).
|
||||
*
|
||||
* We reset this later so we can run the loop
|
||||
* properly with a call to rewind_posts().
|
||||
*/
|
||||
if ( have_posts() )
|
||||
the_post();
|
||||
?>
|
||||
|
||||
<header class="page-header">
|
||||
<h1 class="page-title">
|
||||
<?php if ( is_day() ) : ?>
|
||||
|
|
@ -42,14 +31,6 @@ get_header(); ?>
|
|||
</h1>
|
||||
</header>
|
||||
|
||||
<?php
|
||||
/* Since we called the_post() above, we need to
|
||||
* rewind the loop back to the beginning that way
|
||||
* we can run the loop properly, in full.
|
||||
*/
|
||||
rewind_posts();
|
||||
?>
|
||||
|
||||
<?php twentyeleven_content_nav( 'nav-above' ); ?>
|
||||
|
||||
<?php /* Start the Loop */ ?>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ get_header(); ?>
|
|||
|
||||
<?php
|
||||
/* Queue the first post, that way we know
|
||||
* what date we're dealing with (if that is the case).
|
||||
* what author we're dealing with (if that is the case).
|
||||
*
|
||||
* We reset this later so we can run the loop
|
||||
* properly with a call to rewind_posts().
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<h2 class="entry-format"><?php _e( 'Aside', 'twentyeleven' ); ?></h2>
|
||||
</hgroup>
|
||||
|
||||
<?php if ( 'post' == $post->post_type ) : ?>
|
||||
<?php if ( 'post' == get_post_type() ) : ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( comments_open() ) : ?>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
</div><!-- .entry-content -->
|
||||
|
||||
<footer class="entry-meta">
|
||||
<?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
|
||||
<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
|
||||
<div class="entry-meta">
|
||||
<?php
|
||||
printf( __( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s" pubdate>%3$s</time></a></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s" rel="author">%6$s</a></span></span>', 'twentyeleven' ),
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<h2 class="entry-format"><?php _e( 'Link', 'twentyeleven' ); ?></h2>
|
||||
</hgroup>
|
||||
|
||||
<?php if ( 'post' == $post->post_type ) : ?>
|
||||
<?php if ( 'post' == get_post_type() ) : ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( comments_open() ) : ?>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<h2 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h2>
|
||||
</hgroup>
|
||||
|
||||
<?php if ( 'post' == $post->post_type ) : ?>
|
||||
<?php if ( 'post' == get_post_type() ) : ?>
|
||||
<div class="entry-meta">
|
||||
<?php twentyeleven_posted_on(); ?>
|
||||
</div><!-- .entry-meta -->
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
<footer class="entry-meta">
|
||||
<?php $show_sep = false; ?>
|
||||
<?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
|
||||
<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
|
||||
<?php
|
||||
/* translators: used between list items, there is a space after the comma */
|
||||
$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
|
||||
|
|
|
|||
|
|
@ -12,9 +12,11 @@
|
|||
<header class="entry-header">
|
||||
<h1 class="entry-title"><?php the_title(); ?></h1>
|
||||
|
||||
<?php if ( 'post' == get_post_type() ) : /* Bit of a disconnect here, Some files include this test, not all do. */ ?>
|
||||
<div class="entry-meta">
|
||||
<?php twentyeleven_posted_on(); ?>
|
||||
</div><!-- .entry-meta -->
|
||||
<?php endif; ?>
|
||||
</header><!-- .entry-header -->
|
||||
|
||||
<div class="entry-content">
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@
|
|||
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
|
||||
<h2 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h2>
|
||||
</hgroup>
|
||||
|
||||
<?php if ( 'post' == $post->post_type ) : ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( comments_open() ) : ?>
|
||||
<div class="comments-link">
|
||||
|
|
@ -32,7 +29,7 @@
|
|||
</div><!-- .entry-summary -->
|
||||
<?php else : ?>
|
||||
<div class="entry-content">
|
||||
<div class="avatar"><?php echo get_avatar( $post->post_author, apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?></div>
|
||||
<div class="avatar"><?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?></div>
|
||||
|
||||
<?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyeleven' ) ); ?>
|
||||
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
<header class="entry-header">
|
||||
<?php if ( is_sticky() ) : ?>
|
||||
<hgroup>
|
||||
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
|
||||
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) /* Y NO ARRAY! */ ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
|
||||
<h2 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h2>
|
||||
</hgroup>
|
||||
<?php else : ?>
|
||||
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( 'post' == $post->post_type ) : ?>
|
||||
<?php if ( 'post' == get_post_type() ) : ?>
|
||||
<div class="entry-meta">
|
||||
<?php twentyeleven_posted_on(); ?>
|
||||
</div><!-- .entry-meta -->
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
<?php endif; ?>
|
||||
|
||||
<footer class="entry-meta">
|
||||
<?php $show_sep = false; ?>
|
||||
<?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
|
||||
<?php $show_sep = false; // perhaps a implode(' | ', $utilities) could be used instead of this $show_sep business? ?>
|
||||
<?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?>
|
||||
<?php
|
||||
/* translators: used between list items, there is a space after the comma */
|
||||
$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
$show_sep = true; ?>
|
||||
</span>
|
||||
<?php endif; // End if $tags_list ?>
|
||||
<?php endif; // End if 'post' == $post->post_type ?>
|
||||
<?php endif; // End if 'post' == get_post_type() ?>
|
||||
|
||||
<?php if ( comments_open() ) : ?>
|
||||
<?php if ( $show_sep ) : ?>
|
||||
|
|
|
|||
|
|
@ -14,18 +14,13 @@
|
|||
*
|
||||
* @since Twenty Eleven 1.0
|
||||
*
|
||||
* @param string $hook_suffix The action passes the current page to the function. We don't
|
||||
* do anything if we're not on our theme options page.
|
||||
*/
|
||||
function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
|
||||
if ( $hook_suffix != 'appearance_page_theme_options' )
|
||||
return;
|
||||
|
||||
wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
|
||||
wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
|
||||
wp_enqueue_style( 'farbtastic' );
|
||||
}
|
||||
add_action( 'admin_enqueue_scripts', 'twentyeleven_admin_enqueue_scripts' );
|
||||
add_action( 'admin_print_styles-appearance_page_theme_options', 'twentyeleven_admin_enqueue_scripts' );
|
||||
|
||||
/**
|
||||
* Register the form setting for our twentyeleven_options array.
|
||||
|
|
@ -309,7 +304,7 @@ function twentyeleven_theme_options_validate( $input ) {
|
|||
|
||||
// Link color must be 3 or 6 hexadecimal characters
|
||||
if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
|
||||
$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
|
||||
$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
|
||||
|
||||
// Theme layout must be in our array of theme layout options
|
||||
if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ get_header(); ?>
|
|||
<div id="primary">
|
||||
<div id="content" role="main">
|
||||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
<?php while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<nav id="nav-single">
|
||||
<h1 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h1>
|
||||
|
|
|
|||
Loading…
Reference in New Issue