Skip to content

Commit

Permalink
Merge pull request #248 from MachoThemes/master
Browse files Browse the repository at this point in the history 
Update 1.2.1
  • Loading branch information
@cristianraiber
cristianraiber committed Feb 9, 2018
2 parents ef4c7bb + c38077e commit 3e1cb8c
Show file tree
Hide file tree
Showing 31 changed files with 2,289 additions and 972 deletions.
2 changes: 1 addition & 1 deletion .standard.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"404.php":[],"archive-jetpack-portfolio.php":[],"archive.php":[],"attachment.php":[],"comments.php":[],"footer.php":[],"functions.php":[],"header.php":[],"inc/admin/welcome-screen/class-shapely-notify-system.php":[],"inc/admin/welcome-screen/class-shapely-welcome.php":[],"inc/admin/welcome-screen/sections/actions-required.php":[],"inc/admin/welcome-screen/sections/getting-started.php":[],"inc/admin/welcome-screen/sections/recommended-plugins.php":[],"inc/admin/welcome-screen/sections/support.php":[],"inc/class-shapely-related-posts.php":[],"inc/class-wp-bootstrap-navwalker.php":[],"inc/custom-controls/class-shapely-logo-dimensions.php":[],"inc/customizer.php":[],"inc/extras.php":[],"inc/jetpack.php":[],"inc/libraries/epsilon-framework/class-epsilon-autoloader.php":[],"inc/libraries/epsilon-framework/class-epsilon-framework.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-color-coded-categories.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-color-scheme.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-content-backup.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-customizer.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-notifications.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-notify-system.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-repeater-templates.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-sanitizers.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-scheme.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-customizer-navigation.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-icon-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-image.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-layouts.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-section-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-slider.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-text-editor.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-toggle.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-upsell.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-pro.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-recommended-actions.php":[],"inc/libraries/epsilon-framework/customizer/settings/class-epsilon-setting-repeater.php":[],"inc/socialnav.php":[],"inc/template-tags.php":[],"index.php":[],"page-templates/full-width.php":[],"page-templates/no-sidebar.php":[],"page-templates/sidebar-left.php":[],"page-templates/sidebar-right.php":[],"page-templates/template-home.php":[],"page.php":[],"search.php":[],"sidebar-footer.php":[],"sidebar.php":[],"single-jetpack-portfolio.php":[],"single.php":[],"template-parts/content-attachment.php":[],"template-parts/content-grid-small.php":[],"template-parts/content-grid-wide.php":[],"template-parts/content-none.php":[],"template-parts/content-page.php":[],"template-parts/content-portfolio.php":[],"template-parts/content-search.php":[],"template-parts/content.php":[],"template-parts/layouts/blog-grid.php":[],"template-parts/layouts/blog-large-image-grid.php":[],"template-parts/layouts/blog-large-image.php":[],"woocommerce.php":[],"woocommerce/product-searchform.php":[]}
{"404.php":[],"archive-jetpack-portfolio.php":[],"archive.php":[],"attachment.php":[],"comments.php":[],"footer.php":[],"functions.php":[],"header.php":[],"inc/admin/welcome-screen/class-shapely-notify-system.php":[],"inc/admin/welcome-screen/class-shapely-welcome.php":[],"inc/admin/welcome-screen/sections/actions-required.php":[],"inc/admin/welcome-screen/sections/getting-started.php":[],"inc/admin/welcome-screen/sections/recommended-plugins.php":[],"inc/admin/welcome-screen/sections/support.php":[],"inc/class-shapely-builder.php":[],"inc/class-shapely-notify-system.php":[],"inc/class-shapely-related-posts.php":[],"inc/class-shapely.php":[],"inc/class-wp-bootstrap-navwalker.php":[],"inc/custom-controls/class-shapely-logo-dimensions.php":[],"inc/customizer.php":[],"inc/extras.php":[],"inc/jetpack.php":[],"inc/libraries/epsilon-framework/class-epsilon-autoloader.php":[],"inc/libraries/epsilon-framework/class-epsilon-framework.php":[],"inc/libraries/epsilon-framework/classes/backend/class-epsilon-content-backup.php":[],"inc/libraries/epsilon-framework/classes/backend/class-epsilon-notifications.php":[],"inc/libraries/epsilon-framework/classes/backend/class-epsilon-notify-system.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-ajax-controller.php":[],"inc/libraries/epsilon-framework/classes/class-epsilon-customizer.php":[],"inc/libraries/epsilon-framework/classes/helpers/class-epsilon-helper.php":[],"inc/libraries/epsilon-framework/classes/helpers/class-epsilon-sanitizers.php":[],"inc/libraries/epsilon-framework/classes/output/class-epsilon-color-coded-categories.php":[],"inc/libraries/epsilon-framework/classes/output/class-epsilon-color-scheme.php":[],"inc/libraries/epsilon-framework/classes/output/class-epsilon-page-generator.php":[],"inc/libraries/epsilon-framework/classes/output/class-epsilon-repeater-templates.php":[],"inc/libraries/epsilon-framework/classes/output/class-epsilon-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-button-group.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-color-scheme.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-customizer-navigation.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-icon-picker.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-image.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-layouts.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-section-repeater.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-slider.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-text-editor.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-toggle.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-typography.php":[],"inc/libraries/epsilon-framework/customizer/controls/class-epsilon-control-upsell.php":[],"inc/libraries/epsilon-framework/customizer/panels/class-epsilon-panel-regular.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-doubled.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-pro.php":[],"inc/libraries/epsilon-framework/customizer/sections/class-epsilon-section-recommended-actions.php":[],"inc/libraries/epsilon-framework/customizer/settings/class-epsilon-setting-repeater.php":[],"inc/libraries/welcome-screen/class-epsilon-welcome-screen.php":[],"inc/libraries/welcome-screen/sections/getting-started.php":[],"inc/libraries/welcome-screen/sections/recommended-actions.php":[],"inc/libraries/welcome-screen/sections/recommended-plugins.php":[],"inc/libraries/welcome-screen/sections/support.php":[],"inc/socialnav.php":[],"inc/template-tags.php":[],"index.php":[],"page-templates/full-width.php":[],"page-templates/no-sidebar.php":[],"page-templates/sidebar-left.php":[],"page-templates/sidebar-right.php":[],"page-templates/template-home.php":[],"page-templates/template-widget.php":[],"page.php":[],"search.php":[],"sidebar-footer.php":[],"sidebar.php":[],"single-jetpack-portfolio.php":[],"single.php":[],"template-parts/content-attachment.php":[],"template-parts/content-grid-small.php":[],"template-parts/content-grid-wide.php":[],"template-parts/content-none.php":[],"template-parts/content-page.php":[],"template-parts/content-portfolio.php":[],"template-parts/content-search.php":[],"template-parts/content.php":[],"template-parts/layouts/blog-grid.php":[],"template-parts/layouts/blog-large-image-grid.php":[],"template-parts/layouts/blog-large-image.php":[],"woocommerce.php":[],"woocommerce/product-searchform.php":[]}
2 changes: 0 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ script:
- mkdir -p build/logs
- find -L . -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
- if [[ "$SNIFF" == "1" ]]; then jshint ./assets/js/*.js; fi
- if [[ "$SNIFF" == "1" ]]; then jshint ./inc/admin/welcome-screen/js/*.js; fi
- if [[ "$SNIFF" == "1" ]]; then jscs ./assets/js/*.js; fi
- if [[ "$SNIFF" == "1" ]]; then jscs ./inc/admin/welcome-screen/js/*.js; fi
- if [[ "$SNIFF" == "1" ]]; then grunt textdomain; fi
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./*.php --standard=./phpcs.ruleset.xml
--extensions=php; fi
Expand Down
12 changes: 8 additions & 4 deletions assets/js/customizer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,19 @@
} );

control.widthElement.keyup( function() {
if ( control.respectRatio && control.hasLogo ) {
control.calculateRatio( 'width' );
if ( control.hasLogo ) {
if ( control.respectRatio ) {
control.calculateRatio( 'width' );
}
control.shapelyInterval = setInterval( control.updateControl, 1000, control );
}
} );

control.heightElement.keyup( function() {
if ( control.respectRatio && control.hasLogo ) {
control.calculateRatio( 'height' );
if ( control.hasLogo ) {
if ( control.respectRatio ) {
control.calculateRatio( 'height' );
}
control.shapelyInterval = setInterval( control.updateControl, 1000, control );
}
} );
Expand Down
1 change: 1 addition & 0 deletions assets/js/shapely-scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
} );

} else {

$( play ).on( 'click', function( e ) {
var parent = $( this ).parents( '.video-widget' ),
instance = $( parent ).data( 'vide' ),
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 1.2.1
Implemented milestone https://github.com/puikinsh/shapely/milestone/5

### 1.1.6
Implemented milestone https://github.com/puikinsh/shapely/milestone/2

Expand Down
79 changes: 2 additions & 77 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,71 +114,6 @@ function shapely_setup() {
add_theme_support( 'wc-product-gallery-slider' );

add_theme_support( 'customize-selective-refresh-widgets' );
// Welcome screen
if ( is_admin() ) {
global $shapely_required_actions, $shapely_recommended_plugins;

$shapely_recommended_plugins = array(
'contact-form-7' => array(
'recommended' => false,
),
'fancybox-for-wordpress' => array(
'recommended' => false,
),
'wordpress-seo' => array(
'recommended' => false,
),
);

/*
* id - unique id; required
* title
* description
* check - check for plugins (if installed)
* plugin_slug - the plugin's slug (used for installing the plugin)
*
*/
$path = WPMU_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
if ( ! file_exists( $path ) ) {
$path = WP_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
if ( ! file_exists( $path ) ) {
$path = false;
}
}

