From 5905cc38892027c7ee761dd90f9b85c90735a47a Mon Sep 17 00:00:00 2001
From: kobenland <obenland@gmx.de>
Date: Fri, 1 Mar 2013 17:28:18 -0800
Subject: [PATCH 1/4] _s: Move away from using <article> for content that is
 not syndicated.

---
 404.php          | 14 +++++++-------
 content-page.php | 14 +++++++-------
 image.php        | 32 ++++++++++++++++----------------
 no-results.php   | 14 +++++++-------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/404.php b/404.php
index ab124bd1..8b87ad70 100644
--- a/404.php
+++ b/404.php
@@ -11,12 +11,12 @@ get_header(); ?>
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
-			<article id="post-0" class="post error404 not-found">
-				<header class="entry-header">
-					<h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
-				</header><!-- .entry-header -->
+			<section class="error-404 not-found">
+				<header class="page-header">
+					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
+				</header><!-- .page-header -->
 
-				<div class="entry-content">
+				<div class="page-content">
 					<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', '_s' ); ?></p>
 
 					<?php get_search_form(); ?>
@@ -38,8 +38,8 @@ get_header(); ?>
 
 					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
 
-				</div><!-- .entry-content -->
-			</article><!-- #post-0 .post .error404 .not-found -->
+				</div><!-- .page-content -->
+			</section><!-- .error404 .not-found -->
 
 		</div><!-- #content .site-content -->
 	</div><!-- #primary .content-area -->
diff --git a/content-page.php b/content-page.php
index 0297910b..c9ea2ce3 100644
--- a/content-page.php
+++ b/content-page.php
@@ -7,14 +7,14 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<header class="entry-header">
-		<h1 class="entry-title"><?php the_title(); ?></h1>
-	</header><!-- .entry-header -->
+<section id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="page-header">
+		<h1 class="page-title"><?php the_title(); ?></h1>
+	</header><!-- .page-header -->
 
-	<div class="entry-content">
+	<div class="page-content">
 		<?php the_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
-	</div><!-- .entry-content -->
+	</div><!-- .page-content -->
 	<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' ); ?>
-</article><!-- #post-<?php the_ID(); ?> -->
+</section><!-- #post-<?php the_ID(); ?> -->
diff --git a/image.php b/image.php
index 4b6e8f45..a1900691 100644
--- a/image.php
+++ b/image.php
@@ -14,14 +14,14 @@ get_header();
 
 			<?php while ( have_posts() ) : the_post(); ?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-					<header class="entry-header">
-						<h1 class="entry-title"><?php the_title(); ?></h1>
+				<section id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+					<header class="page-header">
+						<h1 class="page-title"><?php the_title(); ?></h1>
 
