From 78021588bdbc228cd562d6e5542be33e9dd9bdc8 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 21 Aug 2017 12:22:51 -0400
Subject: [PATCH] Member blog sections now visible to the public eye

Client wants Member Posts to be visible to the public. Edited
archive, search, single and archive to no longer lock out public
viewing but still have the Members Home top-bar if logged in.
---
 archive.php                          | 17 ++++++-----
 parts/glm-members-only-blog-feed.php | 44 ++++++++++++----------------
 search.php                           | 14 ++++-----
 single.php                           | 16 +++++-----
 4 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/archive.php b/archive.php
index b726995..89503e2 100644
--- a/archive.php
+++ b/archive.php
@@ -10,19 +10,22 @@
             $category = get_category( get_query_var( 'cat' ) );
         } ?>
 
-        <?php if ( ( is_tax( "member-post-category" ) ) || ( $category && $category->slug == 'members-only' ) || ( ( isset( $_GET["post_type"] ) ) && ( "member_post" == $_GET["post_type"] ) ) ) { ?>
-            <?php if (current_user_can("glm_members_member")) { ?>
+        <?php if ( ( is_tax( "member-post-category" ) )
+                  || ( $category && $category->slug == 'members-only' )
+                  || ( ( isset( $_GET["post_type"] ) ) && ( "member_post" == $_GET["post_type"] ) )
+                ) { ?>
+
                 <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
                 <div id="blog-posts-over" class="small-12 medium-9 columns">
-                    <?php get_template_part('parts/glm-members-only-top-bar'); ?>
+                    <?php if (current_user_can("glm_members_member")) { ?>
+                        <?php get_template_part('parts/glm-members-only-top-bar'); ?>
+                    <?php } ?>
                     <?php get_template_part('parts/blog-archive-content'); ?>
                 </div>
                 <?php get_template_part('parts/blog-sidebar-members-only'); ?>
                 <?php //get_template_part('parts/interior-footer'); ?>
-            <?php } else { ?>
-                <!-- Otherwise, display main members only page content & form -->
-                <?php get_template_part('parts/glm-members-only-login-form'); ?>
-            <?php } ?>
+
+
         <?php } else {?> <!-- not members-only category -->
             <div id="blog-posts-over" class="small-12 medium-9 columns">
                 <?php get_template_part('parts/blog-archive-content'); ?>
diff --git a/parts/glm-members-only-blog-feed.php b/parts/glm-members-only-blog-feed.php
index 0a8bf7d..916550d 100644
--- a/parts/glm-members-only-blog-feed.php
+++ b/parts/glm-members-only-blog-feed.php
@@ -1,33 +1,27 @@
 <?php
-
-?>
-<?php
 $args = array( 'posts_per_page' => '1', 'post_status' => 'publish', 'post_type' => 'member_post' );
 $lastposts = get_posts( $args );
 if ($lastposts) { ?>
-
-        <div id="blog-feed-front">
-            <div>
-            <?php foreach($lastposts as $post) : setup_postdata($post); ?>
-
-                <div class="small-12 columns blog-feed-post">
-                    <?php $thumbnail = get_the_post_thumbnail($post->ID, 'blog-feed-front'); ?>
-                    <?php if ($thumbnail) { ?>
-                        <div class="small-8 small-centered medium-uncentered medium-4 columns blog-feed-img">
-                            <?php echo $thumbnail; ?>
-                        </div>
-                        <div class="small-12 medium-8 columns blog-feed-content">
-                    <?php } else { ?>
-                        <div class="small-12 columns blog-feed-content">
-                    <?php } ?>
-                            <h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-                            <p class="blog-feed-date"><?php echo get_the_date('F j, Y', $post->ID); ?></p>
-                            <p><?php echo the_advanced_excerpt('exclude_tags=img,p,strong,div'); ?></p>
+    <div id="blog-feed-front">
+        <div>
+        <?php foreach($lastposts as $post) : setup_postdata($post); ?>
+            <div class="small-12 columns blog-feed-post">
+                <?php $thumbnail = get_the_post_thumbnail($post->ID, 'blog-feed-front'); ?>
+                <?php if ($thumbnail) { ?>
+                    <div class="small-8 small-centered medium-uncentered medium-4 columns blog-feed-img">
+                        <?php echo $thumbnail; ?>
+                    </div>
+                    <div class="small-12 medium-8 columns blog-feed-content">
+                <?php } else { ?>
+                    <div class="small-12 columns blog-feed-content">
+                <?php } ?>
+                        <h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
+                        <p class="blog-feed-date"><?php echo get_the_date('F j, Y', $post->ID); ?></p>
+                        <p><?php echo the_advanced_excerpt('exclude_tags=img,p,strong,div'); ?></p>
                     </div>
-                </div>
-            <?php endforeach; ?>
             </div>
-                <a href="<?php echo get_home_url(null, "/?post_type=member_post"); ?>" style='text-decoration: underline'>Click here to see more True North News</a>
+        <?php endforeach; ?>
         </div>
-
+            <a href="<?php echo get_home_url(null, "/?post_type=member_post"); ?>" style='text-decoration: underline'>Click here to see more True North News</a>
+    </div>
 <?php } ?>
diff --git a/search.php b/search.php
index 161e354..0508dde 100644
--- a/search.php
+++ b/search.php
@@ -5,15 +5,13 @@
     </div>
     <div class="row">
         <?php if (isset($_GET['searchType']) && $_GET['searchType'] == 'member_post') { ?>
-            <?php if (current_user_can("glm_members_member")) { ?>  <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
-                <div id="blog-posts-over" class="small-12 medium-8 columns">
+            <div id="blog-posts-over" class="small-12 medium-8 columns">
+                <?php if (current_user_can("glm_members_member")) { ?>  <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
                     <?php get_template_part('parts/glm-members-only-top-bar'); ?>
-                    <?php get_template_part('parts/search-content'); ?>
-                </div>
-                <?php get_template_part('parts/blog-sidebar-members-only'); ?>
-            <?php } else { ?> <!-- Otherwise, display main members only page content & form -->
-                <?php get_template_part('parts/glm-members-only-login-form'); ?>
-            <?php } ?>
+                <?php } ?>
+                <?php get_template_part('parts/search-content'); ?>
+            </div>
+            <?php get_template_part('parts/blog-sidebar-members-only'); ?>
         <?php } else { ?> <!-- If the post is not of type member post, just treat it like a normal post -->
             <div id="blog-posts-over" class="small-12 medium-8 columns">
                 <?php get_template_part('parts/search-content'); ?>
diff --git a/single.php b/single.php
index 2e00e89..066a793 100644
--- a/single.php
+++ b/single.php
@@ -4,17 +4,15 @@
             <div class="featured-image" style="background: url('<?php echo get_template_directory_uri();?>/assets/default-header.jpg') no-repeat scroll 0px bottom / cover;"></div>
         </div>
         <div class="row">
-            <?php if (is_single() && is_post_type('member_post')){ ?> <!-- If the post is of type Member Post
+            <?php if (is_single() && is_post_type('member_post')){ ?> <!-- If the post is of type Member Post -->
+                <div id="blog-posts-over" class="small-12 medium-9 columns">
                 <?php if (current_user_can("glm_members_member")) { ?>  <!-- If user is logged in as a member, display top bar, bread crumbs, & content -->
-                    <div id="blog-posts-over" class="small-12 medium-9 columns">
-                        <?php get_template_part('parts/glm-members-only-top-bar'); ?>
-                        <?php get_template_part('parts/blog-addthis-wrapper'); ?>
-                        <?php get_template_part('parts/blog-single-content'); ?>
-                    </div>
-                    <?php get_template_part('parts/blog-sidebar-members-only'); ?>
-                <?php } else { ?> <!-- Otherwise, display main members only page content & form -->
-                    <?php get_template_part('parts/glm-members-only-login-form'); ?>
+                    <?php get_template_part('parts/glm-members-only-top-bar'); ?>
                 <?php } ?>
+                <?php get_template_part('parts/blog-addthis-wrapper'); ?>
+                <?php get_template_part('parts/blog-single-content'); ?>
+                </div>
+                <?php get_template_part('parts/blog-sidebar-members-only'); ?>
             <?php } else { ?> <!-- If the post is not of type member post, just treat it like a normal post -->
                 <div id="blog-posts-over" class="small-12 medium-9 columns">
                     <?php get_template_part('parts/blog-addthis-wrapper'); ?>
-- 
2.17.1