Skip to content

Commit 3e1cb8c

Browse files
cristianraibercristianraiber
authored
Merge pull request #248 from MachoThemes/master
Update 1.2.1
2 parents ef4c7bb + c38077e commit 3e1cb8c

31 files changed

+2289
-972
lines changed

‎.standard.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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":[]}
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-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":[]}

‎.travis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ script:
3838
- mkdir -p build/logs
3939
- find -L . -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
4040
- if [[ "$SNIFF" == "1" ]]; then jshint ./assets/js/*.js; fi
41-
- if [[ "$SNIFF" == "1" ]]; then jshint ./inc/admin/welcome-screen/js/*.js; fi
4241
- if [[ "$SNIFF" == "1" ]]; then jscs ./assets/js/*.js; fi
43-
- if [[ "$SNIFF" == "1" ]]; then jscs ./inc/admin/welcome-screen/js/*.js; fi
4442
- if [[ "$SNIFF" == "1" ]]; then grunt textdomain; fi
4543
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./*.php --standard=./phpcs.ruleset.xml
4644
--extensions=php; fi

‎assets/js/customizer.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@
3535
} );
3636

3737
control.widthElement.keyup( function() {
38-
if ( control.respectRatio && control.hasLogo ) {
39-
control.calculateRatio( 'width' );
38+
if ( control.hasLogo ) {
39+
if ( control.respectRatio ) {
40+
control.calculateRatio( 'width' );
41+
}
4042
control.shapelyInterval = setInterval( control.updateControl, 1000, control );
4143
}
4244
} );
4345

4446
control.heightElement.keyup( function() {
45-
if ( control.respectRatio && control.hasLogo ) {
46-
control.calculateRatio( 'height' );
47+
if ( control.hasLogo ) {
48+
if ( control.respectRatio ) {
49+
control.calculateRatio( 'height' );
50+
}
4751
control.shapelyInterval = setInterval( control.updateControl, 1000, control );
4852
}
4953
} );

‎assets/js/shapely-scripts.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
} );
342342

343343
} else {
344+
344345
$( play ).on( 'click', function( e ) {
345346
var parent = $( this ).parents( '.video-widget' ),
346347
instance = $( parent ).data( 'vide' ),

‎changelog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.2.1
2+
Implemented milestone https://github.com/puikinsh/shapely/milestone/5
3+
14
### 1.1.6
25
Implemented milestone https://github.com/puikinsh/shapely/milestone/2
36

‎functions.php‎

Lines changed: 2 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -114,71 +114,6 @@ function shapely_setup() {
114114
add_theme_support( 'wc-product-gallery-slider' );
115115

116116
add_theme_support( 'customize-selective-refresh-widgets' );
117-
// Welcome screen
118-
if ( is_admin() ) {
119-
global $shapely_required_actions, $shapely_recommended_plugins;
120-
121-
$shapely_recommended_plugins = array(
122-
'contact-form-7' => array(
123-
'recommended' => false,
124-
),
125-
'fancybox-for-wordpress' => array(
126-
'recommended' => false,
127-
),
128-
'wordpress-seo' => array(
129-
'recommended' => false,
130-
),
131-
);
132-
133-
/*
134-
* id - unique id; required
135-
* title
136-
* description
137-
* check - check for plugins (if installed)
138-
* plugin_slug - the plugin's slug (used for installing the plugin)
139-
*
140-
*/
141-
$path = WPMU_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
142-
if ( ! file_exists( $path ) ) {
143-
$path = WP_PLUGIN_DIR . '/shapely-companion/inc/views/shapely-demo-content.php';
144-
if ( ! file_exists( $path ) ) {
145-
$path = false;
146-
}
147-
}
148-
149-
$shapely_required_actions = array(
150-
array(
151-
'id' => 'shapely-req-ac-install-companion-plugin',
152-
'title' => Shapely_Notify_System::shapely_companion_title(),
153-
'description' => Shapely_Notify_System::shapely_companion_description(),
154-
'check' => Shapely_Notify_System::shapely_has_plugin( 'shapely-companion' ),
155-
'plugin_slug' => 'shapely-companion',
156-
),
157-
array(
158-
'id' => 'shapely-req-ac-install-wp-jetpack-plugin',
159-
'title' => Shapely_Notify_System::shapely_jetpack_title(),
160-
'description' => Shapely_Notify_System::shapely_jetpack_description(),
161-
'check' => Shapely_Notify_System::shapely_has_plugin( 'jetpack' ),
162-
'plugin_slug' => 'jetpack',
163-
),
164-
array(
165-
'id' => 'shapely-req-ac-install-contact-form-7',
166-
'title' => Shapely_Notify_System::shapely_cf7_title(),
167-
'description' => Shapely_Notify_System::shapely_cf7_description(),
168-
'check' => Shapely_Notify_System::shapely_has_plugin( 'contact-form-7' ),
169-
'plugin_slug' => 'contact-form-7',
170-
),
171-
array(
172-
'id' => 'shapely-req-import-content',
173-
'title' => esc_html__( 'Import content', 'shapely' ),
174-
'external' => $path,
175-
'check' => Shapely_Notify_System::shapely_check_import_req(),
176-
),
177-
178-
);
179-
180-
require get_template_directory() . '/inc/admin/welcome-screen/class-shapely-welcome.php';
181-
}// End if().
182117

183118
// Enable Shortcodes in widgets
184119
add_filter( 'widget_text', 'do_shortcode' );
@@ -328,16 +263,6 @@ function shapely_scripts() {
328263

329264
add_action( 'wp_enqueue_scripts', 'shapely_scripts' );
330265

331-
// Include Epsilon Framework
332-
require_once 'inc/libraries/epsilon-framework/class-epsilon-autoloader.php';
333-
$args = array(
334-
'controls' => array( 'slider', 'toggle' ), // array of controls to load
335-
'sections' => array( 'recommended-actions', 'pro' ), // array of sections to load
336-
'backup' => false,
337-
);
338-
339-
new Epsilon_Framework( $args );
340-
341266
/**
342267
* Custom template tags for this theme.
343268
*/
@@ -374,9 +299,9 @@ function shapely_scripts() {
374299
require get_template_directory() . '/inc/class-shapely-related-posts.php';
375300

376301
/**
377-
* Load the system checks ( used for notifications )
302+
* Load the shapely class
378303
*/
379-
require get_template_directory() . '/inc/admin/welcome-screen/class-shapely-notify-system.php';
304+
require get_template_directory() . '/inc/class-shapely.php';
380305

381306
/**
382307
* Load the shapely page builder class

0 commit comments

Comments
 (0)