From fcec12d8d8c7e250460a8c216ccaef9fa7b37365 Mon Sep 17 00:00:00 2001
From: kobenland <obenland@gmx.de>
Date: Wed, 18 Apr 2012 22:54:02 +0200
Subject: [PATCH] Correct package declaration, use the_widget() instead of
 custom implementation

---
 404.php                                 |  3 +--
 archive.php                             |  3 +--
 author.php                              |  3 +--
 category.php                            | 11 +++-----
 comments.php                            |  3 +--
 footer.php                              |  3 +--
 functions.php                           |  3 +--
 header.php                              |  3 +--
 image.php                               |  3 +--
 inc/custom-header.php                   |  3 +--
 inc/the-bootstrap-image-meta-widget.php |  3 ++-
 index.php                               |  3 +--
 page.php                                |  3 +--
 partials/content-aside.php              |  3 +--
 partials/content-chat.php               |  3 +--
 partials/content-gallery.php            |  3 +--
 partials/content-image.php              |  3 +--
 partials/content-link.php               |  3 +--
 partials/content-no-results.php         |  3 +--
 partials/content-page.php               |  3 +--
 partials/content-quote.php              |  3 +--
 partials/content-single.php             |  7 ++---
 partials/content-status.php             |  3 +--
 partials/content-video.php              |  3 +--
 partials/content.php                    |  3 +--
 search.php                              |  3 +--
 searchform.php                          |  3 +--
 sidebar-image.php                       |  5 ++--
 sidebar.php                             | 36 +++++++++++--------------
 single.php                              |  3 +--
 tag.php                                 | 11 +++-----
 31 files changed, 54 insertions(+), 94 deletions(-)

diff --git a/404.php b/404.php
index 917e7a0..1acea5a 100644
--- a/404.php
+++ b/404.php
@@ -4,8 +4,7 @@
  * The template for displaying 404 pages (Not Found).
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/archive.php b/archive.php
index 611f673..b63fdfc 100644
--- a/archive.php
+++ b/archive.php
@@ -9,8 +9,7 @@
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/author.php b/author.php
index 7efbaed..3ab1d5d 100644
--- a/author.php
+++ b/author.php
@@ -4,8 +4,7 @@
  * The template for displaying Author Archive pages.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/category.php b/category.php
index d978b7b..40f80ea 100644
--- a/category.php
+++ b/category.php
@@ -4,8 +4,7 @@
  * The template for displaying Category Archive pages.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
@@ -21,11 +20,9 @@
 				printf( __( 'Category Archives: %s', 'the-bootstrap' ), '<span>' . single_cat_title( '', false ) . '</span>' );
 			?></h1>
 
-			<?php
-				if ( $category_description = category_description() ) {
-					echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-				}
-			?>
+			<?php if ( $category_description = category_description() ) {
+				echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+			} ?>
 		</header>
 
 		<?php
diff --git a/comments.php b/comments.php
index aaf988e..04cb35c 100644
--- a/comments.php
+++ b/comments.php
@@ -9,8 +9,7 @@
  * located in the functions.php file.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
diff --git a/footer.php b/footer.php
index 6b318e8..0dd5ca9 100644
--- a/footer.php
+++ b/footer.php
@@ -2,8 +2,7 @@
 /** footer.php
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0	- 05.02.2012
  */
 ?>
diff --git a/functions.php b/functions.php
index c85d6b9..1328ede 100644
--- a/functions.php
+++ b/functions.php
@@ -2,8 +2,7 @@
 /** functions.php
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
diff --git a/header.php b/header.php
index df030e2..9861863 100644
--- a/header.php
+++ b/header.php
@@ -6,8 +6,7 @@
  * Displays all of the <head> section and everything up till <div id="main">
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0 - 05.02.2012
  */
 
diff --git a/image.php b/image.php
index a8e7a00..2160b84 100644
--- a/image.php
+++ b/image.php
@@ -4,8 +4,7 @@
  * The template for displaying image attachments.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
