From 27fc8c83af76cde63f39dd778daf7cf571d56f2b Mon Sep 17 00:00:00 2001
From: Kim Coleman <kim@strangerstudios.com>
Date: Fri, 8 Apr 2022 07:08:45 -0400
Subject: [PATCH] Banner image handling for grid; author avatar hide filter;
 various style improvements

---
 components/post/content-grid.php |  8 ++--
 components/post/entry-header.php | 60 +++++++++++++--------------
 inc/extras.php                   | 54 +++++++++++++++++-------
 inc/template-tags.php            | 40 ++++++++++++++++++
 search.php                       | 23 +----------
 style.css                        | 71 +++++++++++++-------------------
 6 files changed, 143 insertions(+), 113 deletions(-)

diff --git a/components/post/content-grid.php b/components/post/content-grid.php
index 33e92ff..749ae07 100644
--- a/components/post/content-grid.php
+++ b/components/post/content-grid.php
@@ -12,9 +12,11 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class( ); ?>>
 	<a class="post-thumbnail-link" href="<?php echo esc_url( get_permalink() ); ?>">
-		<?php 
-			if ( has_post_thumbnail() && ! empty( get_the_post_thumbnail() ) ) {
-				the_post_thumbnail( 'large', array( 'class' => 'aligncenter' ) );
+		<?php
+			$attachment_id = get_post_thumbnail_id( get_the_ID() );
+			$memberlite_get_banner_image = memberlite_get_banner_image( $attachment_id, 'large', '', array( 'class' => 'aligncenter' ), get_the_ID() );
+			if ( ! empty( $memberlite_get_banner_image ) ) {
+				echo $memberlite_get_banner_image;
 			} else { ?>
 				<div class="post-thumbnail-empty"><i class="fas fa-file-alt"></i></div>
 			<?php }
diff --git a/components/post/entry-header.php b/components/post/entry-header.php
index d0a121d..07053bd 100644
--- a/components/post/entry-header.php
+++ b/components/post/entry-header.php
@@ -9,40 +9,40 @@
 <?php
 	global $memberlite_defaults;
 
-if ( memberlite_should_show_banner_image() ) {
-	$memberlite_get_banner_image_src = memberlite_get_banner_image_src( $post->ID, 'banner' );
-}
+	$content_archives = get_theme_mod( 'content_archives', $memberlite_defaults['content_archives'] );
+	if ( $content_archives != 'grid' || is_search() ) {
+		if ( memberlite_should_show_banner_image() ) {
+			$memberlite_get_banner_image_src = memberlite_get_banner_image_src( $post->ID, 'banner' );
+		}
 
-if ( ! empty( $memberlite_get_banner_image_src ) ) {
-	?>
-		<div class="entry-banner" style="background-image: url('<?php echo esc_attr( $memberlite_get_banner_image_src[0] ); ?>'); ">
-	<?php } ?>
+		if ( ! empty( $memberlite_get_banner_image_src ) ) { ?>
+			<div class="entry-banner" style="background-image: url('<?php echo esc_attr( $memberlite_get_banner_image_src[0] ); ?>'); ">
+		<?php } ?>
+
+		<?php
+			$memberlite_loop_images = get_theme_mod( 'memberlite_loop_images', $memberlite_defaults['memberlite_loop_images'] );
+			if ( $memberlite_loop_images === 'show_thumbnail' ) {
+				the_post_thumbnail(
+					'thumbnail',
+					array(
+						'class' => 'alignright',
+					)
+				);
+			}
+		?>
 
-	<?php
-	$memberlite_loop_images = get_theme_mod( 'memberlite_loop_images', $memberlite_defaults['memberlite_loop_images'] );
-	if ( $memberlite_loop_images === 'show_thumbnail' ) {
-		the_post_thumbnail(
-			'thumbnail',
-			array(
-				'class' => 'alignright',
-			)
-		);
-	}
-	?>
+	<?php } ?>
 
 	<header class="entry-header">
-		<?php if ( 'post' == get_post_type() && ! is_search() ) : ?>
-			<?php
-				$memberlite_avatar_size = apply_filters( 'memberlite_avatar_size', 80 );
-			?>
-			<div class="post_author_avatar"><?php echo get_avatar( get_the_author_meta( 'ID' ), $memberlite_avatar_size, '', get_the_author_meta( 'display_name' ) ); ?></div>
-		<?php endif; ?>
-		<?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' ); ?>
-		<?php if ( 'post' == get_post_type() ) : ?>
-		<div class="entry-meta">
-			<?php echo Memberlite_Customize::sanitize_text_with_links( memberlite_get_entry_meta( $post, 'before' ) ); ?>
-		</div><!-- .entry-meta -->
-		<?php endif; ?>
+		<?php echo memberlite_get_author_avatar( $post->post_author ); ?>
+		<div class="entry-header-content">
+			<?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' ); ?>
+			<?php if ( 'post' == get_post_type() ) : ?>
+			<div class="entry-meta">
+				<?php echo Memberlite_Customize::sanitize_text_with_links( memberlite_get_entry_meta( $post, 'before' ) ); ?>
+			</div><!-- .entry-meta -->
+			<?php endif; ?>
+		</div> <!-- .entry-header-content -->
 	</header><!-- .entry-header -->
 
 	<?php if ( ! empty( $memberlite_get_banner_image_src ) ) { ?>
diff --git a/inc/extras.php b/inc/extras.php
index 6aa3a4e..d73d9a9 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -443,23 +443,22 @@ function memberlite_page_title( $echo = true ) {
 			?>
 		</h1>
 		<?php
-	} elseif ( is_singular( 'post' ) ) {
-		$author = get_userdata( $post->post_author );
-		$memberlite_avatar_size = apply_filters( 'memberlite_avatar_size', 80 );
-		?>
+	} elseif ( is_singular( 'post' ) ) { ?>
 		<div class="masthead-post-byline">
-			<div class="post_author_avatar"><?php echo get_avatar( $author->ID, $memberlite_avatar_size, '', $author->display_name ); ?></div>
-			<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-			<?php
-				$memberlite_get_entry_meta_before = memberlite_get_entry_meta( $post, 'before' );
-			if ( ! empty( $memberlite_get_entry_meta_before ) ) {
+			<?php echo memberlite_get_author_avatar( $post->post_author ); ?>
+			<div class="entry-header-content">
+				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+				<?php
+					$memberlite_get_entry_meta_before = memberlite_get_entry_meta( $post, 'before' );
+				if ( ! empty( $memberlite_get_entry_meta_before ) ) {
+					?>
+					<p class="entry-meta">
+						<?php echo Memberlite_Customize::sanitize_text_with_links( memberlite_get_entry_meta( $post, 'before' ) ); ?>
+						</p><!-- .entry-meta -->
+						<?php
+				}
 				?>
-				<p class="entry-meta">
-					<?php echo Memberlite_Customize::sanitize_text_with_links( memberlite_get_entry_meta( $post, 'before' ) ); ?>
-					</p><!-- .entry-meta -->
-					<?php
-			}
-			?>
+			</div> <!-- .entry-header-content -->
 		</div>
 		<?php
 	} elseif ( is_home() ) {
@@ -853,6 +852,29 @@ function memberlite_should_show_banner_image( $post_id = null ) {
 	return $r;
 }
 
+/**
+ * Get the post thumbnail image src and allow filtering.
+ * Used to swap in the banner for loop/single posts with Memberlite Elements.
+ */
+function memberlite_get_banner_image( $attachment_id, $size = 'banner', $icon = false, $attr = '', $post_id ) {
+	// default to global post
+	if ( empty( $attachment_id ) ) {
+		global $post;
+		$post_id = $post->ID;
+		$attachment_id = get_post_thumbnail_id( $post_id );
+	}
+
+	$memberlite_banner_image = wp_get_attachment_image( $attachment_id, $size, $icon, $attr );
+
+	$memberlite_banner_image = apply_filters( 'memberlite_get_banner_image', $memberlite_banner_image, $attachment_id, $size, $icon, $attr, $post_id );
+
+	return $memberlite_banner_image;
+}
+
+/**
+ * Get the post thumbnail image src and allow filtering.
+ * Used to swap in the banner for loop/single posts with Memberlite Elements.
+ */
 function memberlite_get_banner_image_src( $post_id = null, $size = 'banner' ) {
 	// default to global post
 	if ( empty( $post_id ) ) {
@@ -862,7 +884,7 @@ function memberlite_get_banner_image_src( $post_id = null, $size = 'banner' ) {
 
 	$memberlite_banner_image_src = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), $size );
 
-	$memberlite_banner_image_src = apply_filters( 'memberlite_banner_image_src', $memberlite_banner_image_src, $size );
+	$memberlite_banner_image_src = apply_filters( 'memberlite_banner_image_src', $memberlite_banner_image_src, $size, $post_id );
 
 	return $memberlite_banner_image_src;
 }
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 89b296a..7e15821 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -161,6 +161,46 @@ function memberlite_get_entry_meta( $post = null, $location = 'before' ) {
 	return $meta;
 }
 
+
+/**
+ * Function to return the author avatar for display on posts.
+ *
+ */
+function memberlite_get_author_avatar( $author_id ) {
+	/**
+	 * Filter to hide avatars in the post entry header.
+	 *
+	 * @param $memberlite_show_author_avatar mixed Show avatars in the header for specific post types or hide everywhere.
+	 *
+	 * @return $memberlite_show_author_avatar mixed The post types or a bool value to show avatars.
+	 */
+	$memberlite_show_author_avatar = apply_filters( 'memberlite_show_author_avatar', array( 'post' ) );
+
+	// Bail if false.
+	if ( empty( $memberlite_show_author_avatar ) ) {
+		return;
+	}
+
+	// Show avatars if always set or for a specific post type.
+	if ( ! empty( $memberlite_show_author_avatar ) ) {
+		if ( is_array( $memberlite_show_author_avatar ) && ! in_array( get_post_type(), $memberlite_show_author_avatar ) ) {
+			// Set to false if this post_type should not show avatars.
+			$memberlite_show_author_avatar = false;
+		}
+	}
+
+	// The return variable
+	$memberlite_author_avatar = '';
+
+	// If we get here, we know it is either true or set for this post type.
+	if ( ! empty( $memberlite_show_author_avatar ) ) :
+		$memberlite_avatar_size = apply_filters( 'memberlite_avatar_size', 80 );
+		$memberlite_author_avatar = '<div class="post_author_avatar">' . get_avatar( $author_id, $memberlite_avatar_size, '', get_the_author_meta( 'display_name', $author_id ) ) . '</div>';
+	endif;
+
+	return $memberlite_author_avatar;
+}
+
 /**
  * Returns true if a blog has more than 1 category.
  *
diff --git a/search.php b/search.php
index bc74e8f..d6cf440 100644
--- a/search.php
+++ b/search.php
@@ -10,31 +10,10 @@
 		<main id="main" class="site-main" role="main">
 		<?php do_action( 'memberlite_before_loop' ); ?>
 		<?php if ( have_posts() ) : ?>
-			<?php
-				/**
-				 * Wrap posts output in the .grid-list class based on settings.
-				 */
-				$content_archives = get_theme_mod( 'content_archives', $memberlite_defaults['content_archives'] );
-				if ( $content_archives === 'grid' ) { ?>
-					<div class="grid-list">
-				<?php }
-			?>
 			<?php while ( have_posts() ) :
 				the_post(); ?>
-				<?php
-					/**
-					 * Load the grid-style content part based on settings.
-					 */
-					if ( $content_archives === 'grid' ) {
-						get_template_part( 'components/post/content', 'grid' );
-					} else {
-						get_template_part( 'components/post/content', get_post_format() );
-					}
-				?>
+				<?php get_template_part( 'components/post/content', 'search' ); ?>
 			<?php endwhile; ?>
-			<?php if ( $content_archives === 'grid' ) { ?>
-				</div> <!-- end .grid-list -->
-			<?php } ?>
 			<?php memberlite_paging_nav(); ?>
 		<?php else : ?>
 			<?php get_template_part( 'components/post/content', 'none' ); ?>
diff --git a/style.css b/style.css
index 2f33bfa..01c7914 100644
--- a/style.css
+++ b/style.css
@@ -1250,8 +1250,7 @@ a:active {
 #mobile-navigation .search-form {
 	padding: 1.45rem
 }
-#mobile-navigation .widget.widget_nav_menu,
-#mobile-navigation .widget.widget_search {
+#mobile-navigation .widget.widget_nav_menu {
 	padding: 0;
 }
 #mobile-navigation .widget h3 {
@@ -1924,29 +1923,20 @@ a:active {
 	padding-bottom: 0;
 }
 .masthead-post-byline {
-	display: grid;
-	grid-template-columns: 1fr .25fr 11fr 2fr;
-	grid-template-areas:
-    "avatar . title ."
-    "avatar . meta .";
-    margin: 1.45rem 0 0 0;
+	display: flex;
+	margin-top: 4.35rem;
 }
 .single-post.sidebar-blog-none .masthead-post-byline {
-	grid-template-columns: 1fr;
-	grid-template-areas:
-	"avatar"
-	"title"
-	"meta";
-	margin: 0;
+	margin-top: 2.9rem;
+	flex-direction: column;
 	text-align: center;
 }
 .masthead-banner .masthead-post-byline {
-	background-color: rgba(0,0,0,.6);
+	background-color: rgba( 0, 0, 0, 0.6 );
 	margin: 16rem 0 0 0;
 	padding: 1.45rem;
 }
 .masthead h1 {
-	grid-area: title;
 	-webkit-hyphens: auto;
 	-moz-hyphens: auto;
 	hyphens: auto;
@@ -1954,6 +1944,9 @@ a:active {
 	word-wrap: break-word;
 	overflow-wrap: break-word;
 }
+.single-post .masthead-post-byline h1 {
+	margin-top: 0;
+}
 .single-post.sidebar-blog-none .masthead-post-byline h1 {
 	margin-top: 1.45rem;
 }
@@ -1986,11 +1979,9 @@ a:active {
 	margin: 2rem 0 0 0;
 }
 .masthead .masthead-post-byline p.entry-meta {
-	grid-area: meta;
 	margin: 0;
 }
 .masthead-banner .masthead-post-byline p.entry-meta {
-	grid-area: meta;
 	margin: 0;
 }
 .masthead p a,
@@ -2001,10 +1992,11 @@ a:active {
 }
 .masthead .post_author_avatar {
 	border-radius: 50%;
-	grid-area: avatar;
-	height: auto;
-	margin-top: 2.9rem;
-	width: 100%;
+	flex-shrink: 0;
+	margin-right: 1.45rem;
+}
+.single-post.sidebar-blog-none .masthead-post-byline .post_author_avatar {
+	margin-right: 0;
 }
 .masthead .post_author_avatar img {
 	border-radius: 50%;
@@ -2044,56 +2036,50 @@ a:active {
 .page-template-blank .hentry {
 	margin:  0;
 }
-.columns .hentry.memberlite_subpagelist_item {margin: 0; }
+.columns .hentry.memberlite_subpagelist_item {
+	margin: 0;
+}
 .hentry .entry-banner {
 	background-position: center center;
 	background-repeat: no-repeat;
 	background-size: cover;
-	height: 200px;
 	position: relative;
-	margin: 0 0 1.5rem;
+	margin: 0 0 2.9rem 0;
 	border-top: 1px dotted var(--memberlite-color-borders);
 	border-bottom: 1px dotted var(--memberlite-color-borders);
 }
 .hentry .entry-banner .entry-header {
 	background-color: rgba(0,0,0,0.6);
 	width: 100%;
-	position: absolute;
 	bottom: 0;
-	margin: 0;
-	padding: 1rem;
+	margin: 11.6rem 0 0 0;
+	padding: 1.45rem;
 }
 #primary .hentry .entry-banner .entry-header a {
 	color: var(--memberlite-color-white);
 }
 .entry-header-grid .entry-header {
-	display: grid;
-	grid-template-columns: 1fr .25fr 9fr;
-	grid-template-areas:
-    "avatar . title"
-    "avatar . meta";
-    margin-bottom: 2.9rem;
+	display: flex;
+}
+.entry-header-grid .entry-header-content {
+	margin-bottom: 2.9rem;
 }
-.entry-header-grid .entry-banner .entry-header {
+.entry-header-grid .entry-banner .entry-header-content {
 	margin-bottom: 0;
 }
 .entry-header-grid .entry-header .entry-title {
 	margin: 0 0 .7rem 0;
-	grid-area: title;
 	-webkit-hyphens: auto;
 	-moz-hyphens: auto;
 	hyphens: auto;
 	word-wrap: break-word;
 	overflow-wrap: break-word;
 }
-.entry-header-grid .entry-header .entry-meta {
-	grid-area: meta;
-}
 .entry-header-grid .entry-header .post_author_avatar {
 	border-radius: 50%;
-	grid-area: avatar;
+	flex-shrink: 0;
 	height: auto;
-	width: 100%;
+	margin-right: 1.45rem;
 }
 .hentry .post_author_avatar img {
 	border-radius: 50%;
@@ -2313,11 +2299,12 @@ a:active {
 	font-size: 8rem;
 }
 .grid-list .entry-header {
-	margin-top: -1.45rem;
+	margin-top: 2.9rem;
 	z-index: 1;
 }
 .grid-list .entry-header .avatar {
 	border: 2px solid var(--memberlite-color-white);
+	margin-top: -4.35rem;
 }
 .grid-list .entry-content {
 	border-bottom: none;