From d533a42776b6b4a6061799a11eba48793d894618 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 28 Dec 2016 13:34:03 -0500
Subject: [PATCH] Merged no-sidebar with glm-events-template in interior page

These two templates were functioning the same so their code has
been merged.
---
 sections/interior-page.php | 71 ++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/sections/interior-page.php b/sections/interior-page.php
index a1aa86a..e889ec5 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -1,42 +1,31 @@
-                    <main class="page-inside">
-                        <div id="content-wrapper">
-                            <div class="row" data-equalizer>
-                                
-                                <?php if ( get_page_template_slug( $post->ID ) === "glm-events-template.php" ) { /*check for no side bar template and display full page */ ?>
-                                    <div class="small-12 columns">
-                                        <?php get_template_part('parts/breadcrumbs'); ?>
-                                        <div class="row">
-                                            <div id="interior-content" class="no-sidebar-content small-12 columns">
-                                                <?php //echo do_shortcode('[glm-members-event-list]'); ?>
-                                                <?php get_template_part('parts/main-content');?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                <?php } else if ( get_page_template_slug( $post->ID ) === "no-sidebar.php" ) { /*check for no side bar template and display full page */ ?>
-                                    <div class="small-12 columns">
-                                       <?php get_template_part('parts/breadcrumbs'); ?>
-                                        <div class="row">
-                                            <div id="interior-content" class="no-sidebar-content small-12 columns">
-                                                <?php get_template_part('parts/main-content');?>
-                                            </div>
-                                            
-                                        </div>
-                                    </div>
-                                <?php } else {  ?>
-                                   <div class="small-12 medium-7 medium-push-5 large-8 large-push-4 columns" data-equalizer-watch>
-                                       <?php get_template_part('parts/breadcrumbs'); ?>
-                                        <div class="row">
-                                            <div id="interior-content" class="small-12 columns">
-                                                <?php get_template_part('parts/main-content');?>
-                                            </div>
-                                            
-                                        </div>
-                                    </div>
-                                    <div id="sidebar" class="small-12 medium-5 medium-pull-7 large-4 large-pull-8 columns small-text-center" data-equalizer-watch>
-                                        <?php get_sidebar(); ?>
-                                    </div>
-                                    
-                                <?php } ?>
-                            </div>
+<main class="page-inside">
+    <div id="content-wrapper">
+        <div class="row" data-equalizer>
+            <?php if (  get_page_template_slug( $post->ID ) === "glm-events-template.php" || 
+                        get_page_template_slug( $post->ID ) === "no-sidebar.php" ) { /*check for no side bar template and display full page */ ?>
+                <?php get_template_part('parts/breadcrumbs'); ?>
+                <div class="small-12 columns">
+                    <div class="row">
+                        <div id="interior-content" class="no-sidebar-content small-12 columns">
+                            <?php //echo do_shortcode('[glm-members-event-list]'); ?>
+                            <?php get_template_part('parts/main-content');?>
                         </div>
-                    </main>
\ No newline at end of file
+                    </div>
+                </div>
+            <?php } else {  ?>
+               <div class="small-12 medium-7 medium-push-5 large-8 large-push-4 columns" data-equalizer-watch>
+                   <?php get_template_part('parts/breadcrumbs'); ?>
+                    <div class="row">
+                        <div id="interior-content" class="small-12 columns">
+                            <?php get_template_part('parts/main-content');?>
+                        </div>
+                    </div>
+                </div>
+                <div id="sidebar" class="small-12 medium-5 medium-pull-7 large-4 large-pull-8 columns small-text-center" data-equalizer-watch>
+                    <?php get_sidebar(); ?>
+                </div>
+
+            <?php } ?>
+        </div>
+    </div>
+</main>
\ No newline at end of file
-- 
2.17.1