From aa81f71bd15f93e54f8cf3fb6342df8ca0317a6b Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 1 Mar 2018 19:49:48 -0500
Subject: [PATCH] Fixing members only sidebar and header

---
 sections/interior-page.php | 46 +++++++++++++++++++++++---------------
 sidebar.php                | 16 ++++++++-----
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/sections/interior-page.php b/sections/interior-page.php
index ccf17e8..81bb65b 100644
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -15,28 +15,38 @@
                     <main class="page-inside">
                         <div id="content-wrapper">
                             <div class="row">
-
-                                <?php if(is_in_tree(MEMBERS_ONLY_ID)) { ?>
-                                    <?php get_template_part('sections/glm-members-only'); ?>
+                                <?php if (get_page_template_slug( $post->ID ) === "members-only-template.php") {  ?>
+                                    <div class="members-only-template large-push-4 large-8 columns" data-equalizer-watch>
+                                        <?php if (is_user_logged_in()) { ?>
+                                            <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
+                                            <?php get_template_part('parts/glm-members-only-top-bar');
+                                            get_template_part('parts/main-content');
+                                        } else {
+                                            get_template_part('parts/glm-members-only-login-form');
+                                        } ?>
+                                    </div>
                                 <?php } else { ?>
+                                     <div class="small-12 columns">
 
-                                    <?php if(function_exists('bcn_display') && !is_front_page())
-                                    {
-                                        echo "<div class=\"breadcrumbs small-12 columns\">";
-                                        echo '<span class="st_sharethis" st_title="'. get_the_title().'" st_url="'. get_the_permalink() .'"></span>';
-                                        bcn_display();
-                                        echo "</div>";
-                                    }
-                                    ?>
-                                    <div class="row">
+                                         <?php if(function_exists('bcn_display') && !is_front_page() && !is_member())
+                                         {
+                                            echo "<div class=\"breadcrumbs small-12 columns\">";
+                                            echo '<span class="st_sharethis" st_title="'. get_the_title().'" st_url="'. get_the_permalink() .'"></span>'; 
+                                            bcn_display();
+                                            echo "</div>";
+                                        }?>
                                         <?php get_template_part('parts/main-content');?>
                                     </div>
-                <!--
-                                <div class="small-12 medium-6 large-4 columns small-text-center medium-text-left">
-                                    <?php //get_sidebar(); ?>
-                                </div>
-                -->
-                                <?php } // End of members only check ?>
+                                <?php } 
+                                if (get_page_template_slug( $post->ID ) === "members-only-template.php") {  ?>
+                                   <?php if (is_user_logged_in()) { ?>
+                                    <div id="side-content" class=" text-center small-12 large-pull-8 large-4 columns large-text-left">
+                                        <div id="sidebar" class="small-12" data-equalizer-watch>
+                                            <?php get_sidebar(); ?>
+                                        </div>
+                                    </div>
+                                <?php } ?>
+                               <?php } ?>
                             </div>
                         </div>
                     </main>
diff --git a/sidebar.php b/sidebar.php
index 4cf9d86..509599c 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,6 +1,10 @@
-<!--
-                        <div id="side-nav" class="show-for-large-up" data-equalizer-watch>
-                            <div class="row collapse opensearchserver.ignore">
-                                <?php //glm_side_menu(); ?>
-                            </div>
-                        </div>-->
+<?php if (get_page_template_slug( $post->ID ) === "members-only-template.php") {  ?>
+    <?php if (is_user_logged_in()) { ?>
+        <div id="members-only-sidebar" class="show-for-small-up opensearchserver.ignore">
+            <div class="row collapse sidebar-row">
+                <h4 class="sidebar-title"> Partners Only</h4>
+                     <?php glm_theme_members_only('members-only-menu'); ?>
+             </div>
+        </div>
+    <?php } ?>
+<?php } ?>
\ No newline at end of file
-- 
2.17.1