From 69c17f9c1942fd0d6a5ea941636e87723b8a6fe2 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Wed, 21 Jul 2021 16:19:29 -0500
Subject: dos2unix on all .php files, begin paring down admin page and site
 branding.

---
 inc/class-astra-loop.php | 534 +++++++++++++++++++++++------------------------
 1 file changed, 267 insertions(+), 267 deletions(-)

(limited to 'inc/class-astra-loop.php')

diff --git a/inc/class-astra-loop.php b/inc/class-astra-loop.php
index 7460ae2..0eb8cc0 100644
--- a/inc/class-astra-loop.php
+++ b/inc/class-astra-loop.php
@@ -1,267 +1,267 @@
-<?php
-/**
- * Astra Loop
- *
- * @package Astra
- * @since 1.2.7
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly.
-}
-
-if ( ! class_exists( 'Astra_Loop' ) ) :
-
-	/**
-	 * Astra_Loop
-	 *
-	 * @since 1.2.7
-	 */
-	class Astra_Loop {
-
-		/**
-		 * Instance
-		 *
-		 * @since 1.2.7
-		 *
-		 * @access private
-		 * @var object Class object.
-		 */
-		private static $instance;
-
-		/**
-		 * Initiator
-		 *
-		 * @since 1.2.7
-		 *
-		 * @return object initialized object of class.
-		 */
-		public static function get_instance() {
-			if ( ! isset( self::$instance ) ) {
-				self::$instance = new self();
-			}
-			return self::$instance;
-		}
-
-		/**
-		 * Constructor
-		 *
-		 * @since 1.2.7
-		 */
-		public function __construct() {
-			// Loop.
-			add_action( 'astra_content_loop', array( $this, 'loop_markup' ) );
-			add_action( 'astra_content_page_loop', array( $this, 'loop_markup_page' ) );
-
-			// Template Parts.
-			add_action( 'astra_page_template_parts_content', array( $this, 'template_parts_page' ) );
-			add_action( 'astra_page_template_parts_content', array( $this, 'template_parts_comments' ), 15 );
-			add_action( 'astra_template_parts_content', array( $this, 'template_parts_post' ) );
-			add_action( 'astra_template_parts_content', array( $this, 'template_parts_search' ) );
-			add_action( 'astra_template_parts_content', array( $this, 'template_parts_default' ) );
-			add_action( 'astra_template_parts_content', array( $this, 'template_parts_comments' ), 15 );
-
-			// Template None.
-			add_action( 'astra_template_parts_content_none', array( $this, 'template_parts_none' ) );
-			add_action( 'astra_template_parts_content_none', array( $this, 'template_parts_404' ) );
-			add_action( 'astra_404_content_template', array( $this, 'template_parts_404' ) );
-
-			// Content top and bottom.
-			add_action( 'astra_template_parts_content_top', array( $this, 'template_parts_content_top' ) );
-			add_action( 'astra_template_parts_content_bottom', array( $this, 'template_parts_content_bottom' ) );
-
-			// Add closing and ending div 'ast-row'.
-			add_action( 'astra_template_parts_content_top', array( $this, 'astra_templat_part_wrap_open' ), 25 );
-			add_action( 'astra_template_parts_content_bottom', array( $this, 'astra_templat_part_wrap_close' ), 5 );
-		}
-
-		/**
-		 * Template part none
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_none() {
-			if ( is_archive() || is_search() ) {
-				get_template_part( 'template-parts/content', 'none' );
-			}
-		}
-
-		/**
-		 * Template part 404
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_404() {
-			if ( is_404() ) {
-				get_template_part( 'template-parts/content', '404' );
-			}
-		}
-
-		/**
-		 * Template part page
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_page() {
-			get_template_part( 'template-parts/content', 'page' );
-		}
-
-		/**
-		 * Template part single
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_post() {
-			if ( is_single() ) {
-				get_template_part( 'template-parts/content', 'single' );
-			}
-		}
-
-		/**
-		 * Template part search
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_search() {
-			if ( is_search() ) {
-				get_template_part( 'template-parts/content', 'blog' );
-			}
-		}
-
-		/**
-		 * Template part comments
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_comments() {
-			if ( is_single() || is_page() ) {
-				// If comments are open or we have at least one comment, load up the comment template.
-				if ( comments_open() || get_comments_number() ) :
-					comments_template();
-				endif;
-			}
-		}
-
-		/**
-		 * Template part default
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_default() {
-			if ( ! is_page() && ! is_single() && ! is_search() && ! is_404() ) {
-				/*
-				 * Include the Post-Format-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-				 */
-				get_template_part( 'template-parts/content', astra_get_post_format() );
-			}
-		}
-
-		/**
-		 * Loop Markup for content page
-		 *
-		 * @since 1.3.1
-		 */
-		public function loop_markup_page() {
-			$this->loop_markup( true );
-		}
-
-		/**
-		 * Template part loop
-		 *
-		 * @param  boolean $is_page Loop outputs different content action for content page and default content.
-		 *         if is_page is set to true - do_action( 'astra_page_template_parts_content' ); is added
-		 *         if is_page is false - do_action( 'astra_template_parts_content' ); is added.
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function loop_markup( $is_page = false ) {
-			?>
-			<main id="main" class="site-main">
-				<?php 
-				if ( have_posts() ) :
-					do_action( 'astra_template_parts_content_top' );
-
-					while ( have_posts() ) :
-						the_post();
-
-						if ( true === $is_page ) {
-							do_action( 'astra_page_template_parts_content' );
-						} else {
-							do_action( 'astra_template_parts_content' );
-						}
-
-						endwhile;
-					do_action( 'astra_template_parts_content_bottom' );
-					else :
-						do_action( 'astra_template_parts_content_none' );
-					endif; 
-					?>
-			</main><!-- #main -->
-			<?php
-		}
-
-		/**
-		 * Template part content top
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_content_top() {
-			if ( is_archive() ) {
-				astra_content_while_before();
-			}
-		}
-
-		/**
-		 * Template part content bottom
-		 *
-		 * @since 1.2.7
-		 * @return void
-		 */
-		public function template_parts_content_bottom() {
-			if ( is_archive() ) {
-				astra_content_while_after();
-			}
-		}
-
-		/**
-		 * Add wrapper div 'ast-row' for Astra template part.
-		 *
-		 * @since  1.2.7
-		 * @return void
-		 */
-		public function astra_templat_part_wrap_open() {
-			if ( is_archive() || is_search() || is_home() ) {
-				echo '<div class="ast-row">';
-			}
-		}
-
-		/**
-		 * Add closing wrapper div for 'ast-row' after Astra template part.
-		 *
-		 * @since  1.2.7
-		 * @return void
-		 */
-		public function astra_templat_part_wrap_close() {
-			if ( is_archive() || is_search() || is_home() ) {
-				echo '</div>';
-			}
-		}
-
-	}
-
-	/**
-	 * Initialize class object with 'get_instance()' method
-	 */
-	Astra_Loop::get_instance();
-
-endif;
+<?php
+/**
+ * Astra Loop
+ *
+ * @package Astra
+ * @since 1.2.7
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly.
+}
+
+if ( ! class_exists( 'Astra_Loop' ) ) :
+
+	/**
+	 * Astra_Loop
+	 *
+	 * @since 1.2.7
+	 */
+	class Astra_Loop {
+
+		/**
+		 * Instance
+		 *
+		 * @since 1.2.7
+		 *
+		 * @access private
+		 * @var object Class object.
+		 */
+		private static $instance;
+
+		/**
+		 * Initiator
+		 *
+		 * @since 1.2.7
+		 *
+		 * @return object initialized object of class.
+		 */
+		public static function get_instance() {
+			if ( ! isset( self::$instance ) ) {
+				self::$instance = new self();
+			}
+			return self::$instance;
+		}
+
+		/**
+		 * Constructor
+		 *
+		 * @since 1.2.7
+		 */
+		public function __construct() {
+			// Loop.
+			add_action( 'astra_content_loop', array( $this, 'loop_markup' ) );
+			add_action( 'astra_content_page_loop', array( $this, 'loop_markup_page' ) );
+
+			// Template Parts.
+			add_action( 'astra_page_template_parts_content', array( $this, 'template_parts_page' ) );
+			add_action( 'astra_page_template_parts_content', array( $this, 'template_parts_comments' ), 15 );
+			add_action( 'astra_template_parts_content', array( $this, 'template_parts_post' ) );
+			add_action( 'astra_template_parts_content', array( $this, 'template_parts_search' ) );
+			add_action( 'astra_template_parts_content', array( $this, 'template_parts_default' ) );
+			add_action( 'astra_template_parts_content', array( $this, 'template_parts_comments' ), 15 );
+
+			// Template None.
+			add_action( 'astra_template_parts_content_none', array( $this, 'template_parts_none' ) );
+			add_action( 'astra_template_parts_content_none', array( $this, 'template_parts_404' ) );
+			add_action( 'astra_404_content_template', array( $this, 'template_parts_404' ) );
+
+			// Content top and bottom.
+			add_action( 'astra_template_parts_content_top', array( $this, 'template_parts_content_top' ) );
+			add_action( 'astra_template_parts_content_bottom', array( $this, 'template_parts_content_bottom' ) );
+
+			// Add closing and ending div 'ast-row'.
+			add_action( 'astra_template_parts_content_top', array( $this, 'astra_templat_part_wrap_open' ), 25 );
+			add_action( 'astra_template_parts_content_bottom', array( $this, 'astra_templat_part_wrap_close' ), 5 );
+		}
+
+		/**
+		 * Template part none
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_none() {
+			if ( is_archive() || is_search() ) {
+				get_template_part( 'template-parts/content', 'none' );
+			}
+		}
+
+		/**
+		 * Template part 404
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_404() {
+			if ( is_404() ) {
+				get_template_part( 'template-parts/content', '404' );
+			}
+		}
+
+		/**
+		 * Template part page
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_page() {
+			get_template_part( 'template-parts/content', 'page' );
+		}
+
+		/**
+		 * Template part single
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_post() {
+			if ( is_single() ) {
+				get_template_part( 'template-parts/content', 'single' );
+			}
+		}
+
+		/**
+		 * Template part search
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_search() {
+			if ( is_search() ) {
+				get_template_part( 'template-parts/content', 'blog' );
+			}
+		}
+
+		/**
+		 * Template part comments
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_comments() {
+			if ( is_single() || is_page() ) {
+				// If comments are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) :
+					comments_template();
+				endif;
+			}
+		}
+
+		/**
+		 * Template part default
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_default() {
+			if ( ! is_page() && ! is_single() && ! is_search() && ! is_404() ) {
+				/*
+				 * Include the Post-Format-specific template for the content.
+				 * If you want to override this in a child theme, then include a file
+				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+				 */
+				get_template_part( 'template-parts/content', astra_get_post_format() );
+			}
+		}
+
+		/**
+		 * Loop Markup for content page
+		 *
+		 * @since 1.3.1
+		 */
+		public function loop_markup_page() {
+			$this->loop_markup( true );
+		}
+
+		/**
+		 * Template part loop
+		 *
+		 * @param  boolean $is_page Loop outputs different content action for content page and default content.
+		 *         if is_page is set to true - do_action( 'astra_page_template_parts_content' ); is added
+		 *         if is_page is false - do_action( 'astra_template_parts_content' ); is added.
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function loop_markup( $is_page = false ) {
+			?>
+			<main id="main" class="site-main">
+				<?php 
+				if ( have_posts() ) :
+					do_action( 'astra_template_parts_content_top' );
+
+					while ( have_posts() ) :
+						the_post();
+
+						if ( true === $is_page ) {
+							do_action( 'astra_page_template_parts_content' );
+						} else {
+							do_action( 'astra_template_parts_content' );
+						}
+
+						endwhile;
+					do_action( 'astra_template_parts_content_bottom' );
+					else :
+						do_action( 'astra_template_parts_content_none' );
+					endif; 
+					?>
+			</main><!-- #main -->
+			<?php
+		}
+
+		/**
+		 * Template part content top
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_content_top() {
+			if ( is_archive() ) {
+				astra_content_while_before();
+			}
+		}
+
+		/**
+		 * Template part content bottom
+		 *
+		 * @since 1.2.7
+		 * @return void
+		 */
+		public function template_parts_content_bottom() {
+			if ( is_archive() ) {
+				astra_content_while_after();
+			}
+		}
+
+		/**
+		 * Add wrapper div 'ast-row' for Astra template part.
+		 *
+		 * @since  1.2.7
+		 * @return void
+		 */
+		public function astra_templat_part_wrap_open() {
+			if ( is_archive() || is_search() || is_home() ) {
+				echo '<div class="ast-row">';
+			}
+		}
+
+		/**
+		 * Add closing wrapper div for 'ast-row' after Astra template part.
+		 *
+		 * @since  1.2.7
+		 * @return void
+		 */
+		public function astra_templat_part_wrap_close() {
+			if ( is_archive() || is_search() || is_home() ) {
+				echo '</div>';
+			}
+		}
+
+	}
+
+	/**
+	 * Initialize class object with 'get_instance()' method
+	 */
+	Astra_Loop::get_instance();
+
+endif;
-- 
cgit v1.2.3-70-g09d2