From 2530b7c45bf278c777393259299fcd08cc51e526 Mon Sep 17 00:00:00 2001
From: Divya Narhe <divya.narhe@hbwsl.com>
Date: Mon, 24 Jun 2024 19:03:53 +0530
Subject: [PATCH 1/4] Fixed post layout

---
 core/includes/hooks.php            | 191 ++++++++++++++++-------------
 core/includes/post-custom-meta.php |  12 +-
 sidebar.php                        |  41 ++++---
 3 files changed, 140 insertions(+), 104 deletions(-)

diff --git a/core/includes/hooks.php b/core/includes/hooks.php
index bfd06a333..f3733301a 100644
--- a/core/includes/hooks.php
+++ b/core/includes/hooks.php
@@ -303,13 +303,38 @@ function responsive_theme_options() {
  * Responsive_wrapper_class
  */
 function responsive_wrapper_classes() {
+	global $post;
+	$custom = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
+	$layout = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
+	error_log( 'Layout in hook =>' . print_r( $layout, true ) );
 	?>
+
 	<div id="wrapper" class="site-content clearfix">
 		<div class="content-outer container">
-			<div class="row">
-				<?php responsive_in_wrapper(); // wrapper hook. ?>
-
+			<?php
+			if ( 'sidebar-content-page' === $layout ) {
+				?>
+					<div class="row responsive-sidebar-content-post" style="flex-direction: row-reverse;">
+				<?php
+			} elseif ( 'full-width-page' === $layout ) {
+				?>
+				<div class="row" id="responsive-post-layout-container">
+				<?php
+			} else {
+				?>
+				<div class="row " id="responsive-post-layout-container">
+				<?php
+			}
+			?>
+						
+				<?php
+				responsive_in_wrapper(); // wrapper hook.
+				if ( 'full-width-page' === $layout ) {
+					?>
+				<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role="main" style="width:100%;">
+				<?php } else { ?>
 				<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role="main">
+				<?php } ?>
 					<?php
 					if ( is_home() || is_archive() ) {
 						echo '<div class="content-area-wrapper">';
@@ -319,36 +344,36 @@ function responsive_wrapper_classes() {
 					}
 }
 
-/**
- * Responsive_wrapper_class
- */
+				/**
+				 * Responsive_wrapper_class
+				 */
 function responsive_wrapper_classes_close() {
 	?>
 		</div>
 	</div>
 	<?php responsive_wrapper_bottom(); // after wrapper content hook. ?>
 </div> <!-- end of #wrapper -->
-	<?php
+					<?php
 }
 
-/**
- * Responsive_woocommerce_wrapper
- */
+				/**
+				 * Responsive_woocommerce_wrapper
+				 */
 function responsive_woocommerce_wrapper() {
 	?>
 	<div id="wrapper" class="site-content clearfix">
 			<div class="content-outer container">
 				<div class="row">
 					<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>">
-						<?php
-						if ( is_woocommerce() ) {
-							echo '<div class="site-content-header">';
-						}
+		<?php
+		if ( is_woocommerce() ) {
+			echo '<div class="site-content-header">';
+		}
 }
 
-/**
- * [responsive_woocommerce_wrapper_end description]
- */
+				/**
+				 * [responsive_woocommerce_wrapper_end description]
+				 */
 function responsive_woocommerce_wrapper_end() {
 	echo '</main><!-- end of #primary -->';
 		get_sidebar();
@@ -356,11 +381,11 @@ function responsive_woocommerce_wrapper_end() {
 }
 
 
-/**
- * [responsive_woocommerce_before_shop_loop description]
- *
- * @return void [description].
- */
+				/**
+				 * [responsive_woocommerce_before_shop_loop description]
+				 *
+				 * @return void [description].
+				 */
 function responsive_woocommerce_archive_description() {
 	?>
 	</div>
@@ -368,11 +393,11 @@ function responsive_woocommerce_archive_description() {
 		<?php
 }
 
-/**
- * [responsive_woocommerce_after_single_product_summary description]
- *
- * @return void [description].
- */
+				/**
+				 * [responsive_woocommerce_after_single_product_summary description]
+				 *
+				 * @return void [description].
+				 */
 function responsive_woocommerce_after_single_product_summary() {
 	?>
 	</div>
@@ -380,12 +405,12 @@ function responsive_woocommerce_after_single_product_summary() {
 		<?php
 }
 
-/**
- * Read more text.
- *
- * @param string $text default read more text.
- * @return string read more text
- */
+				/**
+				 * Read more text.
+				 *
+				 * @param string $text default read more text.
+				 * @return string read more text
+				 */
 function responsive_sensei_read_more_text( $text ) {
 	global $post;
 	if ( 'course' === $post->post_type ) {
@@ -397,12 +422,12 @@ function responsive_sensei_read_more_text( $text ) {
 	return $text;
 }
 
-/**
- * Returns excerpt length
- *
- * @param  integer $length Length of excerpt.
- * @return integer         Length of excerpt.
- */
+				/**
+				 * Returns excerpt length
+				 *
+				 * @param  integer $length Length of excerpt.
+				 * @return integer         Length of excerpt.
+				 */
 function responsive_sensei_custom_excerpt_length( $length ) {
 	global $post;
 	if ( 'course' === $post->post_type ) {
@@ -414,11 +439,11 @@ function responsive_sensei_custom_excerpt_length( $length ) {
 	return $length;
 }
 
-/**
- * [responsive_theme_wrapper_start description]
- *
- * @return void [description].
- */
+				/**
+				 * [responsive_theme_wrapper_start description]
+				 *
+				 * @return void [description].
+				 */
 function responsive_theme_wrapper_start() {
 	?>
 	<div id="wrapper" class="site-content clearfix">
@@ -428,11 +453,11 @@ function responsive_theme_wrapper_start() {
 					<?php
 }
 
-/**
- * [responsive_theme_wrapper_end description]
- *
- * @return void [description].
- */
+				/**
+				 * [responsive_theme_wrapper_end description]
+				 *
+				 * @return void [description].
+				 */
 function responsive_theme_wrapper_end() {
 	echo '</main><!-- end of #primary -->';
 	if ( is_single() ) {
@@ -441,31 +466,31 @@ function responsive_theme_wrapper_end() {
 	echo '</div></div></div>';
 }
 
-/**
- * [responsive_open_container description]
- *
- * @return void [description]
- */
+				/**
+				 * [responsive_open_container description]
+				 *
+				 * @return void [description]
+				 */
 function responsive_open_container() {
 	echo '<div class="container">';
 }
 
-/**
- * [responsive_close_container description]
- *
- * @return void [description]
- */
+				/**
+				 * [responsive_close_container description]
+				 *
+				 * @return void [description]
+				 */
 function responsive_close_container() {
 	echo '</div>';
 }
 
-/**
- * Classes
- */
-/**
- * Add No-JS Class.
- * If we're missing JavaScript support, the HTML element will have a no-js class.
- */
+				/**
+				 * Classes
+				 */
+				/**
+				 * Add No-JS Class.
+				 * If we're missing JavaScript support, the HTML element will have a no-js class.
+				 */
 function responsive_no_js_class() {
 
 	?>
@@ -474,9 +499,9 @@ function responsive_no_js_class() {
 
 }
 
-/**
- * Change the custom logo URL
- */
+				/**
+				 * Change the custom logo URL
+				 */
 function responsive_custom_logo_link() {
 
 	// The logo.
@@ -514,27 +539,27 @@ function responsive_custom_logo_link() {
 	return $html;
 }
 
-/**
- * Responsive child theme custom header
- *
- * @see header.php
- */
+				/**
+				 * Responsive child theme custom header
+				 *
+				 * @see header.php
+				 */
 function responsive_custom_header() {
 	do_action( 'responsive_custom_header' );
 }
 
-/**
- * Responsive child theme custom footer
- *
- * @see footer.php
- */
+				/**
+				 * Responsive child theme custom footer
+				 *
+				 * @see footer.php
+				 */
 function responsive_custom_footer() {
 	do_action( 'responsive_custom_footer' );
 }
 
-/**
- * Single Blog Related Posts Entry
- */
+				/**
+				 * Single Blog Related Posts Entry
+				 */
 function responsive_single_blog_related_posts_entry() {
 	do_action( 'responsive_single_blog_related_posts_entry' );
-}
\ No newline at end of file
+}
diff --git a/core/includes/post-custom-meta.php b/core/includes/post-custom-meta.php
index 2250d6470..9e6561067 100644
--- a/core/includes/post-custom-meta.php
+++ b/core/includes/post-custom-meta.php
@@ -137,9 +137,6 @@ function responsive_get_valid_layouts() {
 		'content-sidebar-page' => __( 'Content/Sidebar', 'responsive' ),
 		'sidebar-content-page' => __( 'Sidebar/Content', 'responsive' ),
 		'full-width-page'      => __( 'Full Width Page (no sidebar)', 'responsive' ),
-		'blog-2-col'           => __( 'Blog 2 Column', 'responsive' ),
-		'blog-3-col'           => __( 'Blog 3 Column', 'responsive' ),
-		'blog-4-col'           => __( 'Blog 4 Column', 'responsive' ),
 	);
 
 	return apply_filters( 'responsive_valid_layouts', $layouts );
@@ -194,7 +191,7 @@ function responsive_layout_meta_box() {
 	$valid_layouts = responsive_get_valid_layouts();
 	?>
 	<p>
-		<select name="_responsive_layout">
+		<select name="_responsive_layout" id="responsive-layout-select">
 		<?php foreach ( $valid_layouts as $slug => $name ) { ?>
 			<?php $selected = selected( $layout, $slug, false ); ?>
 			<option value="<?php echo esc_html( $slug ); ?>" <?php echo esc_html( $selected ); ?>><?php echo esc_html( $name ); ?></option>
@@ -203,6 +200,13 @@ function responsive_layout_meta_box() {
 	</p>
 	<?php
 }
+function save_responsive_layout_meta( $post_id ) {
+	if ( isset( $_POST['_responsive_layout'] ) ) {
+		update_post_meta( $post_id, '_responsive_layout', sanitize_text_field( $_POST['_responsive_layout'] ) );
+	}
+}
+add_action( 'save_post', 'save_responsive_layout_meta' );
+
 
 /**
  * Validate, sanitize, and save post metadata.
diff --git a/sidebar.php b/sidebar.php
index 4c20dd531..f962bbba0 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -45,20 +45,20 @@
 } elseif ( class_exists( 'LifterLMS' ) ) {
 
 
-			if ( in_array('post-type-archive-course', get_body_class()) || in_array('post-type-archive-llms_membership', get_body_class()) ) {
+	if ( in_array( 'post-type-archive-course', get_body_class() ) || in_array( 'post-type-archive-llms_membership', get_body_class() ) ) {
 
-				return;
-			} else {
+		return;
+	} else {
 
-				if ( ( is_page() && 'no' === get_theme_mod( 'responsive_page_sidebar_position', 'right' ) ) ||
-				( is_page() && 'no' === get_post_meta( get_the_ID(), 'responsive_page_meta_sidebar_position', true ) ) ||
-				( is_single() && 'no' === get_theme_mod( 'responsive_single_blog_sidebar_position', 'right' ) ) ||
-				( ( is_home() || is_search() || is_archive() ) && 'no' === get_theme_mod( 'responsive_blog_sidebar_position', 'right' ) )
-			) {
-				return;
-			}
+		if ( ( is_page() && 'no' === get_theme_mod( 'responsive_page_sidebar_position', 'right' ) ) ||
+		( is_page() && 'no' === get_post_meta( get_the_ID(), 'responsive_page_meta_sidebar_position', true ) ) ||
+		( is_single() && 'no' === get_theme_mod( 'responsive_single_blog_sidebar_position', 'right' ) ) ||
+		( ( is_home() || is_search() || is_archive() ) && 'no' === get_theme_mod( 'responsive_blog_sidebar_position', 'right' ) )
+		) {
+			return;
+		}
 
-				?>
+		?>
 				<aside id="secondary" class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
 
 				<?php
@@ -66,16 +66,14 @@
 				Responsive\responsive_widgets(); // above widgets hook.
 				if ( ! dynamic_sidebar( 'main-sidebar' ) ) :
 				endif; // End of main-sidebar.
-					Responsive\responsive_widgets_end(); // after widgets hook.
+				Responsive\responsive_widgets_end(); // after widgets hook.
 				?>
 
 				</aside><!-- end of #secondary -->
 				<?php
 				Responsive\responsive_widgets_after(); // after widgets container hook.
 
-			}
-
-
+	}
 } else {
 
 	if ( ( is_page() && 'no' === get_theme_mod( 'responsive_page_sidebar_position', 'right' ) ) ||
@@ -85,16 +83,25 @@
 	) {
 		return;
 	}
+	global $post;
+	$custom = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
+	$layout = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
+	if ( 'full-width-page' === $layout ) {
+		?>
+		<aside id="secondary" style="display:none;"class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
+		<?php
+	} else {
+		?>
 
-	?>
 	<aside id="secondary" class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
 
+	<?php } ?>
 	<?php
 
 	Responsive\responsive_widgets(); // above widgets hook.
 	if ( ! dynamic_sidebar( 'main-sidebar' ) ) :
 	endif; // End of main-sidebar.
-		Responsive\responsive_widgets_end(); // after widgets hook.
+	Responsive\responsive_widgets_end(); // after widgets hook.
 	?>
 
 	</aside><!-- end of #secondary -->

From b72e69ef3384e94e6f9e9c68627a44b46c5dc3ec Mon Sep 17 00:00:00 2001
From: Divya Narhe <divya.narhe@hbwsl.com>
Date: Tue, 25 Jun 2024 00:09:55 +0530
Subject: [PATCH 2/4] Removed code from develop

---
 core/includes/hooks.php            | 189 +++++++++++++----------------
 core/includes/post-custom-meta.php |  12 +-
 sidebar.php                        |  13 +-
 3 files changed, 88 insertions(+), 126 deletions(-)

diff --git a/core/includes/hooks.php b/core/includes/hooks.php
index f3733301a..d4bd5d80a 100644
--- a/core/includes/hooks.php
+++ b/core/includes/hooks.php
@@ -303,38 +303,13 @@ function responsive_theme_options() {
  * Responsive_wrapper_class
  */
 function responsive_wrapper_classes() {
-	global $post;
-	$custom = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
-	$layout = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
-	error_log( 'Layout in hook =>' . print_r( $layout, true ) );
 	?>
-
 	<div id="wrapper" class="site-content clearfix">
 		<div class="content-outer container">
-			<?php
-			if ( 'sidebar-content-page' === $layout ) {
-				?>
-					<div class="row responsive-sidebar-content-post" style="flex-direction: row-reverse;">
-				<?php
-			} elseif ( 'full-width-page' === $layout ) {
-				?>
-				<div class="row" id="responsive-post-layout-container">
-				<?php
-			} else {
-				?>
-				<div class="row " id="responsive-post-layout-container">
-				<?php
-			}
-			?>
-						
-				<?php
-				responsive_in_wrapper(); // wrapper hook.
-				if ( 'full-width-page' === $layout ) {
-					?>
-				<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role="main" style="width:100%;">
-				<?php } else { ?>
+			<div class="row">
+				<?php responsive_in_wrapper(); // wrapper hook. ?>
+
 				<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role="main">
-				<?php } ?>
 					<?php
 					if ( is_home() || is_archive() ) {
 						echo '<div class="content-area-wrapper">';
@@ -344,36 +319,36 @@ function responsive_wrapper_classes() {
 					}
 }
 
-				/**
-				 * Responsive_wrapper_class
-				 */
+/**
+ * Responsive_wrapper_class
+ */
 function responsive_wrapper_classes_close() {
 	?>
 		</div>
 	</div>
 	<?php responsive_wrapper_bottom(); // after wrapper content hook. ?>
 </div> <!-- end of #wrapper -->
-					<?php
+	<?php
 }
 
-				/**
-				 * Responsive_woocommerce_wrapper
-				 */
+/**
+ * Responsive_woocommerce_wrapper
+ */
 function responsive_woocommerce_wrapper() {
 	?>
 	<div id="wrapper" class="site-content clearfix">
 			<div class="content-outer container">
 				<div class="row">
 					<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>">
-		<?php
-		if ( is_woocommerce() ) {
-			echo '<div class="site-content-header">';
-		}
+						<?php
+						if ( is_woocommerce() ) {
+							echo '<div class="site-content-header">';
+						}
 }
 
-				/**
-				 * [responsive_woocommerce_wrapper_end description]
-				 */
+/**
+ * [responsive_woocommerce_wrapper_end description]
+ */
 function responsive_woocommerce_wrapper_end() {
 	echo '</main><!-- end of #primary -->';
 		get_sidebar();
@@ -381,11 +356,11 @@ function responsive_woocommerce_wrapper_end() {
 }
 
 
-				/**
-				 * [responsive_woocommerce_before_shop_loop description]
-				 *
-				 * @return void [description].
-				 */
+/**
+ * [responsive_woocommerce_before_shop_loop description]
+ *
+ * @return void [description].
+ */
 function responsive_woocommerce_archive_description() {
 	?>
 	</div>
@@ -393,11 +368,11 @@ function responsive_woocommerce_archive_description() {
 		<?php
 }
 
-				/**
-				 * [responsive_woocommerce_after_single_product_summary description]
-				 *
-				 * @return void [description].
-				 */
+/**
+ * [responsive_woocommerce_after_single_product_summary description]
+ *
+ * @return void [description].
+ */
 function responsive_woocommerce_after_single_product_summary() {
 	?>
 	</div>
@@ -405,12 +380,12 @@ function responsive_woocommerce_after_single_product_summary() {
 		<?php
 }
 
-				/**
-				 * Read more text.
-				 *
-				 * @param string $text default read more text.
-				 * @return string read more text
-				 */
+/**
+ * Read more text.
+ *
+ * @param string $text default read more text.
+ * @return string read more text
+ */
 function responsive_sensei_read_more_text( $text ) {
 	global $post;
 	if ( 'course' === $post->post_type ) {
@@ -422,12 +397,12 @@ function responsive_sensei_read_more_text( $text ) {
 	return $text;
 }
 
-				/**
-				 * Returns excerpt length
-				 *
-				 * @param  integer $length Length of excerpt.
-				 * @return integer         Length of excerpt.
-				 */
+/**
+ * Returns excerpt length
+ *
+ * @param  integer $length Length of excerpt.
+ * @return integer         Length of excerpt.
+ */
 function responsive_sensei_custom_excerpt_length( $length ) {
 	global $post;
 	if ( 'course' === $post->post_type ) {
@@ -439,11 +414,11 @@ function responsive_sensei_custom_excerpt_length( $length ) {
 	return $length;
 }
 
-				/**
-				 * [responsive_theme_wrapper_start description]
-				 *
-				 * @return void [description].
-				 */
+/**
+ * [responsive_theme_wrapper_start description]
+ *
+ * @return void [description].
+ */
 function responsive_theme_wrapper_start() {
 	?>
 	<div id="wrapper" class="site-content clearfix">
@@ -453,11 +428,11 @@ function responsive_theme_wrapper_start() {
 					<?php
 }
 
-				/**
-				 * [responsive_theme_wrapper_end description]
-				 *
-				 * @return void [description].
-				 */
+/**
+ * [responsive_theme_wrapper_end description]
+ *
+ * @return void [description].
+ */
 function responsive_theme_wrapper_end() {
 	echo '</main><!-- end of #primary -->';
 	if ( is_single() ) {
@@ -466,31 +441,31 @@ function responsive_theme_wrapper_end() {
 	echo '</div></div></div>';
 }
 
-				/**
-				 * [responsive_open_container description]
-				 *
-				 * @return void [description]
-				 */
+/**
+ * [responsive_open_container description]
+ *
+ * @return void [description]
+ */
 function responsive_open_container() {
 	echo '<div class="container">';
 }
 
-				/**
-				 * [responsive_close_container description]
-				 *
-				 * @return void [description]
-				 */
+/**
+ * [responsive_close_container description]
+ *
+ * @return void [description]
+ */
 function responsive_close_container() {
 	echo '</div>';
 }
 
-				/**
-				 * Classes
-				 */
-				/**
-				 * Add No-JS Class.
-				 * If we're missing JavaScript support, the HTML element will have a no-js class.
-				 */
+/**
+ * Classes
+ */
+/**
+ * Add No-JS Class.
+ * If we're missing JavaScript support, the HTML element will have a no-js class.
+ */
 function responsive_no_js_class() {
 
 	?>
@@ -499,9 +474,9 @@ function responsive_no_js_class() {
 
 }
 
-				/**
-				 * Change the custom logo URL
-				 */
+/**
+ * Change the custom logo URL
+ */
 function responsive_custom_logo_link() {
 
 	// The logo.
@@ -539,27 +514,27 @@ function responsive_custom_logo_link() {
 	return $html;
 }
 
-				/**
-				 * Responsive child theme custom header
-				 *
-				 * @see header.php
-				 */
+/**
+ * Responsive child theme custom header
+ *
+ * @see header.php
+ */
 function responsive_custom_header() {
 	do_action( 'responsive_custom_header' );
 }
 
-				/**
-				 * Responsive child theme custom footer
-				 *
-				 * @see footer.php
-				 */
+/**
+ * Responsive child theme custom footer
+ *
+ * @see footer.php
+ */
 function responsive_custom_footer() {
 	do_action( 'responsive_custom_footer' );
 }
 
-				/**
-				 * Single Blog Related Posts Entry
-				 */
+/**
+ * Single Blog Related Posts Entry
+ */
 function responsive_single_blog_related_posts_entry() {
 	do_action( 'responsive_single_blog_related_posts_entry' );
 }
diff --git a/core/includes/post-custom-meta.php b/core/includes/post-custom-meta.php
index 9e6561067..2250d6470 100644
--- a/core/includes/post-custom-meta.php
+++ b/core/includes/post-custom-meta.php
@@ -137,6 +137,9 @@ function responsive_get_valid_layouts() {
 		'content-sidebar-page' => __( 'Content/Sidebar', 'responsive' ),
 		'sidebar-content-page' => __( 'Sidebar/Content', 'responsive' ),
 		'full-width-page'      => __( 'Full Width Page (no sidebar)', 'responsive' ),
+		'blog-2-col'           => __( 'Blog 2 Column', 'responsive' ),
+		'blog-3-col'           => __( 'Blog 3 Column', 'responsive' ),
+		'blog-4-col'           => __( 'Blog 4 Column', 'responsive' ),
 	);
 
 	return apply_filters( 'responsive_valid_layouts', $layouts );
@@ -191,7 +194,7 @@ function responsive_layout_meta_box() {
 	$valid_layouts = responsive_get_valid_layouts();
 	?>
 	<p>
-		<select name="_responsive_layout" id="responsive-layout-select">
+		<select name="_responsive_layout">
 		<?php foreach ( $valid_layouts as $slug => $name ) { ?>
 			<?php $selected = selected( $layout, $slug, false ); ?>
 			<option value="<?php echo esc_html( $slug ); ?>" <?php echo esc_html( $selected ); ?>><?php echo esc_html( $name ); ?></option>
@@ -200,13 +203,6 @@ function responsive_layout_meta_box() {
 	</p>
 	<?php
 }
-function save_responsive_layout_meta( $post_id ) {
-	if ( isset( $_POST['_responsive_layout'] ) ) {
-		update_post_meta( $post_id, '_responsive_layout', sanitize_text_field( $_POST['_responsive_layout'] ) );
-	}
-}
-add_action( 'save_post', 'save_responsive_layout_meta' );
-
 
 /**
  * Validate, sanitize, and save post metadata.
diff --git a/sidebar.php b/sidebar.php
index f962bbba0..73074fbb9 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -83,25 +83,16 @@
 	) {
 		return;
 	}
-	global $post;
-	$custom = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
-	$layout = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
-	if ( 'full-width-page' === $layout ) {
-		?>
-		<aside id="secondary" style="display:none;"class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
-		<?php
-	} else {
-		?>
 
+	?>
 	<aside id="secondary" class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
 
-	<?php } ?>
 	<?php
 
 	Responsive\responsive_widgets(); // above widgets hook.
 	if ( ! dynamic_sidebar( 'main-sidebar' ) ) :
 	endif; // End of main-sidebar.
-	Responsive\responsive_widgets_end(); // after widgets hook.
+		Responsive\responsive_widgets_end(); // after widgets hook.
 	?>
 
 	</aside><!-- end of #secondary -->

From 4fafdf8f0e98930d6840cccb10cc3f67b0216581 Mon Sep 17 00:00:00 2001
From: Divya Narhe <divya.narhe@hbwsl.com>
Date: Tue, 25 Jun 2024 12:06:36 +0530
Subject: [PATCH 3/4] Fixed post layout.

---
 core/includes/hooks.php            | 31 ++++++++++++++++++++++++++----
 core/includes/post-custom-meta.php | 21 +++++++++++++++-----
 core/sass/style.scss               |  3 +++
 sidebar.php                        | 19 +++++++++++++++++-
 4 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/core/includes/hooks.php b/core/includes/hooks.php
index d4bd5d80a..8b3893206 100644
--- a/core/includes/hooks.php
+++ b/core/includes/hooks.php
@@ -303,13 +303,36 @@ function responsive_theme_options() {
  * Responsive_wrapper_class
  */
 function responsive_wrapper_classes() {
+	global $post;
+	$custom        = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
+	$layout        = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
+	$valid_layouts = responsive_get_valid_layouts();
 	?>
 	<div id="wrapper" class="site-content clearfix">
-		<div class="content-outer container">
-			<div class="row">
+		<div class="content-outer container">			
+		<?php
+		if ( is_single() ) {
+			$row_class = ( 'sidebar-content-page' === $layout )
+				? esc_attr( implode( ' ', responsive_get_content_classes() ) )
+				: '';
+		} else {
+			$row_class = '';
+		}
+		?>
+		<div class="row <?php echo esc_html( $row_class ); ?>">
+			
 				<?php responsive_in_wrapper(); // wrapper hook. ?>
-
-				<main id="primary" class="content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role="main">
+				<?php
+				if ( is_single() && 'full-width-page' === $layout ) {
+					?>
+					<main id="primary" class="content-area col-layout-full-width" role="main" style="width:100%;">
+					<?php
+				} else {
+					?>
+					<main id = 'primary' class = "content-area <?php echo esc_attr( implode( ' ', responsive_get_content_classes() ) ); ?>" role = 'main' >
+					<?php
+				}
+				?>
 					<?php
 					if ( is_home() || is_archive() ) {
 						echo '<div class="content-area-wrapper">';
diff --git a/core/includes/post-custom-meta.php b/core/includes/post-custom-meta.php
index 2250d6470..611dfa0b9 100644
--- a/core/includes/post-custom-meta.php
+++ b/core/includes/post-custom-meta.php
@@ -137,9 +137,6 @@ function responsive_get_valid_layouts() {
 		'content-sidebar-page' => __( 'Content/Sidebar', 'responsive' ),
 		'sidebar-content-page' => __( 'Sidebar/Content', 'responsive' ),
 		'full-width-page'      => __( 'Full Width Page (no sidebar)', 'responsive' ),
-		'blog-2-col'           => __( 'Blog 2 Column', 'responsive' ),
-		'blog-3-col'           => __( 'Blog 3 Column', 'responsive' ),
-		'blog-4-col'           => __( 'Blog 4 Column', 'responsive' ),
 	);
 
 	return apply_filters( 'responsive_valid_layouts', $layouts );
@@ -197,12 +194,27 @@ function responsive_layout_meta_box() {
 		<select name="_responsive_layout">
 		<?php foreach ( $valid_layouts as $slug => $name ) { ?>
 			<?php $selected = selected( $layout, $slug, false ); ?>
-			<option value="<?php echo esc_html( $slug ); ?>" <?php echo esc_html( $selected ); ?>><?php echo esc_html( $name ); ?></option>
+			<<option value="<?php echo esc_html( $slug ); ?>" <?php echo wp_kses_post( $selected ); ?>><?php echo esc_html( $name ); ?></option>
 		<?php } ?>
 		</select>
 	</p>
 	<?php
 }
+/**
+ * Saves the layout meta data for a post.
+ *
+ * This function checks if the '_responsive_layout' value is set in the POST request.
+ * If it is set, it sanitizes the input and updates the post meta for the given post ID.
+ *
+ * @param int $post_id The ID of the post being saved.
+ */
+function save_responsive_layout_meta( $post_id ) {
+	if ( isset( $_POST['_responsive_layout'] ) ) {
+		update_post_meta( $post_id, '_responsive_layout', sanitize_text_field( $_POST['_responsive_layout'] ) );
+	}
+}
+add_action( 'save_post', 'save_responsive_layout_meta' );
+
 
 /**
  * Validate, sanitize, and save post metadata.
@@ -225,7 +237,6 @@ function responsive_save_layout_post_metadata() {
 	}
 	$valid_layouts = responsive_get_valid_layouts();
 	$layout        = ( isset( $_POST['_responsive_layout'] ) && array_key_exists( (string) wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['_responsive_layout'] ) ) ), $valid_layouts ) ? wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['_responsive_layout'] ) ) ) : 'default' );
-
 	update_post_meta( $post->ID, '_responsive_layout', $layout );
 }
 
diff --git a/core/sass/style.scss b/core/sass/style.scss
index 6b41c0833..4b18eaa03 100644
--- a/core/sass/style.scss
+++ b/core/sass/style.scss
@@ -113,4 +113,7 @@ body {
 .page.sidebar-position-no:not(.woocommerce) .alignwide{
 	margin-left: auto;
 	margin-right: auto;
+}
+#wrapper .content-outer >.row.grid-right.col-620.fit{
+	flex-direction: row-reverse;
 }
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index 73074fbb9..f256615fd 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -85,7 +85,24 @@
 	}
 
 	?>
-	<aside id="secondary" class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
+	<?php
+	global $post;
+	$custom        = ( get_post_custom( $post->ID ) ? get_post_custom( $post->ID ) : false );
+	$layout        = ( isset( $custom['_responsive_layout'][0] ) ? $custom['_responsive_layout'][0] : 'default' );
+	$valid_layouts = responsive_get_valid_layouts();
+
+	if ( is_single() && 'full-width-page' === $layout ) {
+		?>
+		<aside id="secondary" class="main-sidebar widget-area col-layout-fw-sidebar" role="complementary" style="display:none;" <?php responsive_schema_markup( 'sidebar' ); ?>>
+
+		<?php
+	} else {
+		?>
+		<aside id="secondary" class="main-sidebar widget-area <?php echo esc_attr( implode( ' ', responsive_get_sidebar_classes() ) ); ?>" role="complementary" <?php responsive_schema_markup( 'sidebar' ); ?>>
+
+		<?php
+	}
+	?>
 
 	<?php
 

From 347a85ab156fd0b15f162de27091d6b2c49afb8f Mon Sep 17 00:00:00 2001
From: Divya Narhe <divya.narhe@hbwsl.com>
Date: Thu, 27 Jun 2024 10:01:34 +0530
Subject: [PATCH 4/4] Remove extra opening bracket.

---
 core/includes/post-custom-meta.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/includes/post-custom-meta.php b/core/includes/post-custom-meta.php
index 611dfa0b9..ac8a6dcca 100644
--- a/core/includes/post-custom-meta.php
+++ b/core/includes/post-custom-meta.php
@@ -194,7 +194,7 @@ function responsive_layout_meta_box() {
 		<select name="_responsive_layout">
 		<?php foreach ( $valid_layouts as $slug => $name ) { ?>
 			<?php $selected = selected( $layout, $slug, false ); ?>
-			<<option value="<?php echo esc_html( $slug ); ?>" <?php echo wp_kses_post( $selected ); ?>><?php echo esc_html( $name ); ?></option>
+			<option value="<?php echo esc_html( $slug ); ?>" <?php echo wp_kses_post( $selected ); ?>><?php echo esc_html( $name ); ?></option>
 		<?php } ?>
 		</select>
 	</p>