Make the article-bottom widget area into an action

WPBuddy · Feb 10, 2016 · 17b27be · 17b27be
1 parent c044af0
commit 17b27be
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/inc/sidebars.php b/inc/sidebars.php
@@ -354,9 +354,30 @@ function largo_sidebar_span_class() {
 		return 'span4';
 }
 
+/**
+ * Output the "Header Widget" sidebar
+ *
+ * @action largo_header_after_largo_header
+ * @since 0.5.5
+ */
 function largo_header_widget_sidebar() {
 	if ( of_get_option('header_widget_enabled') ) {
 		dynamic_sidebar('header-widget');
 	}
 }
 add_action('largo_header_after_largo_header', 'largo_header_widget_sidebar');
+
+/**
+ * Output the "Article Bottom" sidebar
+ *
+ * @action largo_header_after_largo_header
+ * @since 0.5.5
+ */
+function largo_post_bottom_widget_area() {
+	if ( is_active_sidebar( 'article-bottom' ) ) {
+		echo '<div class="article-bottom nocontent">';
+		dynamic_sidebar( 'article-bottom' );
+		echo '</div>';
+	}
+}
+add_action('largo_post_bottom_widget_area', 'largo_post_bottom_widget_area');
diff --git a/single-one-column.php b/single-one-column.php
@@ -26,17 +26,12 @@
 			get_template_part( 'partials/content', $partial );
 
 			if ( $partial === 'single' ) {
-				if ( is_active_sidebar( 'article-bottom' ) ) {
 
-					do_action( 'largo_before_post_bottom_widget_area' );
+				do_action( 'largo_before_post_bottom_widget_area' );
 
-					echo '<div class="article-bottom nocontent">';
-					dynamic_sidebar( 'article-bottom' );
-					echo '</div>';
+				do_action( 'largo_post_bottom_widget_area' );
 
-					do_action( 'largo_after_post_bottom_widget_area' );
-
-				}
+				do_action( 'largo_after_post_bottom_widget_area' );
 
 				do_action( 'largo_before_comments' );
 

diff --git a/single-two-column.php b/single-two-column.php
@@ -16,34 +16,28 @@
 ?>
 
 <div id="content" class="span8" role="main">
-
 	<?php
 		while ( have_posts() ) : the_post();
-		
+
 			$shown_ids[] = get_the_ID();
 
 			$partial = ( is_page() ) ? 'page' : 'single-classic';
 
 			get_template_part( 'partials/content', $partial );
 
 			if ( $partial == 'single-classic' ) {
-				if ( is_active_sidebar( 'article-bottom' ) ) {
-
-					do_action( 'largo_before_post_bottom_widget_area' );
 
-					echo '<div class="article-bottom nocontent">';
-					dynamic_sidebar( 'article-bottom' );
-					echo '</div>';
+				do_action( 'largo_before_post_bottom_widget_area' );
 
-					do_action( 'largo_after_post_bottom_widget_area' );
+				do_action( 'largo_post_bottom_widget_area' );
 
-				}
+				do_action( 'largo_after_post_bottom_widget_area' );
 
-				do_action('largo_before_comments');
+				do_action( 'largo_before_comments' );
 
 				comments_template( '', true );
 
-				do_action('largo_after_comments');
+				do_action( 'largo_after_comments' );
 			}
 
 		endwhile;