$shapely_required_actions = array(
array(
'id' => 'shapely-req-ac-install-companion-plugin',
'title' => Shapely_Notify_System::shapely_companion_title(),
'description' => Shapely_Notify_System::shapely_companion_description(),
'check' => Shapely_Notify_System::shapely_has_plugin( 'shapely-companion' ),
'plugin_slug' => 'shapely-companion',
),
array(
'id' => 'shapely-req-ac-install-wp-jetpack-plugin',
'title' => Shapely_Notify_System::shapely_jetpack_title(),
'description' => Shapely_Notify_System::shapely_jetpack_description(),
'check' => Shapely_Notify_System::shapely_has_plugin( 'jetpack' ),
'plugin_slug' => 'jetpack',
),
array(
'id' => 'shapely-req-ac-install-contact-form-7',
'title' => Shapely_Notify_System::shapely_cf7_title(),
'description' => Shapely_Notify_System::shapely_cf7_description(),
'check' => Shapely_Notify_System::shapely_has_plugin( 'contact-form-7' ),
'plugin_slug' => 'contact-form-7',
),
array(
'id' => 'shapely-req-import-content',
'title' => esc_html__( 'Import content', 'shapely' ),
'external' => $path,
'check' => Shapely_Notify_System::shapely_check_import_req(),
),

);

require get_template_directory() . '/inc/admin/welcome-screen/class-shapely-welcome.php';
}// End if().

// Enable Shortcodes in widgets
add_filter( 'widget_text', 'do_shortcode' );
Expand Down Expand Up @@ -328,16 +263,6 @@ function shapely_scripts() {

add_action( 'wp_enqueue_scripts', 'shapely_scripts' );

// Include Epsilon Framework
require_once 'inc/libraries/epsilon-framework/class-epsilon-autoloader.php';
$args = array(
'controls' => array( 'slider', 'toggle' ), // array of controls to load
'sections' => array( 'recommended-actions', 'pro' ), // array of sections to load
'backup' => false,
);

new Epsilon_Framework( $args );

/**
* Custom template tags for this theme.
*/
Expand Down Expand Up @@ -374,9 +299,9 @@ function shapely_scripts() {
require get_template_directory() . '/inc/class-shapely-related-posts.php';

/**
* Load the system checks ( used for notifications )
* Load the shapely class
*/
require get_template_directory() . '/inc/admin/welcome-screen/class-shapely-notify-system.php';
require get_template_directory() . '/inc/class-shapely.php';

/**
* Load the shapely page builder class
Expand Down
Loading

0 comments on commit 3e1cb8c

Please sign in to comment.