From ddb006d603315902816a324a336fdfa4e1186ffa Mon Sep 17 00:00:00 2001
From: francgrasso <francgrasso@gmail.com>
Date: Wed, 8 Jul 2020 16:24:53 +0200
Subject: [PATCH] version 1.2.13

---
 customizer-css.css                           | 38 +++++++++
 inc/class-customizer-alpha-color-control.php |  8 +-
 inc/customizer.php                           | 83 ++++++++++++++++++++
 inc/sidebars.php                             | 22 ++++++
 inc/template-functions.php                   |  4 +
 js/customizer.js                             |  2 +-
 readme.txt                                   | 14 +++-
 sass/style.scss                              |  2 +-
 sidebar.php                                  |  4 +
 style.css                                    |  2 +-
 10 files changed, 171 insertions(+), 8 deletions(-)

diff --git a/customizer-css.css b/customizer-css.css
index 998c7fc..59be82e 100644
--- a/customizer-css.css
+++ b/customizer-css.css
@@ -19,6 +19,8 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 
 #customize-control-yith_proteo_default_sidebar_position span.customize-inside-control-row,
 #customize-control-yith_proteo_blog_page_sidebar_position span.customize-inside-control-row,
+#customize-control-yith_proteo_blog_category_sidebar_position span.customize-inside-control-row,
+#customize-control-yith_proteo_blog_tag_sidebar_position span.customize-inside-control-row,
 #customize-control-yith_proteo_product_page_sidebar_position span.customize-inside-control-row,
 #customize-control-yith_proteo_product_category_page_sidebar_position span.customize-inside-control-row,
 #customize-control-yith_proteo_product_tag_page_sidebar_position span.customize-inside-control-row,
@@ -32,6 +34,12 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-right,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-left,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-no-sidebar,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-right,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-left,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-no-sidebar,
@@ -54,6 +62,12 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-right + label,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-left + label,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-no-sidebar + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-right + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-left + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-no-sidebar + label,
@@ -72,6 +86,8 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 
 #_customize-input-yith_proteo_default_sidebar_position-radio-right + label:before,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-right + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-right + label:before,
 #_customize-input-yith_proteo_product_category_page_sidebar_position-radio-right + label:before,
 #_customize-input-yith_proteo_product_tag_page_sidebar_position-radio-right + label:before,
@@ -89,6 +105,8 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 
 #_customize-input-yith_proteo_default_sidebar_position-radio-left + label:before,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-left + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-left + label:before,
 #_customize-input-yith_proteo_product_category_page_sidebar_position-radio-left + label:before,
 #_customize-input-yith_proteo_product_tag_page_sidebar_position-radio-left + label:before,
@@ -106,6 +124,8 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 
 #_customize-input-yith_proteo_default_sidebar_position-radio-no-sidebar + label:before,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-no-sidebar + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-no-sidebar + label:before,
 #_customize-input-yith_proteo_product_category_page_sidebar_position-radio-no-sidebar + label:before,
 #_customize-input-yith_proteo_product_tag_page_sidebar_position-radio-no-sidebar + label:before,
@@ -133,6 +153,18 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-right:hover + label:before,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-left:hover + label:before,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-no-sidebar:hover + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right:checked + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left:checked + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar:checked + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right:hover + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left:hover + label:before,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar:hover + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right:checked + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left:checked + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar:checked + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right:hover + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left:hover + label:before,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar:hover + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-right:checked + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-left:checked + label:before,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-no-sidebar:checked + label:before,
@@ -166,6 +198,12 @@ ul#sub-accordion-panel-yith_proteo_shop_options > li.panel-meta span.preview-not
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-right:checked + label,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-left:checked + label,
 #_customize-input-yith_proteo_blog_page_sidebar_position-radio-no-sidebar:checked + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-right:checked + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-left:checked + label,
+#_customize-input-yith_proteo_blog_category_sidebar_position-radio-no-sidebar:checked + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-right:checked + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-left:checked + label,
+#_customize-input-yith_proteo_blog_tag_sidebar_position-radio-no-sidebar:checked + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-right:checked + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-left:checked + label,
 #_customize-input-yith_proteo_product_page_sidebar_position-radio-no-sidebar:checked + label,