diff --git a/inc/custom-header.php b/inc/custom-header.php
index 44c0974..69a83e1 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -5,8 +5,7 @@
  * http://codex.wordpress.org/Custom_Headers
  * 
  * @author		Automattic, Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.2.0 - 05.04.2012
  */
 
diff --git a/inc/the-bootstrap-image-meta-widget.php b/inc/the-bootstrap-image-meta-widget.php
index 5262ba2..2a045be 100644
--- a/inc/the-bootstrap-image-meta-widget.php
+++ b/inc/the-bootstrap-image-meta-widget.php
@@ -2,7 +2,8 @@
 /** image-meta-widget.php
  *
  * @author	Konstantin Obenland
- * @since	1.1.0
+ * @package	The Bootstrap
+ * @since	1.1.0 - 08.03.2012
  */
 
 
diff --git a/index.php b/index.php
index 910c898..541e57e 100644
--- a/index.php
+++ b/index.php
@@ -10,8 +10,7 @@
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
diff --git a/page.php b/page.php
index d8e3f89..6b329bf 100644
--- a/page.php
+++ b/page.php
@@ -9,8 +9,7 @@
  * different template.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/partials/content-aside.php b/partials/content-aside.php
index 71d541c..d9dbce0 100644
--- a/partials/content-aside.php
+++ b/partials/content-aside.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-chat.php b/partials/content-chat.php
index c0e3edf..6c92623 100644
--- a/partials/content-chat.php
+++ b/partials/content-chat.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/partials/content-gallery.php b/partials/content-gallery.php
index ac42d40..260dd89 100644
--- a/partials/content-gallery.php
+++ b/partials/content-gallery.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-image.php b/partials/content-image.php
index 0a9606b..5ffd349 100644
--- a/partials/content-image.php
+++ b/partials/content-image.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-link.php b/partials/content-link.php
index f5948e4..89e9489 100644
--- a/partials/content-link.php
+++ b/partials/content-link.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/partials/content-no-results.php b/partials/content-no-results.php
index 636714f..6a237d8 100644
--- a/partials/content-no-results.php
+++ b/partials/content-no-results.php
@@ -4,8 +4,7 @@
  * The template for displaying a 'Noting found' message.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-page.php b/partials/content-page.php
index f76e3b3..7ffe739 100644
--- a/partials/content-page.php
+++ b/partials/content-page.php
@@ -4,8 +4,7 @@
  * The template for displaying page content in the page.php template
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-quote.php b/partials/content-quote.php
index 20049ec..555eecd 100644
--- a/partials/content-quote.php
+++ b/partials/content-quote.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/partials/content-single.php b/partials/content-single.php
index 59a83ab..1737de0 100644
--- a/partials/content-single.php
+++ b/partials/content-single.php
@@ -4,17 +4,14 @@
  * The template for displaying content in the single.php template
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="page-header">
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-		<div class="entry-meta">
-			<?php the_bootstrap_posted_on(); ?>
-		</div><!-- .entry-meta -->
+		<div class="entry-meta"><?php the_bootstrap_posted_on(); ?></div><!-- .entry-meta -->
 	</header><!-- .entry-header -->
 
 	<div class="entry-content clearfix">
diff --git a/partials/content-status.php b/partials/content-status.php
index 03fd158..6ce4416 100644
--- a/partials/content-status.php
+++ b/partials/content-status.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/partials/content-video.php b/partials/content-video.php
index e6f5bd4..c2d2bf7 100644
--- a/partials/content-video.php
+++ b/partials/content-video.php
@@ -6,8 +6,7 @@
  * Learn more: http://codex.wordpress.org/Post_Formats
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.1 - 07.03.2012
  */
 
diff --git a/partials/content.php b/partials/content.php
index d934584..1eaffa3 100644
--- a/partials/content.php
+++ b/partials/content.php
@@ -4,8 +4,7 @@
  * The default template for displaying content
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 ?>
diff --git a/search.php b/search.php
index 3d24a6c..2427b58 100644
--- a/search.php
+++ b/search.php
@@ -4,8 +4,7 @@
  * The template for displaying Search Results pages.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 
