Merge pull request #138 from stef-k/vertical-one-page-woocommerce

Vertical one page woocommerce fix - thx @stef-k !
This commit is contained in:
Holger 2016-11-19 12:19:33 +01:00 committed by GitHub
commit 25e660da89
2 changed files with 43 additions and 23 deletions

View File

@ -16,7 +16,15 @@ if ( ! function_exists ( 'understrap_scripts' ) ) {
} }
// menu - vertical page association // menu - vertical page association
if ( is_page_template( 'page-templates/vertical-one-page.php' ) || is_home() || is_single() ) { // do not load on WooCommerce pages
// do not load if we are in WooCommerce pages
$loadit = true;
if ( class_exists( 'WooCommerce' ) ) {
if (is_woocommerce()) {
$loadit = false;
}
}
if ( is_page_template( ('page-templates/vertical-one-page.php' ) || is_home() || is_single()) && $loadit ) {
wp_enqueue_script( 'vertical-one-page', get_template_directory_uri() . '/js/vertical-one-page.js', array( 'jquery' ), '0.4.9', true ); wp_enqueue_script( 'vertical-one-page', get_template_directory_uri() . '/js/vertical-one-page.js', array( 'jquery' ), '0.4.9', true );
$page_for_posts = strtolower( get_the_title( get_option( 'page_for_posts' ) ) ); $page_for_posts = strtolower( get_the_title( get_option( 'page_for_posts' ) ) );
$home_url = home_url(); $home_url = home_url();

View File

@ -16,10 +16,22 @@
* Exclude the posts page from being shown in this layout. * Exclude the posts page from being shown in this layout.
* Order pages by their order number. * Order pages by their order number.
*/ */
$exclude = get_option( 'page_for_posts' ); $exclude = array();
// exclude blog page
array_push($exclude, get_option( 'page_for_posts' ) );
// exclude WooCommerce pages
array_push( $exclude, get_option( 'woocommerce_cart_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_shop_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_checkout_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_pay_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_thanks_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_myaccount_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_edit_address_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_view_order_page_id' ) );
array_push( $exclude, get_option( 'woocommerce_terms_page_id' ) );
$args = array( $args = array(
'post_type' => 'page', 'post_type' => 'page',
'post__not_in' => array( $exclude ), 'post__not_in' => $exclude,
'orderby' => 'menu_order', 'orderby' => 'menu_order',
'order' => 'ASC' 'order' => 'ASC'
); );