diff --git a/inc/class-customizer-alpha-color-control.php b/inc/class-customizer-alpha-color-control.php
index 8210833..6221c8a 100644
--- a/inc/class-customizer-alpha-color-control.php
+++ b/inc/class-customizer-alpha-color-control.php
@@ -76,6 +76,10 @@ public function enqueue() {
 	 * Render the control.
 	 */
 	public function render_content() {
+		// Output the label and description if they were passed in.
+		if ( isset( $this->label ) && '' !== $this->label ) {
+			echo '<span class="customize-control-title">' . esc_html( sanitize_text_field( $this->label ) ) . '</span>';
+		}
 		// Process the palette.
 		if ( is_array( $this->palette ) ) {
 			$palette = implode( '|', $this->palette );
@@ -88,10 +92,6 @@ public function render_content() {
 		// Begin the output. ?>
 		<label>
 			<?php
-			// Output the label and description if they were passed in.
-			if ( isset( $this->label ) && '' !== $this->label ) {
-				echo '<span class="customize-control-title">' . esc_html( sanitize_text_field( $this->label ) ) . '</span>';
-			}
 			if ( isset( $this->description ) && '' !== $this->description ) {
 				echo '<span class="description customize-control-description">' . esc_html( sanitize_text_field( $this->description ) ) . '</span>';
 			}
diff --git a/inc/customizer.php b/inc/customizer.php
index 9b28d69..5209328 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -141,6 +141,89 @@ function yith_proteo_customize_register( $wp_customize ) {
 		)
 	);
 
+	// Blog Category Management options.
+	$wp_customize->add_setting(
+		'yith_proteo_blog_category_sidebar_position',
+		array(
+			'default'           => 'right',
+			'sanitize_callback' => 'yith_proteo_sanitize_sidebar_position',
+		)
+	);
+	$wp_customize->add_control(
+		'yith_proteo_blog_category_sidebar_position',
+		array(
+			'type'        => 'radio',
+			'label'       => esc_html__( 'Choose the position of blog category pages sidebar', 'yith-proteo' ),
+			'section'     => 'yith_proteo_sidebar_management',
+			'description' => esc_html__( 'Select where to display the sidebar.', 'yith-proteo' ),
+			'choices'     => array(
+				'no-sidebar' => esc_html__( 'No sidebar', 'yith-proteo' ),
+				'right'      => esc_html__( 'Right', 'yith-proteo' ),
+				'left'       => esc_html__( 'Left', 'yith-proteo' ),
+			),
+		)
+	);
+
+	// Blog Category Sidebar Chooser.
+	$wp_customize->add_setting(
+		'yith_proteo_blog_category_sidebar',
+		array(
+			'default'           => 'blog-category-sidebar',
+			'sanitize_callback' => 'yith_proteo_sanitize_select',
+		)
+	);
+	$wp_customize->add_control(
+		'yith_proteo_blog_category_sidebar',
+		array(
+			'type'        => 'select',
+			'label'       => esc_html__( 'Choose blog category pages sidebar', 'yith-proteo' ),
+			'section'     => 'yith_proteo_sidebar_management',
+			'description' => esc_html__( 'Select the sidebar to display.', 'yith-proteo' ),
+			'choices'     => wp_list_pluck( $GLOBALS['wp_registered_sidebars'], 'name' ),
+		)
+	);
+
+	// Blog Tag Management options.
+	$wp_customize->add_setting(
+		'yith_proteo_blog_tag_sidebar_position',
+		array(
+			'default'           => 'right',
+			'sanitize_callback' => 'yith_proteo_sanitize_sidebar_position',
+		)
+	);
+	$wp_customize->add_control(
+		'yith_proteo_blog_tag_sidebar_position',
+		array(
+			'type'        => 'radio',
+			'label'       => esc_html__( 'Choose the position of blog tag pages sidebar', 'yith-proteo' ),
+			'section'     => 'yith_proteo_sidebar_management',
+			'description' => esc_html__( 'Select where to display the sidebar.', 'yith-proteo' ),
+			'choices'     => array(
+				'no-sidebar' => esc_html__( 'No sidebar', 'yith-proteo' ),
+				'right'      => esc_html__( 'Right', 'yith-proteo' ),
+				'left'       => esc_html__( 'Left', 'yith-proteo' ),
+			),
+		)
+	);
+
+	// Blog Tag Sidebar Chooser.
+	$wp_customize->add_setting(
+		'yith_proteo_blog_tag_sidebar',
+		array(
+			'default'           => 'blog-tag-sidebar',
+			'sanitize_callback' => 'yith_proteo_sanitize_select',
+		)
+	);
+	$wp_customize->add_control(
+		'yith_proteo_blog_tag_sidebar',
+		array(
+			'type'        => 'select',
+			'label'       => esc_html__( 'Choose blog tag pages sidebar', 'yith-proteo' ),
+			'section'     => 'yith_proteo_sidebar_management',
+			'description' => esc_html__( 'Select the sidebar to display.', 'yith-proteo' ),
+			'choices'     => wp_list_pluck( $GLOBALS['wp_registered_sidebars'], 'name' ),
+		)
+	);
 	/**
 	 * Add topbar management.
 	 */
diff --git a/inc/sidebars.php b/inc/sidebars.php
index 478a786..7c515e9 100644
--- a/inc/sidebars.php
+++ b/inc/sidebars.php
@@ -120,6 +120,28 @@ function yith_proteo_widgets_init() {
 				'after_title'   => '</h2>',
 			)
 		);
+		register_sidebar(
+			array(
+				'name'          => esc_html__( 'Blog category sidebar', 'yith-proteo' ),
+				'id'            => 'blog-category-sidebar',
+				'description'   => esc_html__( 'Add widgets here.', 'yith-proteo' ),
+				'before_widget' => '<section id="%1$s" class="widget %2$s">',
+				'after_widget'  => '</section>',
+				'before_title'  => '<h2 class="widget-title">',
+				'after_title'   => '</h2>',
+			)
+		);
+		register_sidebar(
+			array(
+				'name'          => esc_html__( 'Blog tag sidebar', 'yith-proteo' ),
+				'id'            => 'blog-tag-sidebar',
+				'description'   => esc_html__( 'Add widgets here.', 'yith-proteo' ),
+				'before_widget' => '<section id="%1$s" class="widget %2$s">',
+				'after_widget'  => '</section>',
+				'before_title'  => '<h2 class="widget-title">',
+				'after_title'   => '</h2>',
+			)
+		);
 	}
 endif;
 add_action( 'widgets_init', 'yith_proteo_widgets_init' );
diff --git a/inc/template-functions.php b/inc/template-functions.php
index d14c7bf..36389b9 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -68,6 +68,10 @@ function yith_proteo_get_sidebar_position( $info = null ) {
 		// Check Blog page settings from customizer.
 		if ( is_home() ) {
 			$general_sidebar = get_theme_mod( 'yith_proteo_blog_page_sidebar_position', 'right' );
+		} elseif ( is_category() ) {
+			$general_sidebar = get_theme_mod( 'yith_proteo_blog_category_sidebar_position', 'right' );
+		} elseif ( is_tag() ) {
+			$general_sidebar = get_theme_mod( 'yith_proteo_blog_tag_sidebar_position', 'right' );
 		}
 
 		// Check WooCommerce Shop page settings.
diff --git a/js/customizer.js b/js/customizer.js
index e22b20b..1a68c87 100644
--- a/js/customizer.js
+++ b/js/customizer.js
@@ -5,7 +5,7 @@
  *
  * Contains handlers to make Theme Customizer preview reload changes asynchronously.
  */
-(function($) {
+(function ($) {
 
 	// Site title and description.
 	wp.customize('blogname', function (value) {
diff --git a/readme.txt b/readme.txt
index 428c419..9993c3a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: one-column, two-columns, left-sidebar, right-sidebar, wide-blocks, accessi
 Requires at least: 4.9.6
 Tested up to: WordPress 5.4
 Requires PHP: 5.6
-Stable tag: 1.2.12
+Stable tag: 1.2.13
 YITH Proteo WordPress Theme, Copyright 2020 YITH
 YITH Proteo is distributed under the terms of the GNU GPL
 License: GPLv2 or later
@@ -25,6 +25,18 @@ Proteo is a sleek, modern and "Gutenberg-friendly" e-commerce theme. Developed w
 == Frequently Asked Questions ==
 
 == Changelog ==
+= 1.2.13 - July 08 2020 =
+* Add Alpha Color Picker to theme customizer
+* New option to force all products to use the same sidebar
+* Add general sidebar management for blog categories and blog tags
+* Experimental: lazy loading on loop product images
+* Fix single product default sidebar behaviour
+* Fix centered header layout issue when using custom logo
+* Fix woocommerce label positioning in checkout pages
+* Solve issue #5 opened by @design311 on github
+* Remove reference to missing bootstrap .map file
+
+
 = 1.2.12 - June 30 2020 =
 * New option to set the default sidebar
 * New cross sell products management options
diff --git a/sass/style.scss b/sass/style.scss
index 1c2e131..4c11332 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -5,7 +5,7 @@ Author: YITH
 Author URI: https://yithemes.com
 Description: Proteo is a sleek, modern and “Gutenberg-friendly” e-commerce theme. Developed with a beautiful UI and a minimal design, is perfect for each kind of shop. Easy to manage and to customize, Proteo is the best solution if you want a complete e-commerce template and start quickly to sell your products with WooCommerce without a technical knowledge. Use it also for corporate site or a blog: there are no limits about what you can do with a beautiful and usable theme like this! Main features: Colors and Typography customization (Google font support), Logo customization, 3 different Header layouts, Advanced customizer theme options, Sidebar Management, Sidebar Chooser on each page and product, Page title icons, Top Bar Management, Easy main color shade chooser, Buttons style management (gradient buttons support), Footer management with multiple sidebars, WooCommerce support, Shop Theme Options, Custom WooCommerce messages and animated WooCommerce alert notices, Two cart page layouts, Bootstrap grid system, CSS animations, Gutenberg support, Responsive, Fullscreen search, Multilevel menus, Support to all YITH plugins, SVG icons for HiDPI screens, Translation Ready. <a href="https://proteo.yithemes.com/about-proteo/" rel="nofollow" target="_blank">Discover more ></a> | <a href="https://proteo.yithemes.com/" rel="nofollow" target="_blank">Check our live demo ></a>
 
-Version: 1.2.12.3
+Version: 1.2.13
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: yith-proteo
diff --git a/sidebar.php b/sidebar.php
index b3691a6..700531b 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -48,6 +48,10 @@
 		dynamic_sidebar( get_theme_mod( 'yith_proteo_single_product_default_sidebar', 'shop-sidebar' ) );
 	} elseif ( ( is_single() || is_page() ) && 'inherit' === $sidebar ) {
 		dynamic_sidebar( get_theme_mod( 'yith_proteo_default_sidebar', 'sidebar-1' ) );
+	} elseif ( is_category() ) {
+		dynamic_sidebar( get_theme_mod( 'yith_proteo_blog_category_sidebar', 'sidebar-1' ) );
+	} elseif ( is_tag() ) {
+		dynamic_sidebar( get_theme_mod( 'yith_proteo_blog_tag_sidebar', 'sidebar-1' ) );
 	} elseif ( ! empty( $sidebar ) ) {
 		dynamic_sidebar( $sidebar );
 	} else {
diff --git a/style.css b/style.css
index fd2a6da..a55c621 100644
--- a/style.css
+++ b/style.css
@@ -6,7 +6,7 @@ Author: YITH
 Author URI: https://yithemes.com
 Description: Proteo is a sleek, modern and “Gutenberg-friendly” e-commerce theme. Developed with a beautiful UI and a minimal design, is perfect for each kind of shop. Easy to manage and to customize, Proteo is the best solution if you want a complete e-commerce template and start quickly to sell your products with WooCommerce without a technical knowledge. Use it also for corporate site or a blog: there are no limits about what you can do with a beautiful and usable theme like this! Main features: Colors and Typography customization (Google font support), Logo customization, 3 different Header layouts, Advanced customizer theme options, Sidebar Management, Sidebar Chooser on each page and product, Page title icons, Top Bar Management, Easy main color shade chooser, Buttons style management (gradient buttons support), Footer management with multiple sidebars, WooCommerce support, Shop Theme Options, Custom WooCommerce messages and animated WooCommerce alert notices, Two cart page layouts, Bootstrap grid system, CSS animations, Gutenberg support, Responsive, Fullscreen search, Multilevel menus, Support to all YITH plugins, SVG icons for HiDPI screens, Translation Ready. <a href="https://proteo.yithemes.com/about-proteo/" rel="nofollow" target="_blank">Discover more ></a> | <a href="https://proteo.yithemes.com/" rel="nofollow" target="_blank">Check our live demo ></a>
 
-Version: 1.2.12.3
+Version: 1.2.13
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: yith-proteo