lightspeeddevelopment / lsx

sidebar-sitemap.php

Spacing +5 added lines, -5 removed lines

@@ -9,21 +9,21 @@
 <?php
 	$show_on_front = get_option('show_on_front');
 
-	$layout = get_theme_mod('lsx_layout','2cr');
-	if('posts' == $show_on_front && is_home()){
+	$layout = get_theme_mod('lsx_layout', '2cr');
+	if ('posts' == $show_on_front && is_home()) {
 		$sidebar = 'home';
-	}else{
+	} else {
 		$sidebar = 'sidebar-1';
 	}
 	
-	if ( '1c' !== $layout ) : ?>
+	if ('1c' !== $layout) : ?>
 
 	<?php lsx_sidebars_before(); ?>
 
 	<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
 
 		<?php lsx_sidebar_top(); ?>
-		<h2><?php esc_attr_e( 'Categories', 'lsx' ); ?></h2>
+		<h2><?php esc_attr_e('Categories', 'lsx'); ?></h2>
         <aside id="categories" class="widget widget_categories">
         	<?php echo wp_tag_cloud(array('taxonomy'=>'category')); ?>
         </aside>		

sidebar.php

Spacing +13 added lines, -13 removed lines

@@ -6,8 +6,8 @@ 
  */
 
 // Allow Plugins and themes to disable the sidebar incase of very customized layouts.
-$sidebar_enabled = apply_filters('lsx_sidebar_enable',true);
-if(true !== $sidebar_enabled){return true;}
+$sidebar_enabled = apply_filters('lsx_sidebar_enable', true);
+if (true !== $sidebar_enabled) {return true; }
 ?>
 <?php
 	$show_on_front = get_option('show_on_front');
@@ -17,16 +17,16 @@ 
 		$sidebar = 'home';
 	} else {
 
-		$layout = get_theme_mod('lsx_layout','2cr');
-		$layout = apply_filters( 'lsx_layout', $layout );
+		$layout = get_theme_mod('lsx_layout', '2cr');
+		$layout = apply_filters('lsx_layout', $layout);
 		
-		if('posts' == $show_on_front && is_home()){
+		if ('posts' == $show_on_front && is_home()) {
 			$sidebar = 'home';
-		}else{
+		} else {
 			$sidebar = 'sidebar-1';
 		}
 	}
-	if ( '1c' !== $layout ) : ?>
+	if ('1c' !== $layout) : ?>
 
 	<?php lsx_sidebars_before(); ?>
 
@@ -34,7 +34,7 @@ 
 	
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_home_sidebar_class()); ?>" role="complementary">
 		
-	<?php elseif ( is_page_template('page-templates/template-blog.php') ) : ?>
+	<?php elseif (is_page_template('page-templates/template-blog.php')) : ?>
 	
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
 		
@@ -42,25 +42,25 @@ 
 	
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
 		
-	<?php endif ; ?>
+	<?php endif; ?>
 
 		<?php lsx_sidebar_top(); ?>
 
-		<?php if ( ! dynamic_sidebar( $sidebar ) ) : ?>
+		<?php if ( ! dynamic_sidebar($sidebar)) : ?>
 
 			<aside id="search" class="widget widget_search">
 				<?php get_search_form(); ?>
 			</aside>
 
 			<aside id="archives" class="widget">
-				<h1 class="widget-title"><?php esc_attr_e( 'Archives', 'lsx' ); ?></h1>
+				<h1 class="widget-title"><?php esc_attr_e('Archives', 'lsx'); ?></h1>
 				<ul>
-					<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
+					<?php wp_get_archives(array('type' => 'monthly')); ?>
 				</ul>
 			</aside>
 
 			<aside id="meta" class="widget">
-				<h1 class="widget-title"><?php esc_attr_e( 'Meta', 'lsx' ); ?></h1>
+				<h1 class="widget-title"><?php esc_attr_e('Meta', 'lsx'); ?></h1>
 				<ul>
 					<?php wp_register(); ?>
 					<li><?php wp_loginout(); ?></li>

comment.php

Spacing +6 added lines, -6 removed lines

@@ -1,24 +1,24 @@
 <?php 
-	if ( isset( $GLOBALS['comment_depth'] ) ) {
-		$depth = intval( $GLOBALS['comment_depth'] );
+	if (isset($GLOBALS['comment_depth'])) {
+		$depth = intval($GLOBALS['comment_depth']);
 	} else {
 		$depth = 1;
 	}
 
-	$max_depth = intval( get_option( 'thread_comments_depth' ) );
+	$max_depth = intval(get_option('thread_comments_depth'));
 ?>
 
 <?php echo get_avatar($comment, '64'); ?>
 <div class="media-body">
   <h4 class="media-heading"><?php echo get_comment_author_link(); ?></h4>
-  <time datetime="<?php echo comment_date('c'); ?>"><a href="<?php echo esc_url(get_comment_link($comment->comment_ID)); ?>"><?php printf(esc_html__('%1$s on %2$s', 'lsx'), get_comment_date(),  get_comment_time()); ?></a></time>
+  <time datetime="<?php echo comment_date('c'); ?>"><a href="<?php echo esc_url(get_comment_link($comment->comment_ID)); ?>"><?php printf(esc_html__('%1$s on %2$s', 'lsx'), get_comment_date(), get_comment_time()); ?></a></time>
   <?php edit_comment_link(esc_html__('(Edit)', 'lsx'), '', ''); ?>
   
-  <?php if ( '0' == $comment->comment_approved ) : ?>
+  <?php if ('0' == $comment->comment_approved) : ?>
   <div class="alert alert-info">
     <?php esc_html_e('Your comment is awaiting moderation.', 'lsx'); ?>
   </div>
 <?php endif; ?>
 
 <?php comment_text(); ?>
-<?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $max_depth ) );
\ No newline at end of file
+<?php comment_reply_link(array('depth' => $depth, 'max_depth' => $max_depth));
\ No newline at end of file

