From c98f54be1e6191ec3ed624cce1d45b035f9c5e20 Mon Sep 17 00:00:00 2001
From: "aaron@xavisys.com"
 <aaron@xavisys.com@cdb4dc37-54d1-4dfa-a9af-8c49da855a76>
Date: Mon, 13 Jun 2011 01:12:19 +0000
Subject: [PATCH] Format special pages correctly

---
 404.php             |  6 ++++--
 archive.php         |  7 ++++---
 attachment.php      |  6 ++++--
 author.php          |  7 ++++---
 category.php        |  7 ++++---
 loop-attachment.php |  2 +-
 loop-single.php     |  2 +-
 onecolumn-page.php  |  5 ++---
 page.php            |  7 ++++---
 search.php          |  7 ++++---
 single.php          |  8 ++++----
 tag.php             | 11 +++++------
 12 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/404.php b/404.php
index 4523880..1956235 100644
--- a/404.php
+++ b/404.php
@@ -16,7 +16,7 @@
 
 get_header(); ?>
 
-	<div id="container">
+	<div id="container" class="span-15">
 		<div id="content" role="main">
 
 			<div id="post-0" class="post error404 not-found">
@@ -34,4 +34,6 @@
 		document.getElementById('s') && document.getElementById('s').focus();
 	</script>
 
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/archive.php b/archive.php
index a2498ac..ae25d0f 100644
--- a/archive.php
+++ b/archive.php
@@ -22,7 +22,7 @@
 get_header();
 ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content" role="main">
 
 <?php
@@ -65,5 +65,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/attachment.php b/attachment.php
index e048f61..a059b5d 100644
--- a/attachment.php
+++ b/attachment.php
@@ -16,7 +16,7 @@
 
 get_header(); ?>
 
-		<div id="container" class="single-attachment">
+		<div id="container" class="single-attachment span-15">
 			<div id="content" role="main">
 
 			<?php
@@ -30,4 +30,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/author.php b/author.php
index 829c25e..577a9bc 100644
--- a/author.php
+++ b/author.php
@@ -16,7 +16,7 @@
 
 get_header(); ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content" role="main">
 
 <?php
@@ -63,5 +63,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/category.php b/category.php
index a55a717..3cd29d5 100644
--- a/category.php
+++ b/category.php
@@ -16,7 +16,7 @@
 
 get_header(); ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content" role="main">
 
 				<h1 class="page-title"><?php
@@ -37,5 +37,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/loop-attachment.php b/loop-attachment.php
index ca0a5d4..1ca64ea 100644
--- a/loop-attachment.php
+++ b/loop-attachment.php
@@ -39,7 +39,7 @@
 						<?php
 							printf( __( '<span class="%1$s">By</span> %2$s', 'essence' ),
 								'meta-prep meta-prep-author',
-								sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+								sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
 									get_author_posts_url( get_the_author_meta( 'ID' ) ),
 									sprintf( esc_attr__( 'View all posts by %s', 'essence' ), get_the_author() ),
 									get_the_author()
diff --git a/loop-single.php b/loop-single.php
index 8ae6789..a8ec93e 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -51,7 +51,7 @@
 							<h2><?php printf( esc_attr__( 'About %s', 'essence' ), get_the_author() ); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
 							<div id="author-link">
-								<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
+								<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" rel="author">
 									<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'essence' ), get_the_author() ); ?>
 								</a>
 							</div><!-- #author-link	-->
diff --git a/onecolumn-page.php b/onecolumn-page.php
index 7d71a3e..3ae1feb 100644
--- a/onecolumn-page.php
+++ b/onecolumn-page.php
@@ -19,10 +19,9 @@
 	}
 }
 
+get_header();
 ?>
 
-<?php get_header(); ?>
-
 		<div id="container" class="onecolumn">
 			<div id="content">
 
@@ -37,4 +36,4 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page.php b/page.php
index 41d4e64..7619015 100644
--- a/page.php
+++ b/page.php
@@ -23,7 +23,7 @@
 
 <?php get_header(); ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content">
 
 			<?php
@@ -37,5 +37,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/search.php b/search.php
index 27a571c..e1c106d 100644
--- a/search.php
+++ b/search.php
@@ -18,7 +18,7 @@
 
 ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content" role="main">
 
 <?php if ( have_posts() ) : ?>
@@ -42,5 +42,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/single.php b/single.php
index 7c369ca..325ec9f 100644
--- a/single.php
+++ b/single.php
@@ -14,10 +14,9 @@
 	}
 }
 
+get_header();
 ?>
 
-<?php get_header(); ?>
-
 		<div id="content-container" class="span-15">
 			<div id="content">
 
@@ -32,5 +31,6 @@
 			</div><!-- #content -->
 		</div><!-- #ccontent-ontainer -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();
diff --git a/tag.php b/tag.php
index 938c94c..cc57ff8 100644
--- a/tag.php
+++ b/tag.php
@@ -14,11 +14,9 @@
 	}
 }
 
-?>
-
-<?php get_header(); ?>
+get_header(); ?>
 
-		<div id="container">
+		<div id="container" class="span-15">
 			<div id="content">
 
 				<h1 class="page-title"><?php
@@ -35,5 +33,6 @@
 			</div><!-- #content -->
 		</div><!-- #container -->
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<?php
+get_sidebar();
+get_footer();