diff --git a/searchform.php b/searchform.php
index 25f54b1..7bf0da4 100644
--- a/searchform.php
+++ b/searchform.php
@@ -4,8 +4,7 @@
  * The template for displaying search forms
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 07.02.2012
  */
 ?>
diff --git a/sidebar-image.php b/sidebar-image.php
index 3e03543..a157a27 100644
--- a/sidebar-image.php
+++ b/sidebar-image.php
@@ -2,8 +2,7 @@
 /** sidebar-image.php
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0	- 05.02.2012
  */
 ?>
@@ -12,7 +11,7 @@
 	if ( ! dynamic_sidebar( 'image' ) ) {
 		the_widget( 'The_Bootstrap_Image_Meta_Widget', array(), array(
 			'before_widget'	=>	'<aside id="the-bootstrap-image-meta" class="widget well the-bootstrap-image-meta">',
-			'after_widget'	=>	"</aside>",
+			'after_widget'	=>	'</aside>',
 			'before_title'	=>	'<h3 class="widget-title">',
 			'after_title'	=>	'</h3>',
 		) );
diff --git a/sidebar.php b/sidebar.php
index deeb756..961c42e 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -2,31 +2,25 @@
 /** sidebar.php
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0	- 05.02.2012
  */
 ?>
 <section id="secondary" class="widget-area span4" role="complementary">
-	<?php if ( ! dynamic_sidebar( 'main' ) ) : ?>
-
-		<aside id="archives" class="widget well">
-			<h2 class="widget-title"><?php _e( 'Archives', 'the-bootstrap' ); ?></h2>
-			<ul>
-				<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
-			</ul>
-		</aside>
-
-		<aside id="meta" class="widget well">
-			<h2 class="widget-title"><?php _e( 'Meta', 'the-bootstrap' ); ?></h2>
-			<ul>
-				<?php wp_register(); ?>
-				<li><?php wp_loginout(); ?></li>
-				<?php wp_meta(); ?>
-			</ul>
-		</aside>
-
-	<?php endif; // end sidebar widget area ?>
+	<?php if ( ! dynamic_sidebar( 'main' ) ) {
+		the_widget( 'WP_Widget_Archives', array(), array(
+			'before_widget'	=>	'<aside id="archives" class="widget well widget_archives">',
+			'after_widget'	=>	'</aside>',
+			'before_title'	=>	'<h3 class="widget-title">',
+			'after_title'	=>	'</h3>',
+		) );
+		the_widget( 'WP_Widget_Meta', array(), array(
+			'before_widget'	=>	'<aside id="meta" class="widget well widget_meta">',
+			'after_widget'	=>	'</aside>',
+			'before_title'	=>	'<h3 class="widget-title">',
+			'after_title'	=>	'</h3>',
+		) );
+	} // end sidebar widget area ?>
 </section><!-- #secondary .widget-area -->
 <?php
 
diff --git a/single.php b/single.php
index 6bc5555..4589a4f 100644
--- a/single.php
+++ b/single.php
@@ -4,8 +4,7 @@
  * The Template for displaying all single posts.
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
diff --git a/tag.php b/tag.php
index cf039ba..990dd01 100644
--- a/tag.php
+++ b/tag.php
@@ -4,8 +4,7 @@
  * The template used to display Tag Archive pages
  *
  * @author		Konstantin Obenland
- * @package		WordPress
- * @subpackage	The Bootstrap
+ * @package		The Bootstrap
  * @since		1.0.0 - 05.02.2012
  */
 
@@ -21,11 +20,9 @@
 				printf( __( 'Tag Archives: %s', 'the-bootstrap' ), '<span>' . single_tag_title( '', false ) . '</span>' );
 			?></h1>
 
-			<?php
-				$tag_description = tag_description();
-				if ( ! empty( $tag_description ) ) {
-					echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-				} ?>
+			<?php if ( $tag_description = tag_description() ) ) {
+				echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+			} ?>
 		</header>
 
 		<?php