From 01822189a6c500608fbb1d141564d275fb1bc17f Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 27 Jul 2017 11:52:26 -0400
Subject: [PATCH] entity interior and landing now proper sections,
 interior-page section no longer needed as intermediary step

---
 index.php                                     | 50 ++++++++++---------
 .../entity-interior.php                       |  2 +-
 .../entity-landing.php                        |  4 +-
 ...rior-page.php => interior-page UNUSED.php} |  4 +-
 4 files changed, 32 insertions(+), 28 deletions(-)
 rename parts/section-interior.php => sections/entity-interior.php (96%)
 rename parts/template-interior.php => sections/entity-landing.php (92%)
 rename sections/{interior-page.php => interior-page UNUSED.php} (97%)

diff --git a/index.php b/index.php
index e5e800c..b114f62 100644
--- a/index.php
+++ b/index.php
@@ -7,34 +7,38 @@
             <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
                 <div class="off-canvas-content" data-off-canvas-content>
                     <?php
-                    
+
                     if (is_front_page()) {
-                        
                         include "sections/front-page-header.php";
                         include "sections/front-page.php";
-                    }
-                    if (is_home()) {
-                        include "sections/header.php";
-                        include "sections/blog-home.php";
-                    }
-                    if (is_archive()) {
-                        include "sections/header.php";
-                        include "sections/blog-archive.php";
-                    }
-                    if (is_single()) {
-                        include "sections/header.php";
-                        include "sections/blog-single.php";
-                    }
-                    if (is_search()) {
+                    } else {
                         include "sections/header.php";
-                        include "sections/search.php";
-                    }
-                    if (is_page() && !is_front_page()) {
-                        include "sections/header.php"; 
-                        include "sections/interior-page.php"; 
+                        if (is_home()) {
+                            include "sections/blog-home.php";
+                        }
+                        if (is_archive()) {
+                            include "sections/blog-archive.php";
+                        }
+                        if (is_single()) {
+                            include "sections/blog-single.php";
+                        }
+                        if (is_search()) {
+                            include "sections/search.php";
+                        }
+                        if (is_page() && !is_front_page()) {
+
+                            if(get_abs_parent()){
+                                // If I have an entity landing page as parent, I must be an entity interior page
+                                get_template_part('sections/entity-interior');
+                            } else {
+                                // If not, and I am clearly not frontpage (checked above), I must be an entity landing page
+                                get_template_part('sections/entity-landing');
+                            }
+                        }
                     }
-                    include "sections/footer.php";  
-                    include "sections/copyright.php";  
+
+                    include "sections/footer.php";
+                    include "sections/copyright.php";
                     ?>
                     <div class="js-off-canvas-exit"></div>
                 </div><!--/.off-canvas-content-->
diff --git a/parts/section-interior.php b/sections/entity-interior.php
similarity index 96%
rename from parts/section-interior.php
rename to sections/entity-interior.php
index 473f738..1920542 100644
--- a/parts/section-interior.php
+++ b/sections/entity-interior.php
@@ -1,4 +1,4 @@
-<main class="page-inside">
+<main class="page-inside entity-interior">
     <div id="content-wrapper">
         <?php echo glm_get_header();?>
          <?php $sidebar = get_field('sidebar'); ?>
diff --git a/parts/template-interior.php b/sections/entity-landing.php
similarity index 92%
rename from parts/template-interior.php
rename to sections/entity-landing.php
index 72692df..6907057 100644
--- a/parts/template-interior.php
+++ b/sections/entity-landing.php
@@ -1,11 +1,11 @@
-<main class="page-inside">
+<main class="page-inside entity-landing">
     <div id="content-wrapper">
         <?php echo glm_get_header();?>
          <?php //$post_content = get_post($post->ID); ?>
           <div class="row column">
                     <?php if(!is_front_page()) {
                         echo "<div class=\"small-12 columns\">";
-                            if(function_exists('bcn_display') && !is_front_page()) 
+                            if(function_exists('bcn_display') && !is_front_page())
                             {
                                 echo "<div class=\"breadcrumbs\">";
                                 bcn_display();
diff --git a/sections/interior-page.php b/sections/interior-page UNUSED.php
similarity index 97%
rename from sections/interior-page.php
rename to sections/interior-page UNUSED.php
index 8cbe1b9..babe79b 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page UNUSED.php	
@@ -2,9 +2,9 @@
 
 </div>
 <?php if(get_abs_parent()){
-    get_template_part('parts/section-interior');
+    get_template_part('parts/entity-interior');
 } else {
-    get_template_part('parts/template-interior');
+    get_template_part('parts/entity-landing');
 }
 ?>
 
-- 
2.17.1