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

Twenty Twelve: review and clean up end-of-element HTML comments. Props obenland for starter patch. Closes #21675. 

git-svn-id: http://core.svn.wordpress.org/trunk@21618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2012-08-25 17:16:56 +00:00
parent b5bfdfad7b
commit 8907b96a0d
18 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
404.php
View File

@ -24,6 +24,6 @@ get_header(); ?>
</article><!-- #post-0 --> </article><!-- #post-0 -->
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_footer(); ?> <?php get_footer(); ?>

4
archive.php
View File

@ -49,7 +49,7 @@ get_header(); ?>
echo '<div class="archive-meta">' . $category_description . '</div>'; echo '<div class="archive-meta">' . $category_description . '</div>';
} }
?> ?>
</header><!-- /. archive-header --> </header><!-- .archive-header -->
<?php <?php
/* Start the Loop */ /* Start the Loop */
@ -71,7 +71,7 @@ get_header(); ?>
<?php endif; ?> <?php endif; ?>
</div><!-- #content --> </div><!-- #content -->
</section><!-- #primary .site-content --> </section><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

4
author.php
View File

@ -26,7 +26,7 @@ get_header(); ?>
<header class="archive-header"> <header class="archive-header">
<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1> <h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</header> </header><!-- .archive-header -->
<?php <?php
/* Since we called the_post() above, we need to /* Since we called the_post() above, we need to
@ -64,7 +64,7 @@ get_header(); ?>
<?php endif; ?> <?php endif; ?>
</div><!-- #content --> </div><!-- #content -->
</section><!-- #primary .site-content --> </section><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

2
content-aside.php
View File

@ -14,7 +14,7 @@
<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' ) ); ?>
</div><!-- .entry-content --> </div><!-- .entry-content -->
</div> </div><!-- .aside -->
<footer class="entry-meta"> <footer class="entry-meta">
<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?> <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>

2
content-none.php
View File

@ -11,7 +11,7 @@
<article id="post-0" class="post no-results not-found"> <article id="post-0" class="post no-results not-found">
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1> <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
</header><!-- .entry-header --> </header>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> <p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>

2
content-page.php
View File

@ -11,7 +11,7 @@
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php the_title(); ?></h1> <h1 class="entry-title"><?php the_title(); ?></h1>
</header><!-- .entry-header --> </header>
<div class="entry-content"> <div class="entry-content">
<?php the_content(); ?> <?php the_content(); ?>

5
footer.php
View File

@ -2,7 +2,8 @@
/** /**
* The template for displaying the footer. * The template for displaying the footer.
* *
* Contains the closing of the id=main div and all content after * Contains footer content and the closing of the
* #main and #page div elements.
* *
* @package WordPress * @package WordPress
* @subpackage Twenty_Twelve * @subpackage Twenty_Twelve
@ -16,7 +17,7 @@
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a> <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
</div><!-- .site-info --> </div><!-- .site-info -->
</footer><!-- #colophon --> </footer><!-- #colophon -->
</div><!-- #page .site --> </div><!-- #page -->
<?php wp_footer(); ?> <?php wp_footer(); ?>
</body> </body>

2
full-width-page.php
View File

@ -18,6 +18,6 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_footer(); ?> <?php get_footer(); ?>

6
functions.php
View File

@ -289,16 +289,16 @@ function twentytwelve_comment( $comment, $args, $depth ) {
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> </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 comment-content"> <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> </section><!-- .comment-content -->
<div class="reply"> <div class="reply">
<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentytwelve' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> <?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentytwelve' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>

2
header.php
View File

@ -39,7 +39,7 @@
<h3 class="menu-toggle"><?php _e( 'Show menu', 'twentytwelve' ); ?></h3> <h3 class="menu-toggle"><?php _e( 'Show menu', 'twentytwelve' ); ?></h3>
<div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div> <div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div>
<?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> </nav><!-- #site-navigation -->
<?php $header_image = get_header_image(); <?php $header_image = get_header_image();
if ( ! empty( $header_image ) ) : ?> if ( ! empty( $header_image ) ) : ?>

8
homepage.php
View File

@ -13,18 +13,18 @@ get_header(); ?>
<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(); ?>
</div> </div><!-- .entry-page-image -->
<?php } ?> <?php endif; ?>
<?php get_template_part( 'content', 'page' ); ?> <?php get_template_part( 'content', 'page' ); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_sidebar( 'home' ); ?> <?php get_sidebar( 'home' ); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

2
image.php
View File

@ -97,6 +97,6 @@ if ( count( $attachments ) > 1 ) {
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_footer(); ?> <?php get_footer(); ?>

6
index.php
View File

@ -35,7 +35,7 @@ get_header(); ?>
?> ?>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1> <h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1>
</header><!-- .entry-header --> </header>
<div class="entry-content"> <div class="entry-content">
<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>
@ -46,7 +46,7 @@ get_header(); ?>
?> ?>
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php _e( 'Nothing found', 'twentytwelve' ); ?></h1> <h1 class="entry-title"><?php _e( 'Nothing found', 'twentytwelve' ); ?></h1>
</header><!-- .entry-header --> </header>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> <p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>
@ -59,7 +59,7 @@ get_header(); ?>
<?php endif; // end have_posts() check ?> <?php endif; // end have_posts() check ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

2
page.php
View File

@ -23,7 +23,7 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

4
search.php
View File

@ -32,7 +32,7 @@ get_header(); ?>
<article id="post-0" class="post no-results not-found"> <article id="post-0" class="post no-results not-found">
<header class="entry-header"> <header class="entry-header">
<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1> <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
</header><!-- .entry-header --> </header>
<div class="entry-content"> <div class="entry-content">
<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentytwelve' ); ?></p> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentytwelve' ); ?></p>
@ -43,7 +43,7 @@ get_header(); ?>
<?php endif; ?> <?php endif; ?>
</div><!-- #content --> </div><!-- #content -->
</section><!-- #primary .site-content --> </section><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>

6
sidebar-home.php
View File

@ -24,12 +24,12 @@ if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
<?php if ( is_active_sidebar( 2 ) ) : ?> <?php if ( is_active_sidebar( 2 ) ) : ?>
<div class="first home-widgets"> <div class="first home-widgets">
<?php dynamic_sidebar( 'sidebar-2' ); ?> <?php dynamic_sidebar( 'sidebar-2' ); ?>
</div><!-- .first .home-widgets --> </div><!-- .first -->
<?php endif; ?> <?php endif; ?>
<?php if ( is_active_sidebar( 3 ) ) : ?> <?php if ( is_active_sidebar( 3 ) ) : ?>
<div class="second home-widgets"> <div class="second home-widgets">
<?php dynamic_sidebar( 'sidebar-3' ); ?> <?php dynamic_sidebar( 'sidebar-3' ); ?>
</div><!-- .second .home-widgets --> </div><!-- .second -->
<?php endif; ?> <?php endif; ?>
</div><!-- #secondary .widget-area --> </div><!-- #secondary -->

2
sidebar.php
View File

@ -13,5 +13,5 @@
<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?> <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
<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 .widget-area --> </div><!-- #secondary -->
<?php endif; ?> <?php endif; ?>

2
single.php
View File

@ -31,7 +31,7 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?> <?php endwhile; // end of the loop. ?>
</div><!-- #content --> </div><!-- #content -->
</div><!-- #primary .site-content --> </div><!-- #primary -->
<?php get_sidebar(); ?> <?php get_sidebar(); ?>
<?php get_footer(); ?> <?php get_footer(); ?>