From dc31983ba554f91be5bb4b7d8579e53c87d1eefe Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 16 Apr 2019 13:51:36 -0400
Subject: [PATCH] Cleanup of sidebar-1 customised file

---
 templates/sidebar-1.php | 57 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/templates/sidebar-1.php b/templates/sidebar-1.php
index e8c9184..61649ac 100644
--- a/templates/sidebar-1.php
+++ b/templates/sidebar-1.php
@@ -12,44 +12,43 @@
 // Do not allow directly accessing this file.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit( 'Direct script access denied.' );
-}
+} ?>
+<aside id="sidebar" role="complementary" <?php Avada()->layout->add_class( 'sidebar_1_class' ); ?> <?php Avada()->layout->add_style( 'sidebar_1_style' ); ?> <?php Avada()->layout->add_data( 'sidebar_1_data' ); ?>>
+<?php 
 if (in_category(70)) {
-        if (is_single() ) {?>
+	if (is_single() ) {?>
 
-<aside id="sidebar" role="complementary" <?php Avada()->layout->add_class( 'sidebar_1_class' ); ?> <?php Avada()->layout->add_style( 'sidebar_1_style' ); ?> <?php Avada()->layout->add_data( 'sidebar_1_data' ); ?>>
-                <?php echo "Here goes the sidebar for single epicenter posts";
-                if ( is_active_sidebar( 'avada-custom-sidebar-epicentersidebar' ) ) {
-                        dynamic_sidebar( 'avada-custom-sidebar-epicentersidebar' );
-                } else {
-                        echo "avada-custom-sidebar-epicentersidebar is not active";
-                } ?>
-</aside> 
+		
+			<?php echo "Here goes the sidebar for single epicenter posts";
+			if ( is_active_sidebar( 'avada-custom-sidebar-epicentersidebar' ) ) {
+					dynamic_sidebar( 'avada-custom-sidebar-epicentersidebar' );
+			} else {
+					echo "avada-custom-sidebar-epicentersidebar is not active";
+			} ?>
 
-<?php
+	<?php
 	} else if (is_home()) {
 		echo "Do stuff when is_home()";
 	}
 } else {
 
-$sticky_sidebar = in_array( 'fusion-sticky-sidebar', apply_filters( 'fusion_sidebar_1_class', array() ) );
-?>
-<aside id="sidebar" role="complementary" <?php Avada()->layout->add_class( 'sidebar_1_class' ); ?> <?php Avada()->layout->add_style( 'sidebar_1_style' ); ?> <?php Avada()->layout->add_data( 'sidebar_1_data' ); ?>>
-	<?php if ( $sticky_sidebar ) : ?>
-		<div class="fusion-sidebar-inner-content">
-	<?php endif; ?>
-		<?php if ( ! Avada()->template->has_sidebar() || 'left' === Avada()->layout->sidebars['position'] || ( 'right' === Avada()->layout->sidebars['position'] && ! Avada()->template->double_sidebars() ) ) : ?>
-			<?php echo avada_display_sidenav( Avada()->fusion_library->get_page_id() ); // WPCS: XSS ok. ?>
-			<?php if ( class_exists( 'Tribe__Events__Main' ) && is_singular( 'tribe_events' ) && 'sidebar' === Avada()->settings->get( 'ec_meta_layout' ) ) : ?>
-				<?php do_action( 'tribe_events_single_event_before_the_meta' ); ?>
-				<?php tribe_get_template_part( 'modules/meta' ); ?>
-			<?php endif; ?>
+	$sticky_sidebar = in_array( 'fusion-sticky-sidebar', apply_filters( 'fusion_sidebar_1_class', array() ) );
+	?>
+		<?php if ( $sticky_sidebar ) : ?>
+			<div class="fusion-sidebar-inner-content">
 		<?php endif; ?>
+			<?php if ( ! Avada()->template->has_sidebar() || 'left' === Avada()->layout->sidebars['position'] || ( 'right' === Avada()->layout->sidebars['position'] && ! Avada()->template->double_sidebars() ) ) : ?>
+				<?php echo avada_display_sidenav( Avada()->fusion_library->get_page_id() ); // WPCS: XSS ok. ?>
+				<?php if ( class_exists( 'Tribe__Events__Main' ) && is_singular( 'tribe_events' ) && 'sidebar' === Avada()->settings->get( 'ec_meta_layout' ) ) : ?>
+					<?php do_action( 'tribe_events_single_event_before_the_meta' ); ?>
+					<?php tribe_get_template_part( 'modules/meta' ); ?>
+				<?php endif; ?>
+			<?php endif; ?>
 
-		<?php if ( isset( Avada()->layout->sidebars['sidebar_1'] ) && Avada()->layout->sidebars['sidebar_1'] ) : ?>
-			<?php generated_dynamic_sidebar( Avada()->layout->sidebars['sidebar_1'] ); ?>
+			<?php if ( isset( Avada()->layout->sidebars['sidebar_1'] ) && Avada()->layout->sidebars['sidebar_1'] ) : ?>
+				<?php generated_dynamic_sidebar( Avada()->layout->sidebars['sidebar_1'] ); ?>
+			<?php endif; ?>
+		<?php if ( $sticky_sidebar ) : ?>
+			</div>
 		<?php endif; ?>
-	<?php if ( $sticky_sidebar ) : ?>
-		</div>
-	<?php endif; ?>
-</aside>
 <?php } ?>
-- 
2.17.1