Skip to content

Commit

Permalink
Merge branch 'release/1.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregpriday
gregpriday committed Aug 29, 2016
2 parents 5f53a6a + 20773f3 commit 1316ec3
Show file tree
Hide file tree
Showing 20 changed files with 565 additions and 115 deletions.
8 changes: 8 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ Change Log

View full release information on [Github](https://github.com/siteorigin/vantage/releases).

#### 1.5.4
* Added header widget area.
* Applied read more setting to circle and grid archive loops.
* Added WPML config file.
* Added columns setting for circle icon loop archives.
* Always show mobile menu when mobile menu collapse set to 0.
* Disabled force PB styles fullwidth by default.

#### 1.5.3
* Update to latest settings framework.
* Added notice for premium users downgraded to free version.
Expand Down
7 changes: 4 additions & 3 deletions content.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>

<?php if( has_post_thumbnail() && siteorigin_setting('blog_featured_image_type') == 'icon' ): ?>
<?php if ( has_post_thumbnail() && siteorigin_setting( 'blog_featured_image_type' ) == 'icon' ): ?>
<div class="entry-thumbnail">
<a href="<?php the_permalink() ?>"><?php the_post_thumbnail( 'thumbnail' ) ?></a>
</div>
Expand All @@ -21,7 +21,7 @@
<?php do_action('vantage_entry_main_top') ?>

<header class="entry-header">
<?php if( has_post_thumbnail() && siteorigin_setting('blog_featured_image_type') == 'large' ): ?>
<?php if ( has_post_thumbnail() && siteorigin_setting( 'blog_featured_image_type' ) == 'large' ): ?>
<div class="entry-thumbnail">
<a href="<?php the_permalink() ?>"><?php vantage_entry_thumbnail(); ?></a>
</div>
Expand All @@ -43,7 +43,8 @@
</div><!-- .entry-summary -->
<?php else : ?>
<div class="entry-content">
<?php if(siteorigin_setting('blog_archive_content') == 'excerpt') the_excerpt(); else the_content(); ?>
<?php if ( siteorigin_setting( 'blog_archive_content' ) == 'excerpt' ) the_excerpt(); else the_content(); ?>
<?php echo ( ( siteorigin_setting( 'blog_read_more_button' ) && siteorigin_setting( 'blog_archive_content' ) == 'excerpt' ) ? '<a class="more-link" href="' . get_permalink() . '">' . esc_html( siteorigin_setting( 'blog_read_more' ) ) .'<span class="meta-nav">&rarr;</span></a>' : '' ); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'vantage' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php endif; ?>
Expand Down
32 changes: 25 additions & 7 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ function vantage_setup() {

add_filter( 'infinite_scroll_settings', 'vantage_infinite_scroll_settings' );

// Allowing use of shortcodes in taxonomy descriptions
add_filter( 'term_description', 'shortcode_unautop');
add_filter( 'term_description', 'do_shortcode' );

add_theme_support( 'infinite-scroll', array(
'container' => $container,
'footer' => 'page',
Expand Down Expand Up @@ -241,6 +245,7 @@ function vantage_widgets_init() {
register_sidebar( array(
'name' => __( 'Sidebar', 'vantage' ),
'id' => 'sidebar-1',
'description' => __( 'Displays to the right or left of the content area.', 'vantage' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
Expand All @@ -251,6 +256,7 @@ function vantage_widgets_init() {
register_sidebar( array(
'name' => __( 'Shop', 'vantage' ),
'id' => 'shop',
'description' => __( 'Displays on WooCommerce pages.', 'vantage' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
Expand All @@ -261,6 +267,7 @@ function vantage_widgets_init() {
register_sidebar( array(
'name' => __( 'Footer', 'vantage' ),
'id' => 'sidebar-footer',
'description' => __( 'Displays below the content area.', 'vantage' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
Expand All @@ -270,6 +277,17 @@ function vantage_widgets_init() {
register_sidebar( array(
'name' => __( 'Header', 'vantage' ),
'id' => 'sidebar-header',
'description' => __( 'Displays to the right of the logo.', 'vantage' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
'after_title' => '</h3>',
) );

register_sidebar( array(
'name' => __( 'Masthead', 'vantage' ),
'id' => 'sidebar-masthead',
'description' => __( 'Replaces the logo and header widget area.', 'vantage' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
Expand All @@ -287,17 +305,17 @@ function vantage_widgets_init() {
function vantage_print_styles(){
if( !siteorigin_setting('layout_responsive') ) return;

// Create the footer widget CSS
// Create the footer and masthead widget CSS
$sidebars_widgets = wp_get_sidebars_widgets();
$count = isset($sidebars_widgets['sidebar-footer']) ? count($sidebars_widgets['sidebar-footer']) : 1;
$count = max($count,1);
$footer_count = isset( $sidebars_widgets['sidebar-footer'] ) ? count( $sidebars_widgets['sidebar-footer'] ) : 1;
$footer_count = max( $footer_count, 1 );
$masthead_count = isset( $sidebars_widgets['sidebar-masthead'] ) ? count( $sidebars_widgets['sidebar-masthead'] ) : 1;
$masthead_count = max( $masthead_count, 1 );

?>
<style type="text/css" media="screen">
#footer-widgets .widget { width: <?php echo round(100/$count,3) . '%' ?>; }
@media screen and (max-width: 640px) {
#footer-widgets .widget { width: auto; float: none; }
}
#footer-widgets .widget { width: <?php echo round(100/$footer_count,3) . '%' ?>; }
#masthead-widgets .widget { width: <?php echo round(100/$masthead_count,3) . '%' ?>; }
</style>
<?php
}
Expand Down
145 changes: 145 additions & 0 deletions inc/customizer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ function vantage_customizer_init(){
'title' => __('Mobile Menu', 'vantage'),
'priority' => 60,
),
'vantage_buttons' => array(
'title' => __('Buttons', 'vantage'),
'priority' => 65,
),
'vantage_widgets' => array(
'title' => __('Widgets', 'vantage'),
'priority' => 70,
Expand Down Expand Up @@ -450,7 +454,67 @@ function vantage_customizer_init(){
'property' => 'border-color',
),
),
'vantage_buttons' => array(
'button_background' => array(
'type' => 'color',
'title' => __('Button Background Color', 'vantage'),
'default' => '#dfdfdf',
'callback' => 'vantage_customizer_callback_button_background',
),
'button_color' => array(
'type' => 'color',
'title' => __('Button Color', 'vantage'),
'default' => '#646464',
'selector' => 'a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, .woocommerce #respond input#submit:hover, .woocommerce a.button:hover, .woocommerce button.button:hover, .woocommerce input.button:hover, .woocommerce input.button:disabled, .woocommerce input.button:disabled[disabled], .woocommerce input.button:disabled:hover, .woocommerce input.button:disabled[disabled]:hover, #infinite-handle span button',
'property' => 'color',
),
'button_border' => array(
'type' => 'color',
'title' => __('Button Border Color', 'vantage'),
'default' => '#c3c3c3',
'callback' => 'vantage_customizer_callback_button_border',
),
'button_text_shadow' => array(
'type' => 'checkbox',
'title' => __('Button Text Shadow', 'vantage'),
'default' => true,
'callback' => 'vantage_customizer_callback_button_text_shadow',
),
'button_shadow' => array(
'type' => 'checkbox',
'title' => __('Button Shadow', 'vantage'),
'default' => true,
'callback' => 'vantage_customizer_callback_button_shadow',
),
'secondary_button_background' => array(
'type' => 'color',
'title' => __('Checkout Button Background Color', 'vantage'),
'default' => '#00bcff',
'callback' => 'vantage_customizer_callback_button_woo_background',
),
'secondary_button_color' => array(
'type' => 'color',
'title' => __('Checkout Button Color', 'vantage'),
'default' => '#ffffff',
'selector' => '.woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt, .woocommerce #respond input#submit.alt:hover, .woocommerce a.button.alt:hover, .woocommerce button.button.alt:hover, .woocommerce input.button.alt:hover, .woocommerce #respond input#submit.alt:focus, .woocommerce a.button.alt:focus, .woocommerce button.button.alt:focus, .woocommerce input.button.alt:focus',
'property' => 'color',
),
'secondary_button_border' => array(
'type' => 'color',
'title' => __('Checkout Button Border Color', 'vantage'),
'default' => '#646464',
'selector' => '.woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt, .woocommerce #respond input#submit.alt:hover, .woocommerce a.button.alt:hover, .woocommerce button.button.alt:hover, .woocommerce input.button.alt:hover, .woocommerce #respond input#submit.alt:focus, .woocommerce a.button.alt:focus, .woocommerce button.button.alt:focus, .woocommerce input.button.alt:focus',
'property' => 'border-color',
),
),
'vantage_widgets' => array(
'masthead' => array(
'type' => 'color',
'title' => __(' Masthead Sidebar Widget Titles', 'vantage'),
'default' => '#3b3b3b',
'selector' => '#masthead-widgets .widget .widget-title',
'property' => 'color',
),
'circle_icon_bg' => array(
'type' => 'color',
'title' => __('Circle Icon Widget Background', 'vantage'),
Expand Down Expand Up @@ -627,6 +691,10 @@ function vantage_customizer_init(){
),
) );

if( !class_exists( 'WooCommerce' ) ) {
unset( $settings['vantage_buttons']['secondary_button_background'], $settings['vantage_buttons']['secondary_button_color'], $settings['vantage_buttons']['secondary_button_border'] );
}

// Include all the SiteOrigin customizer classes
global $siteorigin_vantage_customizer;
$siteorigin_vantage_customizer = new SiteOrigin_Customizer_Helper($settings, $sections, 'vantage');
Expand Down Expand Up @@ -755,6 +823,83 @@ function vantage_customizer_callback_heading_color($builder, $val, $setting){
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
* @param array $setting
*
* @return SiteOrigin_Customizer_CSS_Builder
*/
function vantage_customizer_callback_button_background($builder, $val, $setting){
if( $val ) {
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, #infinite-handle span', 'background', $val);
$builder->add_css('a.button:hover, button:hover, html input[type="button"]:hover, input[type="reset"]:hover, input[type="submit"]:hover, .post-navigation a:hover, #image-navigation a:hover, article.post .more-link:hover, article.page .more-link:hover, .paging-navigation a:hover, .woocommerce #page-wrapper .button:hover, .woocommerce a.button:hover, .woocommerce .checkout-button:hover, .woocommerce input.button:hover, .woocommerce input.button:disabled:hover, .woocommerce input.button:disabled[disabled]:hover, #infinite-handle span:hover', 'background', $val);
$builder->add_css('a.button:hover, button:hover, html input[type="button"]:hover, input[type="reset"]:hover, input[type="submit"]:hover, .post-navigation a:hover, #image-navigation a:hover, article.post .more-link:hover, article.page .more-link:hover, .paging-navigation a:hover, .woocommerce #page-wrapper .button:hover, .woocommerce a.button:hover, .woocommerce .checkout-button:hover, .woocommerce input.button:hover, #infinite-handle span:hover', 'opacity', '0.75');
$builder->add_css('a.button:focus, button:focus, html input[type="button"]:focus, input[type="reset"]:focus, input[type="submit"]:focus, .post-navigation a:focus, #image-navigation a:focus, article.post .more-link:focus, article.page .more-link:focus, .paging-navigation a:focus, .woocommerce #page-wrapper .button:focus, .woocommerce a.button:focus, .woocommerce .checkout-button:focus, .woocommerce input.button:focus, .woocommerce input.button:disabled:focus, .woocommerce input.button:disabled[disabled]:focus, #infinite-handle span:focus', 'background', $val);
$builder->add_css('a.button:focus, button:focus, html input[type="button"]:focus, input[type="reset"]:focus, input[type="submit"]:focus, .post-navigation a:focus, #image-navigation a:focus, article.post .more-link:focus, article.page .more-link:focus, .paging-navigation a:focus, .woocommerce #page-wrapper .button:focus, .woocommerce a.button:focus, .woocommerce .checkout-button:focus, .woocommerce input.button:focus, #infinite-handle span:focus', 'opacity', '0.75');
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
* @param array $setting
*
* @return SiteOrigin_Customizer_CSS_Builder
*/
function vantage_customizer_callback_button_border($builder, $val, $setting){
if( $val ) {
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, #infinite-handle span', 'border-color', $val);
$builder->add_css('a.button:hover, button:hover, html input[type="button"]:hover, input[type="reset"]:hover, input[type="submit"]:hover, .post-navigation a:hover, #image-navigation a:hover, article.post .more-link:hover, article.page .more-link:hover, .paging-navigation a:hover, .woocommerce #page-wrapper .button:hover, .woocommerce a.button:hover, .woocommerce .checkout-button:hover, .woocommerce input.button:hover, #infinite-handle span:hover', 'border-color', $val);
$builder->add_css('a.button:focus, button:focus, html input[type="button"]:focus, input[type="reset"]:focus, input[type="submit"]:focus, .post-navigation a:focus, #image-navigation a:focus, article.post .more-link:focus, article.page .more-link:focus, .paging-navigation a:focus, .woocommerce #page-wrapper .button:focus, .woocommerce a.button:focus, .woocommerce .checkout-button:focus, .woocommerce input.button:focus, #infinite-handle span:focus', 'border-color', $val);
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
* @param array $setting
*
* @return SiteOrigin_Customizer_CSS_Builder
*/
function vantage_customizer_callback_button_text_shadow($builder, $val, $setting){
if( !$val ) {
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, #infinite-handle span button', 'text-shadow', 'none');
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
* @param array $setting
*
* @return SiteOrigin_Customizer_CSS_Builder
*/
function vantage_customizer_callback_button_shadow($builder, $val, $setting){
if( !$val ) {
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, .woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt, #infinite-handle span', '-webkit-box-shadow', 'none');
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, .woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt, #infinite-handle span', '-moz-box-shadow', 'none');
$builder->add_css('a.button, button, html input[type="button"], input[type="reset"], input[type="submit"], .post-navigation a, #image-navigation a, article.post .more-link, article.page .more-link, .paging-navigation a, .woocommerce #page-wrapper .button, .woocommerce a.button, .woocommerce .checkout-button, .woocommerce input.button, .woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt, #infinite-handle span', 'box-shadow', 'none');
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
* @param array $setting
*
* @return SiteOrigin_Customizer_CSS_Builder
*/
function vantage_customizer_callback_button_woo_background($builder, $val, $setting){
if( $val ) {
$builder->add_css('.woocommerce #respond input#submit.alt, .woocommerce a.button.alt, .woocommerce button.button.alt, .woocommerce input.button.alt', 'background', $val);
$builder->add_css('.woocommerce #respond input#submit.alt:hover, .woocommerce a.button.alt:hover, .woocommerce button.button.alt:hover, .woocommerce input.button.alt:hover', 'background', $val);
$builder->add_css('.woocommerce #respond input#submit.alt:hover, .woocommerce a.button.alt:hover, .woocommerce button.button.alt:hover, .woocommerce input.button.alt:hover', 'opacity', '0.75');
$builder->add_css('.woocommerce #respond input#submit.alt:focus, .woocommerce a.button.alt:focus, .woocommerce button.button.alt:focus, .woocommerce input.button.alt:focus', 'background', $val);
$builder->add_css('.woocommerce #respond input#submit.alt:focus, .woocommerce a.button.alt:focus, .woocommerce button.button.alt:focus, .woocommerce input.button.alt:focus', 'opacity', '0.75');
}
return $builder;
}
/**
* @param SiteOrigin_Customizer_CSS_Builder $builder
* @param mixed $val
Expand Down
10 changes: 10 additions & 0 deletions inc/extras.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,13 @@ function vantage_footer_widget_style(){
}
endif;
add_action('wp_head', 'vantage_footer_widget_style', 15);

if ( ! function_exists( 'vantage_excerpt_length' ) ) :
/*
* Filter the except length
*/
function vantage_excerpt_length( $length ) {
return siteorigin_setting( 'blog_excerpt_length' );
}
endif;
add_filter( 'excerpt_length', 'vantage_excerpt_length', 10 );
2 changes: 1 addition & 1 deletion inc/metaslider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function vantage_metaslider_page_setting_save($post_id){
if( defined('DOING_AJAX') ) return;

update_post_meta($post_id, 'vantage_metaslider_slider', $_POST['vantage_page_metaslider']);
$slider_stretch = filter_input(INPUT_POST, 'vantage_page_metaslider_stretch') == "on";
$slider_stretch = !empty( $_POST['vantage_page_metaslider_stretch'] );
update_post_meta($post_id, 'vantage_metaslider_slider_stretch', $slider_stretch );
// If we're on the home page update the 'home_slider' theme setting as well.
if ( $post_id == get_option( 'page_on_front' ) ) {
Expand Down
Loading

0 comments on commit 1316ec3

Please sign in to comment.