Skip to content

Commit

Permalink
version 1.2.11
Browse files Browse the repository at this point in the history
* Fix shop pages sidebar position management
  • Loading branch information
francgrasso committed Jun 26, 2020
1 parent f3c56e7 commit 8a53db9
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 18 deletions.
16 changes: 6 additions & 10 deletions inc/template-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,15 @@ function yith_proteo_get_sidebar_position( $info = null ) {
if ( class_exists( 'WooCommerce' ) ) {
if ( is_shop() ) {
$general_sidebar = get_post_meta( get_option( 'woocommerce_shop_page_id' ), 'sidebar_position', true );
}
if ( is_product_category() ) {
} elseif ( is_product_category() ) {
$general_sidebar = get_theme_mod( 'yith_proteo_product_category_page_sidebar_position', 'no-sidebar' );
}
if ( is_product_tag() ) {
} elseif ( is_product_tag() ) {
$general_sidebar = get_theme_mod( 'yith_proteo_product_tag_page_sidebar_position', 'no-sidebar' );
}

if ( is_product() ) {
} elseif ( is_product_taxonomy() ) {
$general_sidebar = get_theme_mod( 'yith_proteo_product_tax_page_sidebar_position', 'no-sidebar' );
} elseif ( is_product() ) {
$general_sidebar = get_theme_mod( 'yith_proteo_product_page_sidebar_position', 'no-sidebar' );
}

if ( is_checkout() || is_cart() || is_account_page() ) {
} elseif ( is_checkout() || is_cart() || is_account_page() ) {
return false;
}
}
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Stable tag: 1.2.11
YITH Proteo WordPress Theme, Copyright 2020 YITH
YITH Proteo is distributed under the terms of the GNU GPL
License: GPLv2 or later
Expand All @@ -25,6 +25,9 @@ Proteo is a sleek, modern and "Gutenberg-friendly" e-commerce theme. Developed w
== Frequently Asked Questions ==

== Changelog ==
= 1.2.11 - June 26 2020 =
* Fix shop pages sidebar position management


= 1.2.10 - June 24 2020 =
* Add One Click Demo Import support and configuration
Expand Down
2 changes: 1 addition & 1 deletion sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1
Version: 1.2.11
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: yith-proteo
Expand Down
9 changes: 4 additions & 5 deletions sidebar.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,16 @@

<aside id="secondary" class="widget-area <?php echo '' != yith_proteo_get_sidebar_position() ? 'col-lg-3' : ''; ?>">
<?php

$sidebar = yith_proteo_sidebar_get_meta( 'sidebar_chooser' );
if ( class_exists( 'WooCommerce' ) ) {
if ( is_shop() ) {
$sidebar = get_post_meta( get_option( 'woocommerce_shop_page_id' ), 'sidebar_chooser', true );
}
if ( is_product_category() ) {
} elseif ( is_product_category() ) {
$sidebar = get_theme_mod( 'yith_proteo_product_category_page_sidebar', 'shop-sidebar' );
}
if ( is_product_tag() ) {
} elseif ( is_product_tag() ) {
$sidebar = get_theme_mod( 'yith_proteo_product_tag_page_sidebar', 'shop-sidebar' );
} elseif ( is_product_taxonomy() ) {
$sidebar = get_theme_mod( 'yith_proteo_product_tax_page_sidebar', 'shop-sidebar' );
}
}

Expand Down
2 changes: 1 addition & 1 deletion style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8a53db9

Please sign in to comment.