-						<div class="entry-meta">
+						<div class="page-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
-								printf( __( 'Published <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>', '_s' ),
+								printf( __( 'Published <span class="page-date"><time class="page-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>', '_s' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
 									wp_get_attachment_url(),
@@ -33,17 +33,17 @@ get_header();
 								);
 							?>
 							<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
-						</div><!-- .entry-meta -->
+						</div><!-- .page-meta -->
 
 						<nav id="image-navigation" class="navigation-image">
 							<span class="previous"><?php previous_image_link( false, __( '&larr; Previous', '_s' ) ); ?></span>
 							<span class="next"><?php next_image_link( false, __( 'Next &rarr;', '_s' ) ); ?></span>
 						</nav><!-- #image-navigation -->
-					</header><!-- .entry-header -->
+					</header><!-- .page-header -->
 
-					<div class="entry-content">
+					<div class="page-content">
 
-						<div class="entry-attachment">
+						<div class="page-attachment">
 							<div class="attachment">
 								<?php
 									/**
@@ -84,18 +84,18 @@ get_header();
 							</div><!-- .attachment -->
 
 							<?php if ( ! empty( $post->post_excerpt ) ) : ?>
-							<div class="entry-caption">
+							<div class="page-caption">
 								<?php the_excerpt(); ?>
-							</div><!-- .entry-caption -->
+							</div><!-- .page-caption -->
 							<?php endif; ?>
-						</div><!-- .entry-attachment -->
+						</div><!-- .page-attachment -->
 
 						<?php the_content(); ?>
 						<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
 
-					</div><!-- .entry-content -->
+					</div><!-- .page-content -->
 
-					<footer class="entry-meta">
+					<footer class="page-meta">
 						<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
 							<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
 						<?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
@@ -106,8 +106,8 @@ get_header();
 							<?php _e( 'Both comments and trackbacks are currently closed.', '_s' ); ?>
 						<?php endif; ?>
 						<?php edit_post_link( __( 'Edit', '_s' ), ' <span class="edit-link">', '</span>' ); ?>
-					</footer><!-- .entry-meta -->
-				</article><!-- #post-<?php the_ID(); ?> -->
+					</footer><!-- .page-meta -->
+				</section><!-- #post-<?php the_ID(); ?> -->
 
 				<?php
 					// If comments are open or we have at least one comment, load up the comment template
diff --git a/no-results.php b/no-results.php
index 6b14c77b..16e850ed 100644
--- a/no-results.php
+++ b/no-results.php
@@ -9,12 +9,12 @@
  */
 ?>
 
-<article id="post-0" class="post no-results not-found">
-	<header class="entry-header">
-		<h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
-	</header><!-- .entry-header -->
+<section class="no-results not-found">
+	<header class="page-header">
+		<h1 class="page-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
+	</header><!-- .page-header -->
 
-	<div class="entry-content">
+	<div class="page-content">
 		<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
 			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', '_s' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
@@ -30,5 +30,5 @@
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>
-	</div><!-- .entry-content -->
-</article><!-- #post-0 .post .no-results .not-found -->
+	</div><!-- .page-content -->
+</section><!-- .no-results .not-found -->

From 6f45aadc8953910487865cee84ccfb1f7987e21d Mon Sep 17 00:00:00 2001
From: kobenland <obenland@gmx.de>
Date: Fri, 1 Mar 2013 17:31:59 -0800
Subject: [PATCH 2/4] _s: Let's not change .entry-date.

---
 image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image.php b/image.php
index a1900691..d2bbee65 100644
--- a/image.php
+++ b/image.php
@@ -21,7 +21,7 @@ get_header();
 						<div class="page-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
-								printf( __( 'Published <span class="page-date"><time class="page-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>', '_s' ),
+								printf( __( 'Published <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>', '_s' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
 									wp_get_attachment_url(),

From f897bc693835d385b88b38583acd135c0ef811dd Mon Sep 17 00:00:00 2001
From: kobenland <obenland@gmx.de>
Date: Wed, 13 Mar 2013 13:51:12 -0700
Subject: [PATCH 3/4] _s: Let's keep the `.entry-` namespace for page post
 types.

---
 content-page.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/content-page.php b/content-page.php
index c9ea2ce3..2199eae9 100644
--- a/content-page.php
+++ b/content-page.php
@@ -8,13 +8,13 @@
 ?>
 
 <section id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-	<header class="page-header">
-		<h1 class="page-title"><?php the_title(); ?></h1>
-	</header><!-- .page-header -->
+	<header class="entry-header">
+		<h1 class="entry-title"><?php the_title(); ?></h1>
+	</header><!-- .entry-header -->
 
-	<div class="page-content">
+	<div class="entry-content">
 		<?php the_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
-	</div><!-- .page-content -->
+	</div><!-- .entry-content -->
 	<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' ); ?>
 </section><!-- #post-<?php the_ID(); ?> -->

From 629acfcb96d5274fd3f563d0976f0b51dd037785 Mon Sep 17 00:00:00 2001
From: kobenland <obenland@gmx.de>
Date: Wed, 13 Mar 2013 13:54:07 -0700
Subject: [PATCH 4/4] _s: Let's keep the `.entry-` namespace for attachment
 post types.

---
 image.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/image.php b/image.php
index d2bbee65..fdb22d7e 100644
--- a/image.php
+++ b/image.php
@@ -15,10 +15,10 @@ get_header();
 			<?php while ( have_posts() ) : the_post(); ?>
 
 				<section id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-					<header class="page-header">
-						<h1 class="page-title"><?php the_title(); ?></h1>
+					<header class="entry-header">
+						<h1 class="entry-title"><?php the_title(); ?></h1>
 
-						<div class="page-meta">
+						<div class="entry-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
 								printf( __( 'Published <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>', '_s' ),
@@ -33,17 +33,17 @@ get_header();
 								);
 							?>
 							<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
-						</div><!-- .page-meta -->
+						</div><!-- .entry-meta -->
 
 						<nav id="image-navigation" class="navigation-image">
 							<span class="previous"><?php previous_image_link( false, __( '&larr; Previous', '_s' ) ); ?></span>
 							<span class="next"><?php next_image_link( false, __( 'Next &rarr;', '_s' ) ); ?></span>
 						</nav><!-- #image-navigation -->
-					</header><!-- .page-header -->
+					</header><!-- .entry-header -->
 
-					<div class="page-content">
+					<div class="entry-content">
 
-						<div class="page-attachment">
+						<div class="entry-attachment">
 							<div class="attachment">
 								<?php
 									/**
@@ -84,18 +84,18 @@ get_header();
 							</div><!-- .attachment -->
 
 							<?php if ( ! empty( $post->post_excerpt ) ) : ?>
-							<div class="page-caption">
+							<div class="entry-caption">
 								<?php the_excerpt(); ?>
-							</div><!-- .page-caption -->
+							</div><!-- .entry-caption -->
 							<?php endif; ?>
-						</div><!-- .page-attachment -->
+						</div><!-- .entry-attachment -->
 
 						<?php the_content(); ?>
 						<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
 
-					</div><!-- .page-content -->
+					</div><!-- .entry-content -->
 
-					<footer class="page-meta">
+					<footer class="entry-meta">
 						<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
 							<?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
 						<?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
@@ -106,7 +106,7 @@ get_header();
 							<?php _e( 'Both comments and trackbacks are currently closed.', '_s' ); ?>
 						<?php endif; ?>
 						<?php edit_post_link( __( 'Edit', '_s' ), ' <span class="edit-link">', '</span>' ); ?>
-					</footer><!-- .page-meta -->
+					</footer><!-- .entry-meta -->
 				</section><!-- #post-<?php the_ID(); ?> -->
 
 				<?php