Merge pull request weblab#1 from weblab/sidebars

Sidebars
jmr06005 · Jun 24, 2014 · a41873b · a41873b
2 parents a4af5a0 + 113753e
commit a41873b
Showing 1 changed file with 18 additions and 45 deletions.
diff --git a/page.php b/page.php
@@ -14,25 +14,20 @@
 <h1>page.php</h1>
 	<?php 
 		// sidebar custom field check. 
-		$sidebar = get_post_meta( get_the_ID(), 'sidebar', true );
-
+		$sidebar = get_post_meta( get_the_ID(), 'uc_sidebar', true );
+		if( !is_active_sidebar( $sidebar ) ){
+			foreach(get_post_ancestors(get_the_ID()) as $ancestor){
+				$parent_sidebar = get_post_meta( $ancestor, 'uc_sidebar', true );
+				$parent_sidebar_children = get_post_meta( $ancestor, 'uc_sidebar_children', true );
+				if( is_active_sidebar( $parent_sidebar ) && $parent_sidebar_children != '' && $parent_sidebar_children ){
+					$sidebar = $parent_sidebar;
+					break;
+				}
+			}
+		}
 	?>
 	<div class="row">
-
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-9">
-
-			else
-
-				<div class="col-sm-12">
-
-		-->
-		<div class="col-sm-9">
+		<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
 			<div id="primary" class="content-area">
 				<main id="main" class="site-main" role="main">
 					<h1>Sidebar?</h1>
@@ -58,33 +53,11 @@
 				</main><!-- #main -->
 			</div><!-- #primary -->
 		</div>
-		<!-- 
-
-			#phpneeded
-
-			If dynamic_sidebar() =! false/null...
-
-				<div class="col-sm-3">
-					<?php //dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-					<?php //get_sidebar(); ?>
-				</div>
-
-
-		-->
-
-		<div class="col-sm-3">
-			<?php 
-				$sidebar = get_post_meta( get_the_ID(), 'sidebar', true );
-				echo '<h1>'.$sidebar.'</h1>';
-				if ($sidebar == null){
-					echo '<h1>NULL</h1>';
-				}
-				if ( is_active_sidebar( $sidebar ) ) { 
-			?>
-					<?php dynamic_sidebar( $sidebar ); ?>
-			<?php }
-			//<?php dynamic_sidebar( apply_filters( 'ups_sidebar', 'default-sidebar-id' ) ); ?>
-			<?php //get_sidebar(); ?>
-		</div>
+		<?php
+		if ( is_active_sidebar( $sidebar ) ) { 
+			echo '<div class="col-sm-3">';
+			dynamic_sidebar( $sidebar );
+			echo '</div>';
+        } ?>
 	</div>
 <?php get_footer(); ?>