inc/lazyload.php

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return;
+if ( ! defined('ABSPATH')) return;
 
 /*
  * LSX Lazy Load Images Class
@@ -25,143 +25,143 @@ 
 	protected static $noscripts   = array();
 
 	static function init() {
-		if ( is_admin() )
+		if (is_admin())
 			return;
 
-		if ( get_theme_mod( 'lsx_lazyload_status', '1' ) === false ) {
+		if (get_theme_mod('lsx_lazyload_status', '1') === false) {
 			self::$enabled = false;
 			return;
 		}
 
-		if ( ! apply_filters( 'lsx_lazyload_is_enabled', true ) ) {
+		if ( ! apply_filters('lsx_lazyload_is_enabled', true)) {
 			self::$enabled = false;
 			return;
 		}
 
-		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'add_scripts' ) );
-		add_action( 'wp_head', array( __CLASS__, 'setup_filters' ), 9999 );
-		add_filter( 'wp_kses_allowed_html', array( __CLASS__, 'kses_allowed_html' ), 10, 2 );
-		add_filter( 'kses_allowed_protocols', array( __CLASS__, 'kses_allowed_protocols' ) );
+		add_action('wp_enqueue_scripts', array(__CLASS__, 'add_scripts'));
+		add_action('wp_head', array(__CLASS__, 'setup_filters'), 9999);
+		add_filter('wp_kses_allowed_html', array(__CLASS__, 'kses_allowed_html'), 10, 2);
+		add_filter('kses_allowed_protocols', array(__CLASS__, 'kses_allowed_protocols'));
 	}
 
 	static function setup_filters() {
 		// WordPress
-		add_filter( 'the_content', array( __CLASS__, 'filter_images' ), 200 );
-		add_filter( 'widget_text', array( __CLASS__, 'filter_images' ), 200 );
-		add_filter( 'post_thumbnail_html', array( __CLASS__, 'filter_images' ), 200 );
-		add_filter( 'get_avatar', array( __CLASS__, 'filter_images' ), 200 );
+		add_filter('the_content', array(__CLASS__, 'filter_images'), 200);
+		add_filter('widget_text', array(__CLASS__, 'filter_images'), 200);
+		add_filter('post_thumbnail_html', array(__CLASS__, 'filter_images'), 200);
+		add_filter('get_avatar', array(__CLASS__, 'filter_images'), 200);
 		
 		// LSX
-		add_filter( 'lsx_lazyload_filter_images', array( __CLASS__, 'filter_images' ), 200 );
+		add_filter('lsx_lazyload_filter_images', array(__CLASS__, 'filter_images'), 200);
 
 		// Envira Gallery
-		add_filter( 'envira_gallery_output_image', array( __CLASS__, 'filter_images' ), 200 );
+		add_filter('envira_gallery_output_image', array(__CLASS__, 'filter_images'), 200);
 	}
 
 	static function add_scripts() {
-		wp_enqueue_script( 'lazysizes', get_template_directory_uri() .'/js/vendor/lazysizes.min.js', array( 'jquery' ), null, true );
+		wp_enqueue_script('lazysizes', get_template_directory_uri() . '/js/vendor/lazysizes.min.js', array('jquery'), null, true);
 		// Plugin that enables use lazysizes in brackground images
 		//wp_enqueue_script( 'lazysizes', get_template_directory_uri() .'/js/vendor/ls.unveilhooks.min.js', array( 'jquery', 'lazysizes' ), null, true );
 	}
 
-	static function filter_images( $content ) {
-		if ( ! self::is_enabled() ) {
+	static function filter_images($content) {
+		if ( ! self::is_enabled()) {
 			return $content;
 		}
 
-		$http_user_agent = sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) );
-		$http_user_agent = ! empty( $http_user_agent ) ? $http_user_agent : '';
+		$http_user_agent = sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']));
+		$http_user_agent = ! empty($http_user_agent) ? $http_user_agent : '';
 
-		if ( is_feed()
+		if (is_feed()
 			|| is_preview()
-			|| intval( get_query_var( 'print' ) ) == 1
-			|| intval( get_query_var( 'printpage' ) ) == 1
-			|| strpos( $http_user_agent, 'Opera Mini' ) !== false
+			|| intval(get_query_var('print')) == 1
+			|| intval(get_query_var('printpage')) == 1
+			|| strpos($http_user_agent, 'Opera Mini') !== false
 		) {
 			return $content;
 		}
 
 		$skip_images_regex = '/class=".*(lazyload|disable-lazyload).*"/';
-		$placeholder_image = apply_filters( 'lsx_lazyload_placeholder_image', 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' );
+		$placeholder_image = apply_filters('lsx_lazyload_placeholder_image', 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
 
 		$matches = array();
 		$search = array();
 		$replace = array();
 		
-		$content = preg_replace_callback( '~<noscript.+?</noscript>~s', 'self::noscripts_remove', $content );
-		preg_match_all( '/<img[^>]*>/', $content, $matches );
+		$content = preg_replace_callback('~<noscript.+?</noscript>~s', 'self::noscripts_remove', $content);
+		preg_match_all('/<img[^>]*>/', $content, $matches);
 
-		foreach ( $matches[0] as $img_html ) {
-			if ( ! ( preg_match( $skip_images_regex, $img_html ) ) ) {
+		foreach ($matches[0] as $img_html) {
+			if ( ! (preg_match($skip_images_regex, $img_html))) {
 				$add_class = false;
 
-				if ( ! preg_match( '/src=[\'"]([^\'"]+)[\'"]/', $img_html ) && preg_match( '/srcset=[\'"]([^\'"]+)[\'"]/', $img_html ) ) {
-					$replace_html = preg_replace( '/<img(.*?)srcset=/i', '<img$1srcset="' . $placeholder_image . '" data-srcset=', $img_html );
+				if ( ! preg_match('/src=[\'"]([^\'"]+)[\'"]/', $img_html) && preg_match('/srcset=[\'"]([^\'"]+)[\'"]/', $img_html)) {
+					$replace_html = preg_replace('/<img(.*?)srcset=/i', '<img$1srcset="' . $placeholder_image . '" data-srcset=', $img_html);
 
-					if ( preg_match( '/sizes=[\'"]([^\'"]+)[\'"]/', $img_html ) ) {
-						$replace_html = preg_replace( '/sizes=/i', 'data-sizes=', $replace_html );
+					if (preg_match('/sizes=[\'"]([^\'"]+)[\'"]/', $img_html)) {
+						$replace_html = preg_replace('/sizes=/i', 'data-sizes=', $replace_html);
 					} else {
-						$replace_html = preg_replace( '/data-srcset=/i', 'data-sizes="auto" data-srcset=', $replace_html );
+						$replace_html = preg_replace('/data-srcset=/i', 'data-sizes="auto" data-srcset=', $replace_html);
 					}
 
 					$add_class = true;
-				} elseif ( preg_match( '/src=[\'"]([^\'"]+)[\'"]/', $img_html ) ) {
-					$replace_html = preg_replace( '/<img(.*?)src=/i', '<img$1src="' . $placeholder_image . '" data-src=', $img_html );
+				} elseif (preg_match('/src=[\'"]([^\'"]+)[\'"]/', $img_html)) {
+					$replace_html = preg_replace('/<img(.*?)src=/i', '<img$1src="' . $placeholder_image . '" data-src=', $img_html);
 
-					if ( preg_match( '/srcset=[\'"]([^\'"]+)[\'"]/', $img_html ) ) {
-						if ( preg_match( '/sizes=[\'"]([^\'"]+)[\'"]/', $img_html ) ) {
-							$replace_html = preg_replace( '/srcset=/i', 'data-srcset=', $replace_html );
-							$replace_html = preg_replace( '/sizes=/i', 'data-sizes=', $replace_html );
+					if (preg_match('/srcset=[\'"]([^\'"]+)[\'"]/', $img_html)) {
+						if (preg_match('/sizes=[\'"]([^\'"]+)[\'"]/', $img_html)) {
+							$replace_html = preg_replace('/srcset=/i', 'data-srcset=', $replace_html);
+							$replace_html = preg_replace('/sizes=/i', 'data-sizes=', $replace_html);
 						} else {
-							$replace_html = preg_replace( '/srcset=/i', 'data-sizes="auto" data-srcset=', $replace_html );
+							$replace_html = preg_replace('/srcset=/i', 'data-sizes="auto" data-srcset=', $replace_html);
 						}
 					}
 
 					$add_class = true;
 				}
 
-				if ( $add_class ) {
-					$replace_html = self::add_class( $replace_html, 'lazyload' );
+				if ($add_class) {
+					$replace_html = self::add_class($replace_html, 'lazyload');
 					$replace_html .= '<noscript>' . $img_html . '</noscript>';
 					
-					array_push( $search, $img_html );
-					array_push( $replace, $replace_html );
+					array_push($search, $img_html);
+					array_push($replace, $replace_html);
 				}
 			}
 		}
 
-		$content = str_replace( $search, $replace, $content );
-		$content = preg_replace_callback( '~' . chr(20) . '([0-9]+)' . chr(20) . '~', 'self::noscripts_restore', $content );
+		$content = str_replace($search, $replace, $content);
+		$content = preg_replace_callback('~' . chr(20) . '([0-9]+)' . chr(20) . '~', 'self::noscripts_restore', $content);
 		return $content;
 	}
 
-	static function noscripts_remove( $match ) {
+	static function noscripts_remove($match) {
 		self::$noscript_id++;
 		self::$noscripts[self::$noscript_id] = $match[0];
 		return chr(20) . self::$noscript_id . chr(20);
 	}
 
-	static function noscripts_restore( $match ) {
+	static function noscripts_restore($match) {
 		return self::$noscripts[(int) $match[1]];
 	}
 
-	static function add_class( $html_string = '', $new_class ) {
+	static function add_class($html_string = '', $new_class) {
 		$pattern = '/class=[\'"]([^\'"]*)[\'"]/';
 
-		if ( preg_match( $pattern, $html_string, $matches ) ) {
-			$defined_classes = explode( ' ', $matches[1] );
+		if (preg_match($pattern, $html_string, $matches)) {
+			$defined_classes = explode(' ', $matches[1]);
 
-			if ( ! in_array( $new_class, $defined_classes ) ) {
+			if ( ! in_array($new_class, $defined_classes)) {
 				$defined_classes[] = $new_class;
 
 				$html_string = str_replace(
 					$matches[0],
-					sprintf( 'class="%s"', implode( ' ', $defined_classes ) ),
+					sprintf('class="%s"', implode(' ', $defined_classes)),
 					$html_string
 				);
 			}
 		} else {
-			$html_string = preg_replace( '/(\<.+\s)/', sprintf( '$1class="%s" ', $new_class ), $html_string );
+			$html_string = preg_replace('/(\<.+\s)/', sprintf('$1class="%s" ', $new_class), $html_string);
 		}
 
 		return $html_string;
@@ -171,7 +171,7 @@ 
 		return self::$enabled;
 	}
 
-	static function kses_allowed_html( $allowedtags, $context ) {
+	static function kses_allowed_html($allowedtags, $context) {
 		$allowedtags['noscript'] = array();
 		
 		$allowedtags['img']['data-src'] = true;
@@ -181,10 +181,10 @@ 
 		return $allowedtags;
 	}
 
-	static function kses_allowed_protocols( $allowedprotocols ) {
+	static function kses_allowed_protocols($allowedprotocols) {
 		$allowedprotocols[] = 'data';
 		return $allowedprotocols;
 	}
 }
 
-add_action( 'init', array( 'LSX_LazyLoadImages', 'init' ) );
+add_action('init', array('LSX_LazyLoadImages', 'init'));

inc/jetpack.php

Spacing +102 added lines, -102 removed lines

@@ -19,8 +19,8 @@ 
  */
 function lsx_allowed_related_post_types($allowed_post_types) {
 	$allowed_post_types[] = 'jetpack-portfolio';
-	foreach($allowed_post_types as $key => $value){
-		if('page' == $value){
+	foreach ($allowed_post_types as $key => $value) {
+		if ('page' == $value) {
 			unset($allowed_post_types[$key]);
 		}
 	}
@@ -35,12 +35,12 @@ 
  * @category site-logo
  */
 
-function lsx_site_logo_title_tag( $html) {
+function lsx_site_logo_title_tag($html) {
 
-	$html = str_replace('<a', '<a title="'.get_bloginfo('name').'" ', $html);
+	$html = str_replace('<a', '<a title="' . get_bloginfo('name') . '" ', $html);
 	return $html;
 }
-add_filter( 'jetpack_the_site_logo', 'lsx_site_logo_title_tag');
+add_filter('jetpack_the_site_logo', 'lsx_site_logo_title_tag');
 
 
 /*
@@ -54,19 +54,19 @@ 
  * @subpackage jetpack
  * @category portfolio
  */
-function lsx_portfolio_infinite_scroll(){
-	global $_wp_theme_features,$wp_query;
+function lsx_portfolio_infinite_scroll() {
+	global $_wp_theme_features, $wp_query;
 
-	if(is_post_type_archive('jetpack-portfolio') || is_tax('jetpack-portfolio-type') || is_tax('jetpack-portfolio-tag')){
+	if (is_post_type_archive('jetpack-portfolio') || is_tax('jetpack-portfolio-type') || is_tax('jetpack-portfolio-tag')) {
 		
-		if(class_exists('The_Neverending_Home_Page')){
+		if (class_exists('The_Neverending_Home_Page')) {
 			$_wp_theme_features['infinite-scroll'][0]['container'] = 'portfolio-infinite-scroll-wrapper';
 			$_wp_theme_features['infinite-scroll'][0]['posts_per_page'] = 99;
 		}
 	}
 
 }
-add_action('wp_head','lsx_portfolio_infinite_scroll',1000);
+add_action('wp_head', 'lsx_portfolio_infinite_scroll', 1000);
 
 /**
  * Disables the infinite scroll on the portfolio archive
@@ -75,13 +75,13 @@ 
  * @subpackage jetpack
  * @category portfolio
  */
-function lsx_portfolio_infinite_scroll_disable($supported){
-	if(is_post_type_archive('jetpack-portfolio')){
+function lsx_portfolio_infinite_scroll_disable($supported) {
+	if (is_post_type_archive('jetpack-portfolio')) {
 		$supported = false;
 	}
 	return $supported;
 }
-add_filter( 'infinite_scroll_archive_supported', 'lsx_portfolio_infinite_scroll_disable', 1, 10 );
+add_filter('infinite_scroll_archive_supported', 'lsx_portfolio_infinite_scroll_disable', 1, 10);
 
 /**
  * Set the Portfolio to 9 posts per page
@@ -90,14 +90,14 @@ 
  * @subpackage jetpack
  * @category portfolio
 */
-function lsx_portfolio_archive_pagination( $query ) {
-	if(!is_admin()){
-		if ( $query->is_post_type_archive(array('jetpack-portfolio')) && $query->is_main_query() && class_exists('The_Neverending_Home_Page')) {
-			$query->set( 'posts_per_page', -1 );
+function lsx_portfolio_archive_pagination($query) {
+	if ( ! is_admin()) {
+		if ($query->is_post_type_archive(array('jetpack-portfolio')) && $query->is_main_query() && class_exists('The_Neverending_Home_Page')) {
+			$query->set('posts_per_page', -1);
 		}
 	}
 }
-add_action( 'pre_get_posts', 'lsx_portfolio_archive_pagination' , 100 );
+add_action('pre_get_posts', 'lsx_portfolio_archive_pagination', 100);
 
 /**
  * Remove the related posts from below the content area.
@@ -107,13 +107,13 @@ 
  * @category portfolio
  */
 function lsx_remove_portfolio_related_posts() {
-	if ( is_single() && 'jetpack-portfolio' == get_post_type() && class_exists( 'Jetpack_RelatedPosts' ) ) {
+	if (is_single() && 'jetpack-portfolio' == get_post_type() && class_exists('Jetpack_RelatedPosts')) {
 		$jprp = Jetpack_RelatedPosts::init();
-		$callback = array( $jprp, 'filter_add_target_to_dom' );
-		remove_filter( 'the_content', $callback, 40 );
+		$callback = array($jprp, 'filter_add_target_to_dom');
+		remove_filter('the_content', $callback, 40);
 	}
 }
-add_filter( 'wp', 'lsx_remove_portfolio_related_posts', 20 );
+add_filter('wp', 'lsx_remove_portfolio_related_posts', 20);
 
 /**
  * Remove the related posts from below the content area.
@@ -123,13 +123,13 @@ 
  * @category portfolio
  */
 function lsx_remove_single_related_posts() {
-    if ( is_single() && class_exists( 'Jetpack_RelatedPosts' ) ) {
+    if (is_single() && class_exists('Jetpack_RelatedPosts')) {
         $jprp = Jetpack_RelatedPosts::init();
-        $callback = array( $jprp, 'filter_add_target_to_dom' );
-        remove_filter( 'the_content', $callback, 40 );
+        $callback = array($jprp, 'filter_add_target_to_dom');
+        remove_filter('the_content', $callback, 40);
     }
 }
-add_filter( 'wp', 'lsx_remove_single_related_posts', 20 );
+add_filter('wp', 'lsx_remove_single_related_posts', 20);
 
 /**
  * A template tag to call the Portfolios Related posts
@@ -138,8 +138,8 @@ 
  * @subpackage jetpack
  * @category portfolio
  */
-function lsx_portfolio_related_posts(){
-	if(class_exists('Jetpack_RelatedPosts')){ ?>
+function lsx_portfolio_related_posts() {
+	if (class_exists('Jetpack_RelatedPosts')) { ?>
 		<div class="row">
 			<div class="col-md-12">
 				<?php echo do_shortcode('[jetpack-related-posts]'); ?>
@@ -156,16 +156,16 @@ 
  * @category portfolio
  */
 function lsx_portfolio_remove_share() {
-	if ( ( is_single() && 'jetpack-portfolio' == get_post_type() ) || is_page_template( 'page-templates/template-portfolio.php' ) ) {
-		remove_filter( 'the_content', 'sharing_display',19 );
-		remove_filter( 'the_excerpt', 'sharing_display',19 );
+	if ((is_single() && 'jetpack-portfolio' == get_post_type()) || is_page_template('page-templates/template-portfolio.php')) {
+		remove_filter('the_content', 'sharing_display', 19);
+		remove_filter('the_excerpt', 'sharing_display', 19);
 
-		if ( class_exists( 'Jetpack_Likes' ) ) {
-			remove_filter( 'the_content', array( Jetpack_Likes::init(), 'post_likes' ), 30, 1 );
+		if (class_exists('Jetpack_Likes')) {
+			remove_filter('the_content', array(Jetpack_Likes::init(), 'post_likes'), 30, 1);
 		}
 	}
 }
-add_action( 'loop_start', 'lsx_portfolio_remove_share' );
+add_action('loop_start', 'lsx_portfolio_remove_share');
 
 /**
  * Remove the sharing from single
@@ -175,16 +175,16 @@ 
  * @category post
  */
 function lsx_single_remove_share() {
-	if ( is_single() ) {
-		remove_filter( 'the_content', 'sharing_display',19 );
-		remove_filter( 'the_excerpt', 'sharing_display',19 );
+	if (is_single()) {
+		remove_filter('the_content', 'sharing_display', 19);
+		remove_filter('the_excerpt', 'sharing_display', 19);
 
-		if ( class_exists( 'Jetpack_Likes' ) ) {
-			remove_filter( 'the_content', array( Jetpack_Likes::init(), 'post_likes' ), 30, 1 );
+		if (class_exists('Jetpack_Likes')) {
+			remove_filter('the_content', array(Jetpack_Likes::init(), 'post_likes'), 30, 1);
 		}
 	}
 }
-add_action( 'loop_start', 'lsx_single_remove_share' );
+add_action('loop_start', 'lsx_single_remove_share');
 
 /**
  * Redirect the template archive to our one
@@ -193,18 +193,18 @@ 
  * @subpackage jetpack
  * @category portfolio
 */
-function lsx_portfolio_taxonomy_template( $template ) {
+function lsx_portfolio_taxonomy_template($template) {
 
-	if ( is_tax(array('jetpack-portfolio-type','jetpack-portfolio-tag'))  ) {
-		$new_template = locate_template( array( 'archive-jetpack-portfolio.php' ) );
-		if ( '' != $new_template ) {
-			return $new_template ;
+	if (is_tax(array('jetpack-portfolio-type', 'jetpack-portfolio-tag'))) {
+		$new_template = locate_template(array('archive-jetpack-portfolio.php'));
+		if ('' != $new_template) {
+			return $new_template;
 		}
 	}
 
 	return $template;
 }
-add_filter( 'template_include', 'lsx_portfolio_taxonomy_template', 99 );
+add_filter('template_include', 'lsx_portfolio_taxonomy_template', 99);
 
 
 /**
@@ -214,43 +214,43 @@ 
  * @subpackage jetpack
  * @category portfolio
  */
-add_action( 'add_meta_boxes', 'lsx_add_portfolio_post_meta_boxes' );
-add_action( 'save_post', 'lsx_save_portfolio_post_meta', 100, 2 );
+add_action('add_meta_boxes', 'lsx_add_portfolio_post_meta_boxes');
+add_action('save_post', 'lsx_save_portfolio_post_meta', 100, 2);
 
-function lsx_save_portfolio_post_meta( $post_id, $post ) {
-	if ( 'jetpack-portfolio' != $post->post_type ) {
+function lsx_save_portfolio_post_meta($post_id, $post) {
+	if ('jetpack-portfolio' != $post->post_type) {
 		return;
 	}
 
-	if ( ! isset( $_POST['lsx-website'] ) && ! isset( $_POST['lsx-client'] ) ) {
+	if ( ! isset($_POST['lsx-website']) && ! isset($_POST['lsx-client'])) {
 		return;
 	}
 
-	$post_type = get_post_type_object( $post->post_type );
+	$post_type = get_post_type_object($post->post_type);
 
-	if ( ! current_user_can( $post_type->cap->edit_post, $post_id ) ) {
+	if ( ! current_user_can($post_type->cap->edit_post, $post_id)) {
 		return;
 	}
 
-	check_admin_referer( 'lsx_save_portfolio', '_lsx_client_nonce' );
-	check_admin_referer( 'lsx_save_portfolio', '_lsx_website_nonce' );
+	check_admin_referer('lsx_save_portfolio', '_lsx_client_nonce');
+	check_admin_referer('lsx_save_portfolio', '_lsx_website_nonce');
 
-	$meta_keys = array('lsx-website','lsx-client');
+	$meta_keys = array('lsx-website', 'lsx-client');
 
-	foreach($meta_keys as $meta_key){
-		$new_meta_value = sanitize_text_field( wp_unslash( $_POST[$meta_key] ) );
-		$new_meta_value = ! empty( $new_meta_value ) ? $new_meta_value : '';
+	foreach ($meta_keys as $meta_key) {
+		$new_meta_value = sanitize_text_field(wp_unslash($_POST[$meta_key]));
+		$new_meta_value = ! empty($new_meta_value) ? $new_meta_value : '';
 
-		$meta_value = get_post_meta( $post_id, $meta_key, true );
+		$meta_value = get_post_meta($post_id, $meta_key, true);
 
-		if ( $new_meta_value && '' == $meta_value )
-			add_post_meta( $post_id, $meta_key, $new_meta_value, true );
+		if ($new_meta_value && '' == $meta_value)
+			add_post_meta($post_id, $meta_key, $new_meta_value, true);
 
-		elseif ( $new_meta_value && $new_meta_value != $meta_value )
-		update_post_meta( $post_id, $meta_key, $new_meta_value );
+		elseif ($new_meta_value && $new_meta_value != $meta_value)
+		update_post_meta($post_id, $meta_key, $new_meta_value);
 
-		elseif ( '' == $new_meta_value && $meta_value )
-		delete_post_meta( $post_id, $meta_key, $meta_value );
+		elseif ('' == $new_meta_value && $meta_value)
+		delete_post_meta($post_id, $meta_key, $meta_value);
 	}
 }
 
@@ -258,7 +258,7 @@ 
 
 	add_meta_box(
 	'lsx_client_meta_box',
-	esc_html__( 'Client', 'lsx' ),
+	esc_html__('Client', 'lsx'),
 	'lsx_client_meta_box',
 	'jetpack-portfolio',
 	'side',
@@ -267,7 +267,7 @@ 
 
 	add_meta_box(
 	'lsx_website_meta_box',
-	esc_html__( 'Website', 'lsx' ),
+	esc_html__('Website', 'lsx'),
 	'lsx_website_meta_box',
 	'jetpack-portfolio',
 	'side',
@@ -275,25 +275,25 @@ 
 			);
 }
 
-function lsx_client_meta_box( $object, $box ) { ?>
+function lsx_client_meta_box($object, $box) { ?>
 
-  <?php wp_nonce_field( 'lsx_save_portfolio', '_lsx_client_nonce' ); ?>
+  <?php wp_nonce_field('lsx_save_portfolio', '_lsx_client_nonce'); ?>
 
   <p>
-    <input class="widefat" type="text" name="lsx-client" id="lsx-client" value="<?php echo esc_attr( get_post_meta( $object->ID, 'lsx-client', true ) ); ?>" size="30" />
+    <input class="widefat" type="text" name="lsx-client" id="lsx-client" value="<?php echo esc_attr(get_post_meta($object->ID, 'lsx-client', true)); ?>" size="30" />
     <br /><br />
-    <label for="lsx-client"><?php esc_html_e( 'Enter the name of the project client', 'lsx' ); ?></label>
+    <label for="lsx-client"><?php esc_html_e('Enter the name of the project client', 'lsx'); ?></label>
   </p>
 <?php }
 
-function lsx_website_meta_box( $object, $box ) { ?>
+function lsx_website_meta_box($object, $box) { ?>
 
-  <?php wp_nonce_field( 'lsx_save_portfolio', '_lsx_website_nonce' ); ?>
+  <?php wp_nonce_field('lsx_save_portfolio', '_lsx_website_nonce'); ?>
 
   <p>
-    <input class="widefat" type="text" name="lsx-website" id="lsx-website" value="<?php echo esc_attr( get_post_meta( $object->ID, 'lsx-website', true ) ); ?>" size="30" />
+    <input class="widefat" type="text" name="lsx-website" id="lsx-website" value="<?php echo esc_attr(get_post_meta($object->ID, 'lsx-website', true)); ?>" size="30" />
     <br /><br />
-    <label for="lsx-website"><?php esc_html_e( 'Enter the URL of the project website', 'lsx' ); ?></label>
+    <label for="lsx-website"><?php esc_html_e('Enter the URL of the project website', 'lsx'); ?></label>
   </p>
 <?php }
 
@@ -306,18 +306,18 @@ 
  * @category portfolio
  */   
 
-function lsx_portfolio_sorter(){ ?>
+function lsx_portfolio_sorter() { ?>
 	<ul id="filterNav" class="clearfix">
-		<li class="allBtn"><a href="#" data-filter="*" class="selected"><?php esc_html_e( 'All', 'lsx' ); ?></a></li>
+		<li class="allBtn"><a href="#" data-filter="*" class="selected"><?php esc_html_e('All', 'lsx'); ?></a></li>
 		<?php 
 		$types = get_terms('jetpack-portfolio-type');
 		
-		if(is_array($types)){
+		if (is_array($types)) {
 			foreach ($types as $type) {
-				$content = '<li><a href="#" data-filter=".'.$type->slug.'">';
+				$content = '<li><a href="#" data-filter=".' . $type->slug . '">';
 		    	$content .= $type->name;					
 				$content .= '</a></li>';
-				echo wp_kses_post( $content );
+				echo wp_kses_post($content);
 				echo "\n";
 			}
 		}?>
@@ -332,18 +332,18 @@ 
  * @category portfolio
  */
 
-function lsx_portfolio_naviagtion_labels($labels){ 
+function lsx_portfolio_naviagtion_labels($labels) { 
 	
-	if(is_post_type_archive('jetpack-portfolio')){
+	if (is_post_type_archive('jetpack-portfolio')) {
 		$labels = array(
-				'next' 		=> '<span class="meta-nav">&larr;</span> '.__( 'Older', 'lsx' ),
-				'previous' 	=> __( 'Newer', 'lsx' ).' <span class="meta-nav">&rarr;</span>',
-				'title' 	=> __( 'Portfolio navigation', 'lsx' )
+				'next' 		=> '<span class="meta-nav">&larr;</span> ' . __('Older', 'lsx'),
+				'previous' 	=> __('Newer', 'lsx') . ' <span class="meta-nav">&rarr;</span>',
+				'title' 	=> __('Portfolio navigation', 'lsx')
 		);
 	}
 	return $labels;
 }
-add_filter('lsx_post_navigation_labels','lsx_portfolio_naviagtion_labels',1,10);
+add_filter('lsx_post_navigation_labels', 'lsx_portfolio_naviagtion_labels', 1, 10);
 
 
 /*
@@ -357,11 +357,11 @@ 
  * @subpackage jetpack
  * @category related-posts
  */
-function lsx_remove_related_post_context(){
-	add_filter( 'jetpack_relatedposts_filter_post_context', '__return_empty_string' );
-	add_filter( 'rest_api_allowed_post_types', 'lsx_allowed_related_post_types' );
+function lsx_remove_related_post_context() {
+	add_filter('jetpack_relatedposts_filter_post_context', '__return_empty_string');
+	add_filter('rest_api_allowed_post_types', 'lsx_allowed_related_post_types');
 }
-add_action('init','lsx_remove_related_post_context',20);
+add_action('init', 'lsx_remove_related_post_context', 20);
 
 
 /*
@@ -378,13 +378,13 @@ 
 	$infinite_scroll_args = array(
 			'container' => 'main',
 			'type' => 'click',
-			'posts_per_page' => get_option('posts_per_page',10),
+			'posts_per_page' => get_option('posts_per_page', 10),
 			'render'    => 'lsx_infinite_scroll_render'
 	);
 
-	add_theme_support( 'infinite-scroll', $infinite_scroll_args );
+	add_theme_support('infinite-scroll', $infinite_scroll_args);
 }
-add_action( 'after_setup_theme', 'lsx_jetpack_infinite_scroll_after_setup' );
+add_action('after_setup_theme', 'lsx_jetpack_infinite_scroll_after_setup');
 
 /**
  * Set the code to be rendered on for calling posts,
@@ -397,13 +397,13 @@ 
  function lsx_infinite_scroll_render() {
 	global $wp_query;
 	
-	while(have_posts()){
+	while (have_posts()) {
 		the_post();
 		
-		if('jetpack-portfolio' == get_post_type()){
-			get_template_part( 'content', 'portfolio' );
-		}else{
-			get_template_part( 'content', get_post_type() );
+		if ('jetpack-portfolio' == get_post_type()) {
+			get_template_part('content', 'portfolio');
+		} else {
+			get_template_part('content', get_post_type());
 		}
 	}
  }
@@ -415,8 +415,8 @@ 
  * @subpackage jetpack
  * @category related posts
  */
-function lsx_related_posts_headline( $headline ) {
-	$headline = sprintf( '<h3 class="jp-relatedposts-headline"><em>%s</em></h3>', esc_html( 'Related Posts' ) );
+function lsx_related_posts_headline($headline) {
+	$headline = sprintf('<h3 class="jp-relatedposts-headline"><em>%s</em></h3>', esc_html('Related Posts'));
 	return $headline;
 }
-add_filter( 'jetpack_relatedposts_filter_headline', 'lsx_related_posts_headline' );
+add_filter('jetpack_relatedposts_filter_headline', 'lsx_related_posts_headline');

functions.php

Spacing +45 added lines, -45 removed lines

@@ -4,7 +4,7 @@ 
  *
  * @package lsx
  */
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 define('LSX_VERSION', '1.8.0');
 
@@ -21,22 +21,22 @@ 
 require get_template_directory() . '/inc/comment-walker.php';
 require get_template_directory() . '/inc/jetpack.php';
 require get_template_directory() . '/inc/lazyload.php';
-if(class_exists('BuddyPress')){
+if (class_exists('BuddyPress')) {
 	require get_template_directory() . '/inc/buddypress.php';
 }
-if(class_exists('WooCommerce')){
+if (class_exists('WooCommerce')) {
 	require get_template_directory() . '/inc/woocommerce.php';
 }
-if(class_exists('WP_Job_Manager')){
+if (class_exists('WP_Job_Manager')) {
 	require get_template_directory() . '/inc/wp-job-manager.php';
 }
-if(class_exists('Tribe__Events__Main')){
+if (class_exists('Tribe__Events__Main')) {
 	require get_template_directory() . '/inc/the-events-calendar.php';
 }
 require get_template_directory() . '/inc/template-tags.php';
 require get_template_directory() . '/inc/extras.php';
 require get_template_directory() . '/inc/wp-bootstrap-navwalker.php';
-if(class_exists('Sensei_WC')){
+if (class_exists('Sensei_WC')) {
 	require get_template_directory() . '/inc/sensei.php';
 }
 
@@ -48,10 +48,10 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_customizer_core_controls( $lsx_controls ) {
+function lsx_customizer_core_controls($lsx_controls) {
 	$lsx_controls['sections']['lsx-core'] = array(
-		'title'       =>  esc_html__( 'Core Settings', 'lsx' ),
-		'description' => __( 'Change the core settings.', 'lsx' ),
+		'title'       =>  esc_html__('Core Settings', 'lsx'),
+		'description' => __('Change the core settings.', 'lsx'),
 		'priority'    => 21
 	);
 
@@ -62,7 +62,7 @@ 
 	);
 
 	$lsx_controls['fields']['lsx_lazyload_status'] = array(
-		'label'         =>  __( 'Lazy Loading Images', 'lsx' ),
+		'label'         =>  __('Lazy Loading Images', 'lsx'),
 		'section'       =>  'lsx-core',
 		'type'          =>  'checkbox',
 	);
@@ -74,14 +74,14 @@ 
 	);
 
 	$lsx_controls['fields']['lsx_preloader_content_status'] = array(
-		'label'         =>  __( 'Preloader Content', 'lsx' ),
+		'label'         =>  __('Preloader Content', 'lsx'),
 		'section'       =>  'lsx-core',
 		'type'          =>  'checkbox',
 	);
 
 	return $lsx_controls;
 }
-add_filter( 'lsx_customizer_controls', 'lsx_customizer_core_controls' );
+add_filter('lsx_customizer_controls', 'lsx_customizer_core_controls');
 
 /**
  * Returns an array of the colour scheme picker.
@@ -91,7 +91,7 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_customizer_colour_scheme_controls( $lsx_controls ) {
+function lsx_customizer_colour_scheme_controls($lsx_controls) {
 	global $customizer_colour_names;
 	global $customizer_colour_choices;
 	
@@ -102,7 +102,7 @@ 
 	);
 
 	$lsx_controls['fields']['color_scheme'] = array(
-		'label'         =>  esc_html__( 'Base Color Scheme', 'lsx' ),
+		'label'         =>  esc_html__('Base Color Scheme', 'lsx'),
 		'section'       =>  'colors',
 		'type'          =>  'select',
 		'priority'      =>  1,
@@ -110,10 +110,10 @@ 
 		'choices'       =>  $customizer_colour_choices
 	);
 
-	foreach ( $customizer_colour_names as $key => $value ) {
+	foreach ($customizer_colour_names as $key => $value) {
 		$sanitize_callback = 'sanitize_hex_color';
 
-		if ( 'background_color' === $key ) {
+		if ('background_color' === $key) {
 			$sanitize_callback = 'sanitize_hex_color_no_hash';
 		}
 
@@ -133,7 +133,7 @@ 
 
 	return $lsx_controls;
 }
-add_filter( 'lsx_customizer_controls', 'lsx_customizer_colour_scheme_controls' );
+add_filter('lsx_customizer_controls', 'lsx_customizer_colour_scheme_controls');
 
 /**
  * Returns an array of the layout panel.
@@ -144,56 +144,56 @@ 
  * @return		$lsx_controls array()
  */
 function lsx_customizer_layout_controls($lsx_controls) {
-	$lsx_controls['settings']['lsx_header_layout']  = array(
+	$lsx_controls['settings']['lsx_header_layout'] = array(
 			'default'       =>  'inline', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_layout'] = array(
-			'label'         =>  __('Header','lsx'),
+			'label'         =>  __('Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'control'   =>  'LSX_Customize_Header_Layout_Control',
-			'choices'		=>	array('central','expanded','inline')
+			'choices'		=>	array('central', 'expanded', 'inline')
 	);	
 	$lsx_controls['sections']['lsx-layout'] = array(
-			'title'       =>  esc_html__( 'Layout', 'lsx' ),
-			'description' => __( 'Change the layout sitewide. If your homepage is set to use a page with a template, the following will not apply to it.', 'lsx' ),
+			'title'       =>  esc_html__('Layout', 'lsx'),
+			'description' => __('Change the layout sitewide. If your homepage is set to use a page with a template, the following will not apply to it.', 'lsx'),
 			'priority' => 22
 	);
-	$lsx_controls['settings']['lsx_layout']  = array(
+	$lsx_controls['settings']['lsx_layout'] = array(
 			'default'       =>  '2cr', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
-	$lsx_controls['settings']['lsx_header_fixed']  = array(
+	$lsx_controls['settings']['lsx_header_fixed'] = array(
 			'default'       =>  false, //Default setting/value to save
 			'sanitize_callback' => 'lsx_sanitize_checkbox',
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_fixed'] = array(
-			'label'         =>  __('Fixed Header','lsx'),
+			'label'         =>  __('Fixed Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'type'       =>  'checkbox',
 	);
-	$lsx_controls['settings']['lsx_header_search']  = array(
+	$lsx_controls['settings']['lsx_header_search'] = array(
 			'default'       =>  false, //Default setting/value to save
 			'sanitize_callback' => 'lsx_sanitize_checkbox',
 			'transport'     =>  'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 	);
 	$lsx_controls['fields']['lsx_header_search'] = array(
-			'label'         =>  __('Search Box in Header','lsx'),
+			'label'         =>  __('Search Box in Header', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'type'       =>  'checkbox',
 	);	
 	$lsx_controls['fields']['lsx_layout'] = array(
-			'label'         =>  __('Body','lsx'),
+			'label'         =>  __('Body', 'lsx'),
 			'section'       =>  'lsx-layout',
 			'control'   =>  'LSX_Customize_Layout_Control',
-			'choices'		=>	array('1c','2cr','2cl')
+			'choices'		=>	array('1c', '2cr', '2cl')
 	);	
 	return $lsx_controls;
 }
-add_filter('lsx_customizer_controls','lsx_customizer_layout_controls');
+add_filter('lsx_customizer_controls', 'lsx_customizer_layout_controls');
 
 /**
  * Returns an array of the font controls.
@@ -205,11 +205,11 @@ 
  */
 function lsx_customizer_font_controls($lsx_controls) {
 	$lsx_controls['sections']['lsx-font'] = array(
-			'title'       =>  __( 'Font', 'lsx' ),
+			'title'       =>  __('Font', 'lsx'),
 			'description' => 'Change the fonts sitewide.',
 			'priority' => 41
 	);
-	$lsx_controls['settings']['lsx_font']  = array(
+	$lsx_controls['settings']['lsx_font'] = array(
 			'default'       =>  'raleway_open_sans', //Default setting/value to save
 			'type'        =>  'theme_mod', //Is this an 'option' or a 'theme_mod'?
 			'transport'     =>  'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
@@ -223,13 +223,13 @@ 
 			'choices'   =>  array(
 					'raleway_open_sans' => array(
 							'header'  => array(
-									"title" => __( 'Raleway', 'lsx' ),
+									"title" => __('Raleway', 'lsx'),
 									"location" => "Raleway",
 									"cssDeclaration" => "'Raleway', sans-serif",
 									"cssClass" => "raleway",
 							),
 							'body'  => array(
-									"title" => __( 'Open Sans', 'lsx' ),
+									"title" => __('Open Sans', 'lsx'),
 									"location" => "Open+Sans",
 									"cssDeclaration" => "'Open Sans', sans-serif",
 									"cssClass" => "openSans"
@@ -237,13 +237,13 @@ 
 					),
 					'noto_serif_noto_sans' => array(
 							'header'  => array(
-									"title" => __( 'Noto Serif', 'lsx' ),
+									"title" => __('Noto Serif', 'lsx'),
 									"location" => "Noto+Serif",
 									"cssDeclaration" => "'Noto Serif', serif",
 									"cssClass" => "notoSerif",
 							),
 							'body'  => array(
-									"title" => __( 'Noto Sans', 'lsx' ),
+									"title" => __('Noto Sans', 'lsx'),
 									"location" => "Noto+Sans",
 									"cssDeclaration" => "'Noto Sans', sans-serif",
 									"cssClass" => "notoSans",
@@ -251,13 +251,13 @@ 
 					),
 					'noto_sans_noto_sans' => array(
 					'header'  => array(
-					"title" => __( 'Noto Sans', 'lsx' ),
+					"title" => __('Noto Sans', 'lsx'),
 					"location" => "Noto+Sans",
 					"cssDeclaration" => "'Noto Sans', sans-serif",
 					"cssClass" => "notoSans",
 					),
 					'body'  => array(
-					"title" => __( 'Noto Sans', 'lsx' ),
+					"title" => __('Noto Sans', 'lsx'),
 					"location" => "Noto+Sans",
 					"cssDeclaration" => "'Noto Sans', sans-serif",
 					"cssClass" => "notoSans",
@@ -265,13 +265,13 @@ 
 					),
 					'alegreya_open_sans' => array(
 					'header'  => array(
-					"title" => __( 'Alegreya', 'lsx' ),
+					"title" => __('Alegreya', 'lsx'),
 					"location" => "Alegreya",
 					"cssDeclaration" => "'Alegreya', serif",
 					"cssClass" => "alegreya",
 					),
 					'body'  => array(
-					"title" => __( 'Open Sans', 'lsx' ),
+					"title" => __('Open Sans', 'lsx'),
 					"location" => "Open+Sans",
 					"cssDeclaration" => "'Open Sans', sans-serif",
 					"cssClass" => "openSans"
@@ -282,7 +282,7 @@ 
 	);	
 	return $lsx_controls;
 }
-add_filter('lsx_customizer_controls','lsx_customizer_font_controls');
+add_filter('lsx_customizer_controls', 'lsx_customizer_font_controls');
 
 /**
  * Returns an array of $controls for the customizer class to generate.
@@ -292,12 +292,12 @@ 
  * @category	customizer
  * @return		$lsx_controls array()
  */
-function lsx_get_customizer_controls(){
+function lsx_get_customizer_controls() {
 	$lsx_controls = array();
 	$lsx_controls = apply_filters('lsx_customizer_controls', $lsx_controls);
 	return $lsx_controls;
 }
-$lsx_customizer = new LSX_Theme_Customizer( lsx_get_customizer_controls() );
+$lsx_customizer = new LSX_Theme_Customizer(lsx_get_customizer_controls());
 
-add_image_size( 'lsx-thumbnail-wide', 350, 230, true );
-add_image_size( 'lsx-thumbnail-single', 750, 350, true );
\ No newline at end of file
+add_image_size('lsx-thumbnail-wide', 350, 230, true);
+add_image_size('lsx-thumbnail-single', 750, 350, true);
\ No newline at end of file

inc/customizer.php

Spacing +43 added lines, -43 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 /**
  * Customizer Configuration File
@@ -9,7 +9,7 @@ 
  * @author  warwick@feedmymedia.com <lsdev.biz>
  * 
  */
-if ( ! class_exists( 'LSX_Theme_Customizer' ) ) {
+if ( ! class_exists('LSX_Theme_Customizer')) {
 	
 	class LSX_Theme_Customizer {
 
@@ -29,7 +29,7 @@ 
 		 *
 		 * @since     1.0.0
 		 */
-		public function __construct( $controls ) {
+		public function __construct($controls) {
 			require get_template_directory() . '/inc/google-font.php';
 			require get_template_directory() . '/inc/google-font-collection.php';
 			require get_template_directory() . '/inc/customizer-core.php';
@@ -40,19 +40,19 @@ 
 
 			$this->controls = $controls;
 
-			add_action( 'customize_preview_init', array($this,'customize_preview_js' ),20);
-			add_action( 'customize_register', array($this,'customizer'), 11 );
+			add_action('customize_preview_init', array($this, 'customize_preview_js'), 20);
+			add_action('customize_register', array($this, 'customizer'), 11);
 			
-			add_action( 'wp_ajax_customizer_site_title', array($this,'ajax_site_title') );
-			add_action( 'wp_ajax_nopriv_customizer_site_title', array($this,'ajax_site_title') );
+			add_action('wp_ajax_customizer_site_title', array($this, 'ajax_site_title'));
+			add_action('wp_ajax_nopriv_customizer_site_title', array($this, 'ajax_site_title'));
 		}
 		
 		/**
 		 * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
 		 */
 		function customize_preview_js() {
-			wp_enqueue_script( 'lsx_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ) , wp_get_theme()->Version, true );
-			wp_localize_script( 'lsx_customizer', 'lsx_customizer_params', array( 'template_directory' => get_template_directory_uri() ) );
+			wp_enqueue_script('lsx_customizer', get_template_directory_uri() . '/js/customizer.js', array('customize-preview'), wp_get_theme()->Version, true);
+			wp_localize_script('lsx_customizer', 'lsx_customizer_params', array('template_directory' => get_template_directory_uri()));
 		}
 		
 		/**
@@ -60,38 +60,38 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		public function customizer( $wp_customize ) {
+		public function customizer($wp_customize) {
 			// start panels
-			if( !empty( $this->controls['panels'] ) ){
-				foreach( $this->controls['panels'] as $panel_slug => $args ){
-					$this->add_panel( $panel_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['panels'])) {
+				foreach ($this->controls['panels'] as $panel_slug => $args) {
+					$this->add_panel($panel_slug, $args, $wp_customize);
 				}
 			}
 
 			// start sections
-			if( !empty( $this->controls['sections'] ) ){
-				foreach( $this->controls['sections'] as $section_slug => $args ){
-					$this->add_section( $section_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['sections'])) {
+				foreach ($this->controls['sections'] as $section_slug => $args) {
+					$this->add_section($section_slug, $args, $wp_customize);
 				}
 			}
 
 			// start settings
-			if( !empty( $this->controls['settings'] ) ){
-				foreach( $this->controls['settings'] as $settings_slug => $args ){
-					$this->add_setting( $settings_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['settings'])) {
+				foreach ($this->controls['settings'] as $settings_slug => $args) {
+					$this->add_setting($settings_slug, $args, $wp_customize);
 				}
 			}
 
 			// start fields
-			if( !empty( $this->controls['fields'] ) ){
-				foreach( $this->controls['fields'] as $field_slug => $args ){
-					$this->add_control( $field_slug, $args, $wp_customize );
+			if ( ! empty($this->controls['fields'])) {
+				foreach ($this->controls['fields'] as $field_slug => $args) {
+					$this->add_control($field_slug, $args, $wp_customize);
 				}
 			}
 			
-			$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
-			$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
-			$wp_customize->get_setting( 'background_color' )->transport = 'postMessage';
+			$wp_customize->get_setting('blogname')->transport = 'postMessage';
+			$wp_customize->get_setting('blogdescription')->transport = 'postMessage';
+			$wp_customize->get_setting('background_color')->transport = 'postMessage';
 		}
 
 		/**
@@ -99,7 +99,7 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_panel( $slug, $args, $wp_customize ) {
+		private function add_panel($slug, $args, $wp_customize) {
 			$default_args = array(
 				'title' 		=> null,
 				'description' 	=> null,
@@ -107,7 +107,7 @@ 
 
 			$wp_customize->add_panel(
 				$slug,
-				array_merge( $default_args, $args )
+				array_merge($default_args, $args)
 			);
 		}
 
@@ -116,14 +116,14 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_section( $slug, $args, $wp_customize ) {
+		private function add_section($slug, $args, $wp_customize) {
 			$default_args = array(
 				'capability' => 'edit_theme_options', //Capability needed to tweak
 				'description' => null, //Descriptive tooltip
 			);
 
-			$wp_customize->add_section( $slug, 
-				array_merge( $default_args, $args )
+			$wp_customize->add_section($slug, 
+				array_merge($default_args, $args)
 			);
 		}
 
@@ -132,15 +132,15 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_setting( $slug, $args, $wp_customize ) {
-			$wp_customize->add_setting( $slug, //No need to use a SERIALIZED name, as `theme_mod` settings already live under one db record
-				array_merge( array(
+		private function add_setting($slug, $args, $wp_customize) {
+			$wp_customize->add_setting($slug, //No need to use a SERIALIZED name, as `theme_mod` settings already live under one db record
+				array_merge(array(
 					'default' 			=> null, //Default setting/value to save
 					'type' 				=> 'theme_mod', //Is this an 'option' or a 'theme_mod'?
 					'capability'		=> 'edit_theme_options', //Optional. Special permissions for accessing this setting.
 					'transport' 		=> 'postMessage', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)?
 					'sanitize_callback'	=> 'lsx_sanitize_choices'
-				), $args )
+				), $args)
 			);
 		}
 
@@ -149,28 +149,28 @@ 
 		 *
 		 * @since     1.0.0
 		 */		
-		private function add_control( $slug, $args, $wp_customize ) {
+		private function add_control($slug, $args, $wp_customize) {
 			$default_args = array(
 
 			);
 
-			if( isset( $args['control'] ) && class_exists( $args['control'] )){
+			if (isset($args['control']) && class_exists($args['control'])) {
 				
 				$control_class = $args['control'];
-				unset( $args['control'] );
+				unset($args['control']);
 
-				$control = new $control_class( $wp_customize, $slug, array_merge( $default_args, $args ) );
-				$wp_customize->add_control( $control );
+				$control = new $control_class($wp_customize, $slug, array_merge($default_args, $args));
+				$wp_customize->add_control($control);
 			
-			}else{
+			} else {
 				
-				if( isset( $args['control'] ) ){
-					unset( $args['control'] );
+				if (isset($args['control'])) {
+					unset($args['control']);
 				}
 
 				$wp_customize->add_control(
 					$slug,
-					array_merge( $default_args, $args )
+					array_merge($default_args, $args)
 				);
 			}
 		}

inc/config.php

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 /**
  * Theme Configuration File
@@ -8,7 +8,7 @@ 
  * @package lsx
  */
 
-if ( ! function_exists( 'lsx_setup' ) ) :
+if ( ! function_exists('lsx_setup')) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -19,7 +19,7 @@ 
 function lsx_setup() {
 	global $content_width;
 	
-	load_theme_textdomain( 'lsx', get_template_directory() . '/languages' );
+	load_theme_textdomain('lsx', get_template_directory() . '/languages');
 
 	$args = array(
 			'header-text' => array(
@@ -28,51 +28,51 @@ 
 			),
 			'size' => 'medium',
 	);
-	add_theme_support( 'site-logo', $args );
+	add_theme_support('site-logo', $args);
 	
-	add_theme_support( 'custom-logo', array(
+	add_theme_support('custom-logo', array(
 			'height'      => 50,
 			'width'       => 150,
 			'flex-width' => true,
 			'flex-height' => true,
-	) );
+	));
 
-	add_theme_support( 'custom-background' );
-	add_theme_support( 'automatic-feed-links' );
-	add_theme_support( 'title-tag' );
-	add_theme_support( 'post-thumbnails' );
-	add_theme_support( 'post-formats', array('image', 'video', 'gallery', 'audio', 'link', 'quote', 'aside') );
+	add_theme_support('custom-background');
+	add_theme_support('automatic-feed-links');
+	add_theme_support('title-tag');
+	add_theme_support('post-thumbnails');
+	add_theme_support('post-formats', array('image', 'video', 'gallery', 'audio', 'link', 'quote', 'aside'));
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu', 'lsx' ),
-		'top-menu'=> __( 'Top Menu' , 'lsx' ),
-		'social'=> __( 'Social Menu' , 'lsx' ),
-		'footer'=> __( 'Footer Menu' , 'lsx' )
-	) );	
+	register_nav_menus(array(
+		'primary' => __('Primary Menu', 'lsx'),
+		'top-menu'=> __('Top Menu', 'lsx'),
+		'social'=> __('Social Menu', 'lsx'),
+		'footer'=> __('Footer Menu', 'lsx')
+	));	
 
 	//Set the content width
 	$content_width = 1140;
 	
-	add_editor_style( get_template_directory_uri() . '/css/editor-style.css' );	
-	add_theme_support( 'html5', array( 'caption' ) );
+	add_editor_style(get_template_directory_uri() . '/css/editor-style.css');	
+	add_theme_support('html5', array('caption'));
 
-	add_theme_support( 'woocommerce' );	
-	add_theme_support( 'sensei' );
+	add_theme_support('woocommerce');	
+	add_theme_support('sensei');
 }
 endif; // lsx_setup
-add_action( 'after_setup_theme', 'lsx_setup' );
+add_action('after_setup_theme', 'lsx_setup');
 
 /**
  * Removes the "Custom Fields" meta box.
  */
 function lsx_remove_meta_boxes() {
 	$post_types = get_post_types();
-	foreach($post_types as $post_type){
-		remove_meta_box( 'postcustom' , $post_type , 'normal' ); 
+	foreach ($post_types as $post_type) {
+		remove_meta_box('postcustom', $post_type, 'normal'); 
 	}
 }
-add_action( 'admin_menu' , 'lsx_remove_meta_boxes' );
+add_action('admin_menu', 'lsx_remove_meta_boxes');
 
 /**
  * Overwrite the $content_width var, based on the layout of the page.
@@ -84,33 +84,33 @@ 
 function lsx_process_content_width() {
 	global $content_width;
 
-	if(
+	if (
 		is_page_template('page-templates/template-portfolio.php') ||
 		is_page_template('page-templates/template-front-page.php') ||
 		is_page_template('page-templates/template-full-width.php') ||
 		is_post_type_archive('jetpack-portfolio') ||
-		is_tax(array('jetpack-portfolio-type','jetpack-portfolio-tag')) ||
+		is_tax(array('jetpack-portfolio-type', 'jetpack-portfolio-tag')) ||
 		is_singular('jetpack-portfolio')
-	){
+	) {
 		$content_width = 1140;
 	}
 }
-add_action('wp_head','lsx_process_content_width');
+add_action('wp_head', 'lsx_process_content_width');
 
 /**
  * Disable the comments form by default for the page post type.
  * @package	lsx
  * @subpackage config
  */
-function lsx_page_comments_off( $data ) {
-	if ( 'page' == $data['post_type'] && 'auto-draft' == $data['post_status'] && esc_html__( 'Auto Draft', 'lsx' ) == $data['post_title'] ) {
+function lsx_page_comments_off($data) {
+	if ('page' == $data['post_type'] && 'auto-draft' == $data['post_status'] && esc_html__('Auto Draft', 'lsx') == $data['post_title']) {
 		$data['comment_status'] = 0;
 		$data['ping_status'] = 0;
 	}
 
 	return $data;
 }
-add_filter( 'wp_insert_post_data', 'lsx_page_comments_off' );
+add_filter('wp_insert_post_data', 'lsx_page_comments_off');
 
 /**
  * Disable the comments form by default for the page post type.
@@ -118,14 +118,14 @@ 
  * @subpackage config
  */
 function lsx_is_legacy($data) {
-	if ( 'page' == $data['post_type'] && 'auto-draft' == $data['post_status'] && esc_html__( 'Auto Draft', 'lsx' ) == $data['post_title'] ) {
+	if ('page' == $data['post_type'] && 'auto-draft' == $data['post_status'] && esc_html__('Auto Draft', 'lsx') == $data['post_title']) {
 		$data['comment_status'] = 0;
 		$data['ping_status'] = 0;
 	}
 
 	return $data;
 }
-add_filter( 'wp_insert_post_data', 'lsx_page_comments_off' );
+add_filter('wp_insert_post_data', 'lsx_page_comments_off');
 
 /**
  * Run the init command
@@ -133,11 +133,11 @@ 
  * @subpackage config
  */
 function lsx_init() {
-	if(class_exists('WooCommerce')){
-		remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20, 0 );
+	if (class_exists('WooCommerce')) {
+		remove_action('woocommerce_before_main_content', 'woocommerce_breadcrumb', 20, 0);
 	}
 }
-add_action( 'init', 'lsx_init',100 );
+add_action('init', 'lsx_init', 100);
 
 /**
  * Run on the wp_head 
@@ -146,11 +146,11 @@ 
  */
 function lsx_wp_head() {
 
-	$layout = get_theme_mod('lsx_layout','2cr');
-	$layout = apply_filters( 'lsx_layout', $layout );
+	$layout = get_theme_mod('lsx_layout', '2cr');
+	$layout = apply_filters('lsx_layout', $layout);
 
-	if('1c' === $layout && (is_author() || is_search() || (is_post_type_archive(array('post','page','jetpack-portfolio')) && !is_post_type_archive('tribe_events')) || is_tag() || is_category() || is_date() || is_tax('post_format')) ){
-		remove_action('lsx_content_top', 'lsx_breadcrumbs', 100 );
+	if ('1c' === $layout && (is_author() || is_search() || (is_post_type_archive(array('post', 'page', 'jetpack-portfolio')) && ! is_post_type_archive('tribe_events')) || is_tag() || is_category() || is_date() || is_tax('post_format'))) {
+		remove_action('lsx_content_top', 'lsx_breadcrumbs', 100);
 	}
 }
-add_action( 'wp_head', 'lsx_wp_head',100 );
+add_action('wp_head', 'lsx_wp_head', 100);

inc/customizer-colour-options.php

Spacing +75 added lines, -75 removed lines

@@ -1,70 +1,70 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
 
 global $customizer_colour_names;
 global $customizer_colour_choices;
 
-$customizer_colour_names = apply_filters( 'lsx_customizer_colour_names', array(
-	'button_background_color'                => esc_html__( 'BUTTON: Background', 'lsx' ),
-	'button_background_hover_color'          => esc_html__( 'BUTTON: Background (hover)', 'lsx' ),
-	'button_text_color'                      => esc_html__( 'BUTTON: Text', 'lsx' ),
-	'button_text_color_hover'                => esc_html__( 'BUTTON: Text (hover)', 'lsx' ),
-
-	'button_cta_background_color'            => esc_html__( 'BUTTON CTA: Background', 'lsx' ),
-	'button_cta_background_hover_color'      => esc_html__( 'BUTTON CTA: Background (hover)', 'lsx' ),
-	'button_cta_text_color'                  => esc_html__( 'BUTTON CTA: Text', 'lsx' ),
-	'button_cta_text_color_hover'            => esc_html__( 'BUTTON CTA: Text (hover)', 'lsx' ),
-
-	'top_menu_background_color'              => esc_html__( 'TOP MENU: Background', 'lsx' ),
-	'top_menu_text_color'                    => esc_html__( 'TOP MENU: Text', 'lsx' ),
-	'top_menu_text_hover_color'              => esc_html__( 'TOP MENU: Text (hover)', 'lsx' ),
-
-	'header_background_color'                => esc_html__( 'HEADER: Background', 'lsx' ),
-	'header_title_color'                     => esc_html__( 'HEADER: Title', 'lsx' ),
-	'header_title_hover_color'               => esc_html__( 'HEADER: Title (hover)', 'lsx' ),
-	'header_description_color'               => esc_html__( 'HEADER: Description', 'lsx' ),
-
-	'main_menu_background_hover1_color'      => esc_html__( 'MENU: Background (L1 hover)', 'lsx' ),
-	'main_menu_background_hover2_color'      => esc_html__( 'MENU: Background (L2 hover)', 'lsx' ),
-	'main_menu_text_color'                   => esc_html__( 'MENU: Text (L1)', 'lsx' ),
-	'main_menu_text_hover1_color'            => esc_html__( 'MENU: Text (L1 hover)', 'lsx' ),
-	'main_menu_text_hover2_color'            => esc_html__( 'MENU: Text (L2 hover)', 'lsx' ),
-
-	'banner_background_color'                => esc_html__( 'BANNER: Background', 'lsx' ),
-	'banner_text_color'                      => esc_html__( 'BANNER: Text', 'lsx' ),
-	'banner_text_image_color'                => esc_html__( 'BANNER: Text (over image)', 'lsx' ),
-
-	'background_color'                       => esc_html__( 'BODY: Background', 'lsx' ),
-	'body_line_color'                        => esc_html__( 'BODY: Line', 'lsx' ),
-	'body_text_heading_color'                => esc_html__( 'BODY: Text (heading)', 'lsx' ),
-	'body_text_color'                        => esc_html__( 'BODY: Text', 'lsx' ),
-	'body_link_color'                        => esc_html__( 'BODY: Link', 'lsx' ),
-	'body_link_hover_color'                  => esc_html__( 'BODY: Link (hover)', 'lsx' ),
-	'body_section_full_background_color'     => esc_html__( 'BODY: Section full (background)', 'lsx' ),
-	'body_section_full_text_color'           => esc_html__( 'BODY: Section full (text)', 'lsx' ),
-	'body_section_full_cta_background_color' => esc_html__( 'BODY: Section full CTA (background)', 'lsx' ),
-	'body_section_full_cta_text_color'       => esc_html__( 'BODY: Section full CTA (text)', 'lsx' ),
-
-	'footer_cta_background_color'            => esc_html__( 'FOOTER CTA: Background', 'lsx' ),
-	'footer_cta_text_color'                  => esc_html__( 'FOOTER CTA: Text', 'lsx' ),
-	'footer_cta_link_color'                  => esc_html__( 'FOOTER CTA: Link', 'lsx' ),
-	'footer_cta_link_hover_color'            => esc_html__( 'FOOTER CTA: Link (hover)', 'lsx' ),
-
-	'footer_widgets_background_color'        => esc_html__( 'FOOTER WIDGETS: Background', 'lsx' ),
-	'footer_widgets_text_color'              => esc_html__( 'FOOTER WIDGETS: Text', 'lsx' ),
-	'footer_widgets_link_color'              => esc_html__( 'FOOTER WIDGETS: Link', 'lsx' ),
-	'footer_widgets_link_hover_color'        => esc_html__( 'FOOTER WIDGETS: Link (hover)', 'lsx' ),
-
-	'footer_background_color'                => esc_html__( 'FOOTER: Background', 'lsx' ),
-	'footer_text_color'                      => esc_html__( 'FOOTER: Text', 'lsx' ),
-	'footer_link_color'                      => esc_html__( 'FOOTER: Link', 'lsx' ),
-	'footer_link_hover_color'                => esc_html__( 'FOOTER: Link (hover)', 'lsx' ),
-) );
-
-$customizer_colour_choices = apply_filters( 'lsx_customizer_colour_choices', array(
+$customizer_colour_names = apply_filters('lsx_customizer_colour_names', array(
+	'button_background_color'                => esc_html__('BUTTON: Background', 'lsx'),
+	'button_background_hover_color'          => esc_html__('BUTTON: Background (hover)', 'lsx'),
+	'button_text_color'                      => esc_html__('BUTTON: Text', 'lsx'),
+	'button_text_color_hover'                => esc_html__('BUTTON: Text (hover)', 'lsx'),
+
+	'button_cta_background_color'            => esc_html__('BUTTON CTA: Background', 'lsx'),
+	'button_cta_background_hover_color'      => esc_html__('BUTTON CTA: Background (hover)', 'lsx'),
+	'button_cta_text_color'                  => esc_html__('BUTTON CTA: Text', 'lsx'),
+	'button_cta_text_color_hover'            => esc_html__('BUTTON CTA: Text (hover)', 'lsx'),
+
+	'top_menu_background_color'              => esc_html__('TOP MENU: Background', 'lsx'),
+	'top_menu_text_color'                    => esc_html__('TOP MENU: Text', 'lsx'),
+	'top_menu_text_hover_color'              => esc_html__('TOP MENU: Text (hover)', 'lsx'),
+
+	'header_background_color'                => esc_html__('HEADER: Background', 'lsx'),
+	'header_title_color'                     => esc_html__('HEADER: Title', 'lsx'),
+	'header_title_hover_color'               => esc_html__('HEADER: Title (hover)', 'lsx'),
+	'header_description_color'               => esc_html__('HEADER: Description', 'lsx'),
+
+	'main_menu_background_hover1_color'      => esc_html__('MENU: Background (L1 hover)', 'lsx'),
+	'main_menu_background_hover2_color'      => esc_html__('MENU: Background (L2 hover)', 'lsx'),
+	'main_menu_text_color'                   => esc_html__('MENU: Text (L1)', 'lsx'),
+	'main_menu_text_hover1_color'            => esc_html__('MENU: Text (L1 hover)', 'lsx'),
+	'main_menu_text_hover2_color'            => esc_html__('MENU: Text (L2 hover)', 'lsx'),
+
+	'banner_background_color'                => esc_html__('BANNER: Background', 'lsx'),
+	'banner_text_color'                      => esc_html__('BANNER: Text', 'lsx'),
+	'banner_text_image_color'                => esc_html__('BANNER: Text (over image)', 'lsx'),
+
+	'background_color'                       => esc_html__('BODY: Background', 'lsx'),
+	'body_line_color'                        => esc_html__('BODY: Line', 'lsx'),
+	'body_text_heading_color'                => esc_html__('BODY: Text (heading)', 'lsx'),
+	'body_text_color'                        => esc_html__('BODY: Text', 'lsx'),
+	'body_link_color'                        => esc_html__('BODY: Link', 'lsx'),
+	'body_link_hover_color'                  => esc_html__('BODY: Link (hover)', 'lsx'),
+	'body_section_full_background_color'     => esc_html__('BODY: Section full (background)', 'lsx'),
+	'body_section_full_text_color'           => esc_html__('BODY: Section full (text)', 'lsx'),
+	'body_section_full_cta_background_color' => esc_html__('BODY: Section full CTA (background)', 'lsx'),
+	'body_section_full_cta_text_color'       => esc_html__('BODY: Section full CTA (text)', 'lsx'),
+
+	'footer_cta_background_color'            => esc_html__('FOOTER CTA: Background', 'lsx'),
+	'footer_cta_text_color'                  => esc_html__('FOOTER CTA: Text', 'lsx'),
+	'footer_cta_link_color'                  => esc_html__('FOOTER CTA: Link', 'lsx'),
+	'footer_cta_link_hover_color'            => esc_html__('FOOTER CTA: Link (hover)', 'lsx'),
+
+	'footer_widgets_background_color'        => esc_html__('FOOTER WIDGETS: Background', 'lsx'),
+	'footer_widgets_text_color'              => esc_html__('FOOTER WIDGETS: Text', 'lsx'),
+	'footer_widgets_link_color'              => esc_html__('FOOTER WIDGETS: Link', 'lsx'),
+	'footer_widgets_link_hover_color'        => esc_html__('FOOTER WIDGETS: Link (hover)', 'lsx'),
+
+	'footer_background_color'                => esc_html__('FOOTER: Background', 'lsx'),
+	'footer_text_color'                      => esc_html__('FOOTER: Text', 'lsx'),
+	'footer_link_color'                      => esc_html__('FOOTER: Link', 'lsx'),
+	'footer_link_hover_color'                => esc_html__('FOOTER: Link (hover)', 'lsx'),
+));
+
+$customizer_colour_choices = apply_filters('lsx_customizer_colour_choices', array(
 	'default' => array(
-		'label'  => __( 'Default', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_default', array(
+		'label'  => __('Default', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_default', array(
 			'button_background_color'                => '#428bca',
 			'button_background_hover_color'          => '#2a6496',
 			'button_text_color'                      => '#ffffff',
@@ -119,11 +119,11 @@ 
 			'footer_text_color'                      => '#ffffff',
 			'footer_link_color'                      => '#337ab7',
 			'footer_link_hover_color'                => '#969696',
-		) )
+		))
 	),
 	'red' => array(
-		'label'  => __( 'Red', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_red', array(
+		'label'  => __('Red', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_red', array(
 			'button_background_color'                => '#b64d3f',
 			'button_background_hover_color'          => '#87291c',
 			'button_text_color'                      => '#ffffff',
@@ -178,11 +178,11 @@ 
 			'footer_text_color'                      => '#ffffff',
 			'footer_link_color'                      => '#b64d3f',
 			'footer_link_hover_color'                => '#969696',
-		) )
+		))
 	),
 	'orange' => array(
-		'label'  => __( 'Orange', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_orange', array(
+		'label'  => __('Orange', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_orange', array(
 			'button_background_color'                => '#fbaf3f',
 			'button_background_hover_color'          => '#e49435',
 			'button_text_color'                      => '#260e03',
@@ -237,11 +237,11 @@ 
 			'footer_text_color'                      => '#ffffff',
 			'footer_link_color'                      => '#e4701e',
 			'footer_link_hover_color'                => '#969696',
-		) )
+		))
 	),
 	'green' => array(
-		'label'  => __( 'Green', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_green', array(
+		'label'  => __('Green', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_green', array(
 			'button_background_color'                => '#596b46',
 			'button_background_hover_color'          => '#3d4a30',
 			'button_text_color'                      => '#ffffff',
@@ -296,11 +296,11 @@ 
 			'footer_text_color'                      => '#ffffff',
 			'footer_link_color'                      => '#596b46',
 			'footer_link_hover_color'                => '#969696',
-		) )
+		))
 	),
 	'brown' => array(
-		'label'  => __( 'Brown', 'lsx' ),
-		'colors' => apply_filters( 'lsx_customizer_colour_choices_brown', array(
+		'label'  => __('Brown', 'lsx'),
+		'colors' => apply_filters('lsx_customizer_colour_choices_brown', array(
 			'button_background_color'                => '#8c6a45',
 			'button_background_hover_color'          => '#5b452e',
 			'button_text_color'                      => '#ffffff',
@@ -355,6 +355,6 @@ 
 			'footer_text_color'                      => '#ffffff',
 			'footer_link_color'                      => '#8c6a45',
 			'footer_link_hover_color'                => '#969696',
-		) )
+		))
 	)
-) );
+));