From 849db5099d0310824df84ea819527438f627ec10 Mon Sep 17 00:00:00 2001 From: Giucu Date: Thu, 8 Feb 2018 10:56:22 +0200 Subject: [PATCH 1/9] #247 --- assets/js/shapely-scripts.js | 1 + woocommerce/product-searchform.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/shapely-scripts.js b/assets/js/shapely-scripts.js index 93d0602..5d396c5 100644 --- a/assets/js/shapely-scripts.js +++ b/assets/js/shapely-scripts.js @@ -341,6 +341,7 @@ } ); } else { + $( play ).on( 'click', function( e ) { var parent = $( this ).parents( '.video-widget' ), instance = $( parent ).data( 'vide' ), diff --git a/woocommerce/product-searchform.php b/woocommerce/product-searchform.php index 5ba8034..3fb6394 100644 --- a/woocommerce/product-searchform.php +++ b/woocommerce/product-searchform.php @@ -13,7 +13,7 @@ * @see https://docs.woocommerce.com/document/template-structure/ * @author WooThemes * @package WooCommerce/Templates - * @version 2.5.0 + * @version 3.3.0 */ if ( ! defined( 'ABSPATH' ) ) { From c97b93325f1cf29d28b659896909d72f77605bba Mon Sep 17 00:00:00 2001 From: Giucu Date: Thu, 8 Feb 2018 11:22:34 +0200 Subject: [PATCH 2/9] #201 --- inc/customizer.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/inc/customizer.php b/inc/customizer.php index d1e4ec0..a575199 100644 --- a/inc/customizer.php +++ b/inc/customizer.php @@ -1234,6 +1234,13 @@ function shapely_customizer_custom_control_css() { .shapely-logo-dimension .ratio { clear: both; } + .widget-content .iris-picker .iris-strip .ui-slider-handle { + top: auto; + transform: translateX(0); + } + .widget-content .iris-picker .iris-slider-offset { + margin: 0; + } Date: Thu, 8 Feb 2018 12:47:36 +0200 Subject: [PATCH 3/9] #158 --- assets/js/customizer.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/assets/js/customizer.js b/assets/js/customizer.js index 2c87b44..13a2e19 100644 --- a/assets/js/customizer.js +++ b/assets/js/customizer.js @@ -35,15 +35,20 @@ } ); 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 ); } } ); From 327c2182277532cf021d1dee10651817978c22b4 Mon Sep 17 00:00:00 2001 From: Giucu Date: Thu, 8 Feb 2018 14:15:44 +0200 Subject: [PATCH 4/9] #244 --- style.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/style.css b/style.css index 5c0b72d..ae859ca 100644 --- a/style.css +++ b/style.css @@ -4202,4 +4202,15 @@ span.wpcf7-not-valid-tip { .widget .text-center .img-responsive { margin-left: auto; margin-right: auto; +} +section .widget-post-thumbnail { + display: block; + margin-bottom: 24px; +} +section .widget-post-title { + margin: 0; +} +section .widget-post-excerpt { + margin-top: 24px; + padding: 0 15px; } \ No newline at end of file From f0830521c854f70ba55569f360cf2930a49c13d8 Mon Sep 17 00:00:00 2001 From: Giucu Date: Fri, 9 Feb 2018 14:34:32 +0200 Subject: [PATCH 5/9] Improved Welcome Screen --- .standard.json | 2 +- functions.php | 79 +- .../welcome-screen/class-shapely-welcome.php | 417 --------- inc/admin/welcome-screen/css/welcome.css | 209 ----- .../welcome-screen/css/welcome_customizer.css | 15 - .../img/colorlib-logo-white2.png | Bin 5610 -> 0 bytes inc/admin/welcome-screen/js/welcome.js | 33 - .../welcome-screen/js/welcome_customizer.js | 9 - .../sections/actions-required.php | 99 --- .../sections/recommended-plugins.php | 53 -- .../class-shapely-notify-system.php | 0 inc/class-shapely.php | 185 ++++ inc/customizer.php | 47 +- .../class-epsilon-welcome-screen.php | 799 ++++++++++++++++++ inc/libraries/welcome-screen/css/welcome.css | 463 ++++++++++ inc/libraries/welcome-screen/data/demo.json | 368 ++++++++ .../welcome-screen/img/ajax-loader.gif | Bin inc/libraries/welcome-screen/img/colorlib.png | Bin 0 -> 797197 bytes inc/libraries/welcome-screen/js/welcome.js | 292 +++++++ .../sections/getting-started.php | 4 +- .../sections/recommended-actions.php | 91 ++ .../sections/recommended-plugins.php | 39 + .../welcome-screen/sections/support.php | 0 23 files changed, 2243 insertions(+), 961 deletions(-) delete mode 100644 inc/admin/welcome-screen/class-shapely-welcome.php delete mode 100644 inc/admin/welcome-screen/css/welcome.css delete mode 100644 inc/admin/welcome-screen/css/welcome_customizer.css delete mode 100644 inc/admin/welcome-screen/img/colorlib-logo-white2.png delete mode 100644 inc/admin/welcome-screen/js/welcome.js delete mode 100644 inc/admin/welcome-screen/js/welcome_customizer.js delete mode 100644 inc/admin/welcome-screen/sections/actions-required.php delete mode 100644 inc/admin/welcome-screen/sections/recommended-plugins.php rename inc/{admin/welcome-screen => }/class-shapely-notify-system.php (100%) create mode 100644 inc/class-shapely.php create mode 100644 inc/libraries/welcome-screen/class-epsilon-welcome-screen.php create mode 100644 inc/libraries/welcome-screen/css/welcome.css create mode 100644 inc/libraries/welcome-screen/data/demo.json rename inc/{admin => libraries}/welcome-screen/img/ajax-loader.gif (100%) create mode 100644 inc/libraries/welcome-screen/img/colorlib.png create mode 100644 inc/libraries/welcome-screen/js/welcome.js rename inc/{admin => libraries}/welcome-screen/sections/getting-started.php (93%) create mode 100644 inc/libraries/welcome-screen/sections/recommended-actions.php create mode 100644 inc/libraries/welcome-screen/sections/recommended-plugins.php rename inc/{admin => libraries}/welcome-screen/sections/support.php (100%) diff --git a/.standard.json b/.standard.json index 5d326d2..8891683 100644 --- a/.standard.json +++ b/.standard.json @@ -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":[]} \ No newline at end of file +{"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":[]} \ No newline at end of file diff --git a/functions.php b/functions.php index 386674f..82f9cf9 100644 --- a/functions.php +++ b/functions.php @@ -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' ); @@ -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. */ @@ -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 diff --git a/inc/admin/welcome-screen/class-shapely-welcome.php b/inc/admin/welcome-screen/class-shapely-welcome.php deleted file mode 100644 index ac95567..0000000 --- a/inc/admin/welcome-screen/class-shapely-welcome.php +++ /dev/null @@ -1,417 +0,0 @@ -theme_name = $theme->get( 'Name' ); - $this->theme_slug = $theme->get( 'TextDomain' ); - - /** - * Add the notice in the admin backend - */ - $this->shapely_activation_admin_notice(); - - } - - /** - * Creates the dashboard page - * - * @see add_theme_page() - * @since 1.8.2.4 - */ - public function shapely_welcome_register_menu() { - $action_count = $this->count_actions(); - $title = $action_count > 0 ? esc_html__( 'About Shapely', 'shapely' ) . '' . esc_html( $action_count ) . '' : esc_html__( 'About Shapely', 'shapely' ); - - add_theme_page( - 'About shapely', $title, 'edit_theme_options', 'shapely-welcome', array( - $this, - 'shapely_welcome_screen', - ) - ); - } - - /** - * Adds an admin notice upon successful activation. - * - * @since 1.8.2.4 - */ - public function shapely_activation_admin_notice() { - if ( ! class_exists( 'Epsilon_Notifications' ) ) { - return; - } - - if ( empty( $this->notice ) ) { - $this->notice = ''; - - /* Translators: %1$s - Theme Name */ - $this->notice .= '

' . sprintf( esc_html__( 'Welcome to %1$s', 'shapely' ), $this->theme_name ) . '

'; - $this->notice .= '

'; - $this->notice .= - sprintf( /* Translators: Notice */ - esc_html__( 'Welcome! Thank you for choosing %3$s! To fully take advantage of the best our theme can offer please make sure you visit our %1$swelcome page%2$s.', 'shapely' ), - '', - '', - $this->theme_name - ); - $this->notice .= '

'; - /* Translators: %1$s - Theme Name */ - $this->notice .= '

' . sprintf( esc_html__( 'Get started with %1$s', 'shapely' ), $this->theme_name ) . '

'; - - } - - $notifications = Epsilon_Notifications::get_instance(); - $notifications->add_notice( - array( - 'id' => 'shapely_install_notice', - 'type' => 'notice epsilon-big', - 'message' => $this->notice, - ) - ); - } - - /** - * Display an admin notice linking to the welcome screen - * - * @since 1.8.2.4 - */ - public function shapely_welcome_admin_notice() { - ?> -
-

', '' ); ?>

-

-

-
- absint( $this->count_actions() ), - 'ajaxurl' => esc_url( admin_url( 'admin-ajax.php' ) ), - 'template_directory' => esc_url( get_template_directory_uri() ), - 'no_required_actions_text' => esc_html__( 'Hooray! There are no required actions for you right now.', 'shapely' ), - ) - ); - - } - - /** - * Load scripts for customizer page - * - * @since 1.8.2.4 - */ - public function shapely_welcome_scripts_for_customizer() { - - wp_enqueue_style( 'shapely-welcome-screen-customizer-css', get_template_directory_uri() . '/inc/admin/welcome-screen/css/welcome_customizer.css' ); - - } - - /** - * Dismiss required actions - * - * @since 1.8.2.4 - */ - public function shapely_dismiss_required_action_callback() { - - global $shapely_required_actions; - - $action_id = ( isset( $_GET['id'] ) ) ? $_GET['id'] : 0; - - echo esc_html( wp_unslash( $action_id ) ); /* this is needed and it's the id of the dismissable required action */ - - if ( ! empty( $action_id ) ) : - - /* if the option exists, update the record for the specified id */ - if ( get_option( 'shapely_show_required_actions' ) ) : - - $shapely_show_required_actions = get_option( 'shapely_show_required_actions' ); - - switch ( esc_html( $_GET['todo'] ) ) { - case 'add': - $shapely_show_required_actions[ $action_id ] = true; - break; - case 'dismiss': - $shapely_show_required_actions[ $action_id ] = false; - break; - default: - return new WP_Error( 'Action denied!', __( 'I\'ve fallen and can\'t get up', 'shapely' ) ); - break; - } - - update_option( 'shapely_show_required_actions', $shapely_show_required_actions ); - - /* create the new option,with false for the specified id */ - else : - - $shapely_show_required_actions_new = array(); - - if ( ! empty( $shapely_required_actions ) ) : - - foreach ( $shapely_required_actions as $shapely_required_action ) : - - if ( $shapely_required_action['id'] == $action_id ) : - $shapely_show_required_actions_new[ $shapely_required_action['id'] ] = false; - else : - $shapely_show_required_actions_new[ $shapely_required_action['id'] ] = true; - endif; - - endforeach; - - update_option( 'shapely_show_required_actions', $shapely_show_required_actions_new ); - - endif; - - endif; - - endif; - - die(); // this is required to return a proper result - } - - /** - * - */ - public function count_actions() { - global $shapely_required_actions; - - $shapely_show_required_actions = get_option( 'shapely_show_required_actions' ); - if ( ! $shapely_show_required_actions ) { - $shapely_show_required_actions = array(); - } - - $i = 0; - foreach ( $shapely_required_actions as $action ) { - $true = false; - $dismissed = false; - - if ( ! $action['check'] ) { - $true = true; - } - - if ( ! empty( $shapely_show_required_actions ) && isset( $shapely_show_required_actions[ $action['id'] ] ) && ! $shapely_show_required_actions[ $action['id'] ] ) { - $true = false; - } - - if ( $true ) { - $i ++; - } - } - - return $i; - } - - public function call_plugin_api( $slug ) { - include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); - $call_api = get_transient( 'shapely_plugin_information_transient_' . $slug ); - if ( false === $call_api ) { - $call_api = plugins_api( - 'plugin_information', array( - 'slug' => $slug, - 'fields' => array( - 'downloaded' => false, - 'rating' => false, - 'description' => false, - 'short_description' => true, - 'donate_link' => false, - 'tags' => false, - 'sections' => true, - 'homepage' => true, - 'added' => false, - 'last_updated' => false, - 'compatibility' => false, - 'tested' => false, - 'requires' => false, - 'downloadlink' => false, - 'icons' => true, - ), - ) - ); - set_transient( 'shapely_plugin_information_transient_' . $slug, $call_api, 30 * MINUTE_IN_SECONDS ); - } - - return $call_api; - } - - public function check_active( $slug ) { - $slug2 = Shapely_Notify_System::_get_plugin_basename_from_slug( $slug ); - - $path = WP_PLUGIN_DIR . '/' . $slug2; - if ( ! file_exists( $path ) ) { - $path = false; - } - - if ( file_exists( $path ) ) { - include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); - - $needs = is_plugin_active( $slug2 ) ? 'deactivate' : 'activate'; - - return array( - 'status' => is_plugin_active( $slug2 ), - 'needs' => $needs, - ); - } - - return array( - 'status' => false, - 'needs' => 'install', - ); - } - - public function check_for_icon( $arr ) { - if ( ! empty( $arr['svg'] ) ) { - $plugin_icon_url = $arr['svg']; - } elseif ( ! empty( $arr['2x'] ) ) { - $plugin_icon_url = $arr['2x']; - } elseif ( ! empty( $arr['1x'] ) ) { - $plugin_icon_url = $arr['1x']; - } else { - $plugin_icon_url = $arr['default']; - } - - return $plugin_icon_url; - } - - public function create_action_link( $state, $slug ) { - $slug2 = Shapely_Notify_System::_get_plugin_basename_from_slug( $slug ); - - switch ( $state ) { - case 'install': - return wp_nonce_url( - add_query_arg( - array( - 'action' => 'install-plugin', - 'plugin' => $slug, - ), - network_admin_url( 'update.php' ) - ), - 'install-plugin_' . $slug - ); - break; - case 'deactivate': - return add_query_arg( - array( - 'action' => 'deactivate', - 'plugin' => rawurlencode( $slug2 ), - 'plugin_status' => 'all', - 'paged' => '1', - '_wpnonce' => wp_create_nonce( 'deactivate-plugin_' . $slug2 ), - ), admin_url( 'plugins.php' ) - ); - break; - case 'activate': - return add_query_arg( - array( - 'action' => 'activate', - 'plugin' => rawurlencode( $slug2 ), - 'plugin_status' => 'all', - 'paged' => '1', - '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $slug2 ), - ), admin_url( 'plugins.php' ) - ); - break; - } - } - - /** - * Welcome screen content - * - * @since 1.8.2.4 - */ - public function shapely_welcome_screen() { - require_once( ABSPATH . 'wp-load.php' ); - require_once( ABSPATH . 'wp-admin/admin.php' ); - require_once( ABSPATH . 'wp-admin/admin-header.php' ); - - $shapely = wp_get_theme(); - $active_tab = isset( $_GET['tab'] ) ? wp_unslash( $_GET['tab'] ) : 'getting_started'; - $action_count = $this->count_actions(); - - ?> - -
- -

- -
- - - - -

- - - 0 ? '' . esc_html( $action_count ) . '' : ''; ?> - - -

- - - - -
- - pX)lmoD{n&mw1mz9D%`Lyp|Sb_AnR= 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 Actions required tab */ - var shapelyNrActionsRequired = shapelyWelcomeScreenObject.nr_actions_required; - - if ( ( 'undefined' !== typeof shapelyNrActionsRequired ) && ( 0 !== shapelyNrActionsRequired ) ) { - jQuery( 'li.shapely-w-red-tab a' ).append( '' + shapelyNrActionsRequired + '' ); - } - - /* Dismiss required actions */ - jQuery( '.shapely-required-action-button' ).click(function() { - - var id = jQuery( this ).attr( 'id' ), - action = jQuery( this ).attr( 'data-action' ); - jQuery.ajax({ - type: 'GET', - data: { action: 'shapely_dismiss_required_action', id: id, todo: action }, - dataType: 'html', - url: shapelyWelcomeScreenObject.ajaxurl, - beforeSend: function( data, settings ) { - jQuery( '.shapely-tab-pane#actions_required h1' ).append( '
' ); - }, - success: function( data ) { - location.reload(); - jQuery( '#temp_load' ).remove(); - /* Remove loading gif */ - }, - error: function( jqXHR, textStatus, errorThrown ) { - console.log( jqXHR + ' :: ' + textStatus + ' :: ' + errorThrown ); - } - }); - }); -}); diff --git a/inc/admin/welcome-screen/js/welcome_customizer.js b/inc/admin/welcome-screen/js/welcome_customizer.js deleted file mode 100644 index 839f42f..0000000 --- a/inc/admin/welcome-screen/js/welcome_customizer.js +++ /dev/null @@ -1,9 +0,0 @@ -jQuery( document ).ready(function() {// jscs:ignore validateLineBreaks - var shapelyAboutpage = shapelyWelcomeScreenCustomizerObject.aboutpage; - var shapelyNrActionsRequired = shapelyWelcomeScreenCustomizerObject.nr_actions_required; - - /* Number of required actions */ - if ( ( 'undefined' !== typeof shapelyNrActionsRequired ) && ( 'undefined' !== typeof shapelyNrActionsRequired ) && ( '0' !== shapelyNrActionsRequired ) ) { - jQuery( '#accordion-section-themes .accordion-section-title' ).append( '' + shapelyNrActionsRequired + '' ); - } -}); diff --git a/inc/admin/welcome-screen/sections/actions-required.php b/inc/admin/welcome-screen/sections/actions-required.php deleted file mode 100644 index ce693f6..0000000 --- a/inc/admin/welcome-screen/sections/actions-required.php +++ /dev/null @@ -1,99 +0,0 @@ - - -
- - $shapely_required_action_value ) : - $hidden = false; - if ( isset( $shapely_show_required_actions[ $shapely_required_action_value['id'] ] ) && false === $shapely_show_required_actions[ $shapely_required_action_value['id'] ] ) { - $hidden = true; - } - if ( isset( $shapely_required_action_value['check'] ) && $shapely_required_action_value['check'] ) { - continue; - } - ?> -
- - - - - -

- -

-

- - ' . wp_kses_post( $shapely_required_action_value['help'] ); -endif; -?> -

- - check_active( $shapely_required_action_value['plugin_slug'] ); - $url = $this->create_action_link( $active['needs'], $shapely_required_action_value['plugin_slug'] ); - $label = ''; - - switch ( $active['needs'] ) { - case 'install': - $class = 'install-now button'; - $label = esc_html__( 'Install', 'shapely' ); - break; - case 'activate': - $class = 'activate-now button button-primary'; - $label = esc_html__( 'Activate', 'shapely' ); - break; - case 'deactivate': - $class = 'deactivate-now button'; - $label = esc_html__( 'Deactivate', 'shapely' ); - break; - } - - ?> -

- -

- -
- ' . esc_html__( 'Hooray! There are no required actions for you right now.', 'shapely' ) . ''; - endif; - ?> - -
diff --git a/inc/admin/welcome-screen/sections/recommended-plugins.php b/inc/admin/welcome-screen/sections/recommended-plugins.php deleted file mode 100644 index c3035fb..0000000 --- a/inc/admin/welcome-screen/sections/recommended-plugins.php +++ /dev/null @@ -1,53 +0,0 @@ - - - diff --git a/inc/admin/welcome-screen/class-shapely-notify-system.php b/inc/class-shapely-notify-system.php similarity index 100% rename from inc/admin/welcome-screen/class-shapely-notify-system.php rename to inc/class-shapely-notify-system.php diff --git a/inc/class-shapely.php b/inc/class-shapely.php new file mode 100644 index 0000000..0d29194 --- /dev/null +++ b/inc/class-shapely.php @@ -0,0 +1,185 @@ + array( + 'recommended' => false, + ), + 'fancybox-for-wordpress' => array( + 'recommended' => false, + ), + ); + + public $recommended_actions; + + public $theme_slug = 'shapely'; + + function __construct() { + + if ( ! is_admin() && ! is_customize_preview() ) { + return; + } + + $this->load_class(); + + $this->recommended_actions = apply_filters( + 'shapely_required_actions', array( + array( + 'id' => 'shapely-req-import-content', + 'title' => esc_html__( 'Import Demo Content', 'shapely' ), + 'description' => esc_html__( 'Clicking the button below will install and activate plugins, add widgets and set static front page to your WordPress installation. Click advanced to customize the import process.', 'shapely' ), + 'help' => $this->generate_action_html(), + 'check' => Shapely_Notify_System::shapely_has_content(), + ), + 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', + ), + ) + ); + + $this->init_epsilon(); + $this->init_welcome_screen(); + + // Hooks + add_action( 'customize_register', array( $this, 'init_customizer' ) ); + + } + + public function load_class() { + + if ( ! is_admin() && ! is_customize_preview() ) { + return; + } + + require_once get_template_directory() . '/inc/libraries/epsilon-framework/class-epsilon-autoloader.php'; + require_once get_template_directory() . '/inc/class-shapely-notify-system.php'; + require_once get_template_directory() . '/inc/libraries/welcome-screen/class-epsilon-welcome-screen.php'; + + } + + public function init_epsilon() { + + $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 ); + + } + + public function init_welcome_screen() { + + Epsilon_Welcome_Screen::get_instance( + $config = array( + 'theme-name' => 'Shapely', + 'theme-slug' => 'shapely', + 'actions' => $this->recommended_actions, + 'plugins' => $this->recommended_plugins, + ) + ); + + } + + public function init_customizer( $wp_customize ) { + $current_theme = wp_get_theme(); + $wp_customize->add_section( + new Epsilon_Section_Recommended_Actions( + $wp_customize, 'epsilon_recomended_section', array( + 'title' => esc_html__( 'Recomended Actions', 'shapely' ), + 'social_text' => esc_html( $current_theme->get( 'Author' ) ) . esc_html__( ' is social :', 'shapely' ), + 'plugin_text' => esc_html__( 'Recomended Plugins :', 'shapely' ), + 'actions' => $this->recommended_actions, + 'plugins' => $this->recommended_plugins, + 'theme_specific_option' => $this->theme_slug . '_show_required_actions', + 'theme_specific_plugin_option' => $this->theme_slug . '_show_required_plugins', + 'facebook' => 'https://www.facebook.com/colorlib', + 'twitter' => 'https://twitter.com/colorlib', + 'wp_review' => true, + 'priority' => 0, + ) + ) + ); + + } + + private function generate_action_html(){ + + $import_actions = array( + 'set-frontpage' => esc_html__( 'Set Static FrontPage', 'shapely' ), + 'import-widgets' => esc_html__( 'Import HomePage Widgets', 'shapely' ), + ); + + $import_plugins = array( + 'shapely-companion' => esc_html__( 'Shapely Companion', 'shapely' ), + 'jetpack' => esc_html__( 'Jetpack', 'shapely' ), + 'contact-form-7' => esc_html__( 'Contact Form 7', 'shapely' ), + ); + + $plugins_html = ''; + + if ( is_customize_preview() ) { + $url = 'themes.php?page=%1$s-welcome&tab=%2$s'; + $html = '' . __( 'Import Demo Content', 'shapely' ) . ''; + } else { + $html = '

' . __( 'Import Demo Content', 'shapely' ) . ''; + $html .= '' . __( 'Advanced', 'shapely' ) . '

'; + $html .= '
'; + + foreach ( $import_plugins as $id => $label ) { + if ( ! Shapely_Notify_System::shapely_has_plugin( $id ) ) { + $plugins_html .= $this->generate_checkbox( $id, $label, 'plugins' ); + } + } + + if ( '' != $plugins_html ) { + $html .= '
'; + $html .= '

' . __( 'Plugins', 'shapely' ) . '

'; + $html .= '
'; + $html .= $plugins_html; + $html .= '
'; + $html .= '
'; + } + + $html .= '
'; + $html .= '

' . __( 'Demo Content', 'shapely' ) . '

'; + $html .= '
'; + foreach ( $import_actions as $id => $label ) { + $html .= $this->generate_checkbox( $id, $label ); + } + $html .= '
'; + $html .= '
'; + $html .= '
'; + } + + return $html; + + } + + private function generate_checkbox( $id, $label, $name = 'options', $block = false ) { + $string = ''; + return sprintf( $string, $name, $id, $label ); + } + +} +new Shapely(); \ No newline at end of file diff --git a/inc/customizer.php b/inc/customizer.php index a575199..6040ece 100644 --- a/inc/customizer.php +++ b/inc/customizer.php @@ -75,60 +75,15 @@ function shapely_customize_register( $wp_customize ) { */ function shapely_customizer( $wp_customize ) { - // Recomended actions - global $shapely_required_actions, $shapely_recommended_plugins; - require_once get_template_directory() . '/inc/custom-controls/class-shapely-logo-dimensions.php'; - $customizer_recommended_plugins = array(); - if ( is_array( $shapely_recommended_plugins ) ) { - foreach ( $shapely_recommended_plugins as $k => $s ) { - if ( $s['recommended'] ) { - $customizer_recommended_plugins[ $k ] = $s; - } - } - } - - $customizer_shapely_required_actions = array(); - if ( ! empty( $shapely_required_actions ) ) { - foreach ( $shapely_required_actions as $required_action ) { - if ( 'shapely-req-import-content' == $required_action['id'] ) { - $required_action['description'] = sprintf( - esc_html__( 'In oder to import the demo content go %s', 'shapely' ), - '' . esc_html__( 'here', 'shapely' ) . '' - ); - } - $customizer_shapely_required_actions[] = $required_action; - } - } - - $theme_slug = 'shapely'; - - $wp_customize->add_section( - new Epsilon_Section_Recommended_Actions( - $wp_customize, 'epsilon_recomended_section', array( - 'title' => esc_html__( 'Recomended Actions', 'shapely' ), - 'social_text' => esc_html__( 'We are social', 'shapely' ), - 'plugin_text' => esc_html__( 'Recomended Plugins', 'shapely' ), - 'actions' => $customizer_shapely_required_actions, - 'plugins' => $customizer_recommended_plugins, - 'theme_specific_option' => $theme_slug . '_show_required_actions', - 'theme_specific_plugin_option' => $theme_slug . '_show_recommended_plugins', - 'facebook' => 'https://www.facebook.com/colorlib', - 'twitter' => 'https://twitter.com/colorlib', - 'wp_review' => true, - 'priority' => 0, - ) - ) - ); - $wp_customize->add_section( new Epsilon_Section_Pro( $wp_customize, 'epsilon-section-pro', array( 'title' => esc_html__( 'Theme documentation', 'shapely' ), 'button_text' => esc_html__( 'Learn more', 'shapely' ), 'button_url' => 'https://colorlib.com/wp/support/shapely/', - 'priority' => 0, + 'priority' => 1, ) ) ); diff --git a/inc/libraries/welcome-screen/class-epsilon-welcome-screen.php b/inc/libraries/welcome-screen/class-epsilon-welcome-screen.php new file mode 100644 index 0000000..2543e8a --- /dev/null +++ b/inc/libraries/welcome-screen/class-epsilon-welcome-screen.php @@ -0,0 +1,799 @@ + $theme->get( 'Name' ), + 'theme-slug' => $theme->get( 'TextDomain' ), + 'author-logo' => get_template_directory_uri() . '/inc/libraries/welcome-screen/img/colorlib.png', + 'actions' => array(), + 'plugins' => array(), + 'notice' => '', + 'sections' => array(), + 'edd' => false, + 'download_id' => '', + ); + + $config = wp_parse_args( $config, $defaults ); + + /** + * Configure our welcome screen + */ + $this->theme_name = $config['theme-name']; + $this->theme_slug = $config['theme-slug']; + $this->author_logo = $config['author-logo']; + $this->actions = $config['actions']; + $this->actions_count = $this->count_actions(); + $this->plugins = $config['plugins']; + $this->notice = $config['notice']; + $this->sections = $config['sections']; + $this->edd = $config['edd']; + $this->download_id = $config['download_id']; + + if ( $this->edd ) { + $this->strings = EDD_Theme_Helper::get_strings(); + } + + if ( empty( $config['sections'] ) ) { + $this->sections = $this->set_default_sections( $config ); + } + + /** + * Create the dashboard page + */ + add_action( 'admin_menu', array( $this, 'welcome_screen_menu' ) ); + + /** + * Load the welcome screen styles and scripts + */ + add_action( 'admin_enqueue_scripts', array( $this, 'enqueue' ) ); + + /** + * Add the notice in the admin backend + */ + $this->add_admin_notice(); + + /** + * Ajax callbacks + */ + add_action( + 'wp_ajax_welcome_screen_ajax_callback', array( + $this, + 'welcome_screen_ajax_callback', + ) + ); + add_action( + 'wp_ajax_nopriv_welcome_screen_ajax_callback', array( + $this, + 'welcome_screen_ajax_callback', + ) + ); + + if ( $this->edd ) { + /** + * Initiate EDD Stuff + */ + add_action( 'admin_init', array( 'EDD_Theme_Helper', 'init' ) ); + add_filter( 'http_request_args', array( 'EDD_Theme_Helper', 'disable_wporg_request' ), 5, 2 ); + + add_action( + 'update_option_' . $this->theme_slug . '_license_key', + array( + 'EDD_Theme_Helper', + 'license_activator_deactivator', + ), + 10, + 2 + ); + } + } + + /** + * AJAX Handler + */ + public function welcome_screen_ajax_callback() { + if ( isset( $_POST['args'], $_POST['args']['nonce'] ) && ! wp_verify_nonce( sanitize_key( $_POST['args']['nonce'] ), 'welcome_nonce' ) ) { + wp_die( + wp_json_encode( + array( + 'status' => false, + 'error' => esc_html__( 'Not allowed', 'epsilon-framework' ), + ) + ) + ); + } + + $args_action = array_map( 'sanitize_text_field', wp_unslash( $_POST['args']['action'] ) ); + + if ( count( $args_action ) !== 2 ) { + wp_die( + wp_json_encode( + array( + 'status' => false, + 'error' => esc_html__( 'Not allowed', 'epsilon-framework' ), + ) + ) + ); + } + + if ( ! class_exists( $args_action[0] ) ) { + wp_die( + wp_json_encode( + array( + 'status' => false, + 'error' => esc_html__( 'Class does not exist', 'epsilon-framework' ), + ) + ) + ); + } + + $class = $args_action[0]; + $method = $args_action[1]; + $args = array(); + + if ( is_array( $_POST['args']['args'] ) ) { + $args = Epsilon_Sanitizers::array_map_recursive( 'sanitize_text_field', wp_unslash( $_POST['args']['args'] ) ); + } + + $response = $class::$method( $args ); + + if ( is_array( $response ) ) { + wp_die( wp_json_encode( $response ) ); + } + + if ( 'ok' === $response ) { + wp_die( + wp_json_encode( + array( + 'status' => true, + 'message' => 'ok', + ) + ) + ); + } + + wp_die( + wp_json_encode( + array( + 'status' => false, + 'message' => 'nok', + ) + ) + ); + } + + /** + * Instance constructor + * + * @param array $config Configuration array. + * + * @returns object + */ + public static function get_instance( $config = array() ) { + static $inst; + + if ( ! $inst ) { + $inst = new Epsilon_Welcome_Screen( $config ); + } + + return $inst; + } + + /** + * Load welcome screen css and javascript + */ + public function enqueue() { + if ( is_admin() ) { + wp_enqueue_style( + 'welcome-screen', + get_template_directory_uri() . '/inc/libraries/welcome-screen/css/welcome.css' + ); + + wp_enqueue_script( + 'welcome-screen', + get_template_directory_uri() . '/inc/libraries/welcome-screen/js/welcome.js', + array( + 'jquery-ui-slider', + ), + '12123' + ); + + wp_localize_script( + 'welcome-screen', + 'welcomeScreen', + array( + 'nr_actions_required' => absint( $this->count_actions() ), + 'template_directory' => esc_url( get_template_directory_uri() ), + 'no_required_actions_text' => esc_html__( 'Hooray! There are no required actions for you right now.', 'epsilon-framework' ), + 'ajax_nonce' => wp_create_nonce( 'welcome_nonce' ), + 'activating_string' => esc_html__( 'Activating', 'epsilon-framework' ), + 'body_class' => 'appearance_page_' . $this->theme_slug . '-welcome', + 'no_actions' => esc_html__( 'Hooray! There are no required actions for you right now.', 'epsilon-framework' ), + ) + ); + } + } + + /** + * Return the actions left + * + * @return array|mixed + */ + private function get_actions_left() { + if ( ! empty( $this->actions ) ) { + $actions_left = get_option( $this->theme_slug . '_actions_left', array() ); + return $actions_left; + } + + return array(); + } + + /** + * Returns the plugins left to be installed + * + * @return array|mixed + */ + private function get_plugins_left() { + if ( ! empty( $this->plugins ) ) { + $plugins_left = get_option( $this->theme_slug . '_plugins_left', array() ); + if ( empty( $plugins_left ) ) { + foreach ( $this->plugins as $plugin => $prop ) { + $plugins_left[ $plugin ] = true; + } + + return $plugins_left; + } + + return $plugins_left; + } + + return array(); + } + + /** + * Adds an admin notice in the backend + * + * If the Epsilon Notification class does not exist, we stop + */ + private function add_admin_notice() { + if ( ! class_exists( 'Epsilon_Notifications' ) ) { + return; + } + + if ( empty( $this->notice ) ) { + if ( ! empty( $this->author_logo ) ) { + $this->notice .= ''; + } + /* Translators: Notice Title */ + $this->notice .= '

' . sprintf( esc_html__( 'Welcome to %1$s', 'epsilon-framework' ), $this->theme_name ) . '

'; + $this->notice .= '

'; + $this->notice .= + sprintf( /* Translators: Notice */ + esc_html__( 'Welcome! Thank you for choosing %3$s! To fully take advantage of the best our theme can offer please make sure you visit our %1$swelcome page%2$s.', 'epsilon-framework' ), + '', + '', + $this->theme_name + ); + $this->notice .= '

'; + /* Translators: Notice URL */ + $this->notice .= '

' . sprintf( esc_html__( 'Get started with %1$s', 'epsilon-framework' ), $this->theme_name ) . '

'; + + } + + $notifications = Epsilon_Notifications::get_instance(); + $notifications->add_notice( + array( + 'id' => 'shapely_welcome_notification', + 'type' => 'notice epsilon-big', + 'message' => $this->notice, + ) + ); + } + + /** + * Registers the welcome screen menu + */ + public function welcome_screen_menu() { + /* Translators: Menu Title */ + $title = sprintf( esc_html__( 'About %1$s', 'epsilon-framework' ), esc_html( $this->theme_name ) ); + + if ( 0 < $this->actions_count ) { + $title .= '' . esc_html( $this->actions_count ) . ''; + } + + add_theme_page( + $this->theme_name, + $title, + 'edit_theme_options', + $this->theme_slug . '-welcome', + array( + $this, + 'render_welcome_screen', + ) + ); + } + + /** + * Render the welcome screen + */ + public function render_welcome_screen() { + require_once( ABSPATH . 'wp-load.php' ); + require_once( ABSPATH . 'wp-admin/admin.php' ); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + + $theme = wp_get_theme(); + $tab = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : 'getting-started'; + + ?> +
+

+ theme_name ) ) . esc_html( $theme['Version'] ); + ?> +

+
+ theme_name ) ); + ?> +
+ + +

+ sections as $id => $section ) { ?> + + +

+ + sections[ $tab ]['path']; ?> +
+ theme_slug . '_actions_left', array() ); + + $i = 0; + foreach ( $this->actions as $action ) { + $true = false; + + if ( ! $action['check'] ) { + $true = true; + } + + if ( ! empty( $actions_left ) && isset( $actions_left[ $action['id'] ] ) && ! $actions_left[ $action['id'] ] ) { + $true = false; + } + + if ( $true ) { + $i ++; + } + } + + return $i; + } + + /** + * Generate url for the backend section tabs + * + * @param string $id Id of the backend tab. + * + * @return string + */ + private function generate_admin_url( $id = '' ) { + $url = 'themes.php?page=%1$s-welcome&tab=%2$s'; + + return admin_url( sprintf( $url, $this->theme_slug, $id ) ); + } + + /** + * Generate default sections, with exclusion + * + * @param array $config Configuration array. + * + * @return array + */ + private function set_default_sections( $config = array() ) { + $arr = array( + 'getting-started' => array( + 'id' => 'getting-started', + 'url' => $this->generate_admin_url( 'getting-started' ), + 'label' => __( 'Getting Started', 'epsilon-framework' ), + 'path' => get_template_directory() . '/inc/libraries/welcome-screen/sections/getting-started.php', + ), + 'recommended-actions' => array( + 'id' => 'recommended-actions', + 'url' => $this->generate_admin_url( 'recommended-actions' ), + 'label' => __( 'Recommended Actions', 'epsilon-framework' ), + 'path' => get_template_directory() . '/inc/libraries/welcome-screen/sections/recommended-actions.php', + ), + 'recommended-plugins' => array( + 'id' => 'recommended-plugins', + 'url' => $this->generate_admin_url( 'recommended-plugins' ), + 'label' => __( 'Recommended Plugins', 'epsilon-framework' ), + 'path' => get_template_directory() . '/inc/libraries/welcome-screen/sections/recommended-plugins.php', + ), + 'support' => array( + 'id' => 'support', + 'url' => $this->generate_admin_url( 'support' ), + 'label' => __( 'Support', 'epsilon-framework' ), + 'path' => get_template_directory() . '/inc/libraries/welcome-screen/sections/support.php', + ), + 'registration' => array( + 'id' => 'registration', + 'url' => $this->generate_admin_url( 'registration' ), + 'label' => __( 'Registration', 'epsilon-framework' ), + 'path' => get_template_directory() . '/inc/libraries/welcome-screen/sections/registration.php', + ), + ); + + if ( 0 === count( $this->plugins ) ) { + unset( $arr['recommended-plugins'] ); + } + + if ( 0 < $this->actions_count ) { + $arr['recommended-actions']['label'] .= '' . $this->actions_count . ''; + } + + if ( ! $this->edd ) { + unset( $arr['registration'] ); + } + + if ( isset( $config['sections_exclude'] ) && ! empty( $config['sections_exclude'] ) ) { + foreach ( $config['sections_exclude'] as $id ) { + unset( $arr[ $id ] ); + } + } + + if ( isset( $config['sections_include'] ) && ! empty( $config['sections_include'] ) ) { + foreach ( $config['sections_include'] as $id => $props ) { + $arr[ $id ] = $props; + } + } + + return $arr; + } + + /** + * Will return an array with everything that we need to render the action info + * + * @param string $slug Plugin slug. + * + * @returns array + */ + private function check_plugin( $slug = '' ) { + $arr = array( + 'installed' => Epsilon_Notify_System::check_plugin_is_installed( $slug ), + 'active' => Epsilon_Notify_System::check_plugin_is_active( $slug ), + 'needs' => 'install', + 'class' => 'install-now button', + 'label' => __( 'Install and Activate', 'epsilon-framework' ), + ); + + if ( in_array( $slug, array( 'contact-form-7' ) ) ) { + switch ( $slug ) { + case 'contact-form-7': + if ( file_exists( ABSPATH . 'wp-content/plugins/contact-form-7' ) ) { + $arr['installed'] = true; + $arr['active'] = defined( 'WPCF7_VERSION' ); + } + break; + default: + $arr['installed'] = false; + $arr['active'] = false; + break; + } + } + + if ( $arr['installed'] ) { + $arr['needs'] = 'activate'; + $arr['class'] = 'activate-now button button-primary'; + $arr['label'] = __( 'Activate now', 'epsilon-framework' ); + } + + if ( $arr['active'] ) { + $arr['needs'] = 'deactivate'; + $arr['class'] = 'deactivate-now button button-primary'; + $arr['label'] = __( 'Deactivate now', 'epsilon-framework' ); + } + + $arr['url'] = $this->create_plugin_link( $arr['needs'], $slug ); + + return $arr; + } + + /** + * Creates a link to install/activate/deactivate certain plugins + * + * @param string $state Plugin state (active,not installed). + * @param string $slug Plugin slug. + * + * @return string + */ + private function create_plugin_link( $state, $slug ) { + $string = ''; + + switch ( $state ) { + case 'install': + $string = wp_nonce_url( + add_query_arg( + array( + 'action' => 'install-plugin', + 'plugin' => Epsilon_Notify_System::_get_plugin_basename_from_slug( $slug ), + ), + network_admin_url( 'update.php' ) + ), + 'install-plugin_' . $slug + ); + break; + case 'deactivate': + $string = add_query_arg( + array( + 'action' => 'deactivate', + 'plugin' => rawurlencode( Epsilon_Notify_System::_get_plugin_basename_from_slug( $slug ) ), + 'plugin_status' => 'all', + 'paged' => '1', + '_wpnonce' => wp_create_nonce( 'deactivate-plugin_' . Epsilon_Notify_System::_get_plugin_basename_from_slug( $slug ) ), + ), + admin_url( 'plugins.php' ) + ); + break; + case 'activate': + $string = add_query_arg( + array( + 'action' => 'activate', + 'plugin' => rawurlencode( Epsilon_Notify_System::_get_plugin_basename_from_slug( $slug ) ), + 'plugin_status' => 'all', + 'paged' => '1', + '_wpnonce' => wp_create_nonce( 'activate-plugin_' . Epsilon_Notify_System::_get_plugin_basename_from_slug( $slug ) ), + ), + admin_url( 'plugins.php' ) + ); + break; + default: + $string = ''; + break; + }// End switch(). + + return $string; + } + + /** + * Return information of a plugin + * + * @param string $slug Plugin slug. + * + * @return array + */ + private function get_plugin_information( $slug = '' ) { + $arr = array( + 'info' => $this->call_plugin_api( $slug ), + ); + + $arr['icon'] = $this->check_for_icon( $arr['info']->icons ); + $merge = $this->check_plugin( $slug ); + + $arr = array_merge( $arr, $merge ); + + return $arr; + } + + /** + * Get information about a plugin + * + * @param string $slug Plugin slug. + * + * @return array|mixed|object|WP_Error + */ + private function call_plugin_api( $slug = '' ) { + include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; + $call_api = get_transient( $this->theme_slug . '_plugin_information_transient_' . $slug ); + + if ( false === $call_api ) { + $call_api = plugins_api( + 'plugin_information', array( + 'slug' => $slug, + 'fields' => array( + 'downloaded' => false, + 'rating' => false, + 'description' => false, + 'short_description' => true, + 'donate_link' => false, + 'tags' => false, + 'sections' => true, + 'homepage' => true, + 'added' => false, + 'last_updated' => false, + 'compatibility' => false, + 'tested' => false, + 'requires' => false, + 'downloadlink' => false, + 'icons' => true, + ), + ) + ); + set_transient( $this->theme_slug . '_plugin_information_transient_' . $slug, $call_api, 30 * MINUTE_IN_SECONDS ); + } + + return $call_api; + } + + /** + * Searches icons for the plugin + * + * @param object $object Icon object. + * + * @return string; + */ + private function check_for_icon( $object ) { + if ( ! empty( $object['svg'] ) ) { + $plugin_icon_url = $object['svg']; + } elseif ( ! empty( $object['2x'] ) ) { + $plugin_icon_url = $object['2x']; + } elseif ( ! empty( $object['1x'] ) ) { + $plugin_icon_url = $object['1x']; + } else { + $plugin_icon_url = $object['default']; + } + + return $plugin_icon_url; + } + + /** + * Handle a required action + * + * @param array $args Argument array. + * + * @return string; + */ + public static function handle_required_action( $args = array() ) { + $instance = self::get_instance(); + $actions_left = get_option( $instance->theme_slug . '_actions_left', array() ); + + $actions_left[ $args['id'] ] = 'hidden' === $args['do']; + + update_option( $instance->theme_slug . '_actions_left', $actions_left ); + + return 'ok'; + } + + /** + * Set a frontpage to static + * + * @param array $args Argument array. + * + * @return string; + */ + public static function set_frontpage_to_static( $args = array() ) { + $home = get_page_by_title( 'Homepage' ); + $blog = get_page_by_title( 'Blog' ); + + if ( null === $home ) { + $id = wp_insert_post( + array( + 'post_title' => __( 'Homepage', 'epsilon-framework' ), + 'post_type' => 'page', + 'post_status' => 'publish', + ) + ); + + update_option( 'page_on_front', $id ); + update_option( 'show_on_front', 'page' ); + } + + if ( null === $blog ) { + $id = wp_insert_post( + array( + 'post_title' => __( 'Blog', 'epsilon-framework' ), + 'post_type' => 'page', + 'post_status' => 'publish', + ) + ); + + update_option( 'page_for_posts', $id ); + } + + return 'ok'; + } +} diff --git a/inc/libraries/welcome-screen/css/welcome.css b/inc/libraries/welcome-screen/css/welcome.css new file mode 100644 index 0000000..920e7e5 --- /dev/null +++ b/inc/libraries/welcome-screen/css/welcome.css @@ -0,0 +1,463 @@ +/* ---------------------------------------------------------------------------- + * Welcome Page CSS + * ------------------------------------------------------------------------- */ + +/* New Logo */ +.wp-badge.epsilon-welcome-logo { + color: #fff; + background-image: url(../img/colorlib.png); + background-position: center center; + background-size: 70%; + background-repeat: no-repeat; +} + +/* proper positioning of the icons */ +.epsilon-wrap i.dashicons { + margin-right: 15px; + position: relative; + top: 3px; +} + +.feature-section.action-required { + margin-top: 20px; + padding-bottom: 0; +} + +.action-required span.hooray { + padding: 10px; + display: inline-block; +} + +.action-required span.red { + color: #a00; +} + +.action-required-box:last-of-type { + border-bottom: none; +} + +.action-required-box { + display: block; + border-left: 3px solid #f8800c; + padding: 10px 25px 5px; + background: #FFFFFF; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + margin-bottom: 15px; + position: relative; +} + +.about-wrap .action-required-box h4 { + display: block; + margin-top: 0; + margin-bottom: 0; +} + +.about-wrap .action-required-box p { + display: block; + margin-top: 0; + width: 100%; + max-width: 100%; +} + +.about-wrap .dismiss-required-action { + position: absolute; + top: 10px; + right: 10px; + text-decoration: none; + color: #d54e21; + border-radius: 50%; + cursor: pointer; +} + +.about-wrap .required-action-button { + position: absolute; + top: 10px; + right: 10px; + text-decoration: none; + color: #d54e21; + border-radius: 50%; + cursor: pointer; +} + +.about-wrap .feature-section .col { + margin-right: 15px; +} + +.badge-action-count { + padding: 0 6px; + display: inline-block; + background-color: #d54e21; + color: #fff; + font-size: 9px; + line-height: 17px; + font-weight: 600; + margin: 1px 0 0 2px; + vertical-align: top; + -webkit-border-radius: 10px; + border-radius: 10px; + z-index: 26; + margin-top: 5px; + margin-left: 5px; +} + +.wp-submenu .badge-action-count { + margin-top: 0; +} + +.plugin_box { + height: 330px; + margin-top: 15px; + text-align: center; + background: #FFF; + position: relative; + border: 1px solid rgba(0, 0, 0, .1); + float: left; +} + +.plugin_box .recommended { + background: #d25637; + color: #FFF; + text-transform: uppercase; + height: 28px; + text-align: center; + top: 0; + left: 0; + right: 0; + line-height: 28px; + font-size: 10px; + position: absolute; + font-weight: bold; +} + +.plugin_box img { + width: 155px; + height: 155px; + padding-top: 50px; + margin: 0 auto; + margin-bottom: 15px; + display: block; + border: none; +} + +.plugin_box .action_bar { + position: absolute; + bottom: 0; + left: 0; + right: 0; + font-size: 15px; + font-weight: 600; + height: 18px; + margin: 0; + padding: 15px; + -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 0 rgba(0, 0, 0, .1); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + background: #fff; + background: rgba(255, 255, 255, .65); + text-align: left; + padding-right: 105px; +} + +.plugin_box .action_bar.active { + background: #23282d; + color: #FFF; +} + +.plugin_box .action_button { + position: absolute; + bottom: -1px; + right: -1px; + padding: 9px 10px 10px; + background: #f6f6f6; + border: 1px solid rgba(0, 0, 0, .1); +} + +.plugin_box .action_button.active { + background: #2c2e2f; + bottom: 0; + right: -1px; + padding: 9px 10px 9px; + +} + +.about-wrap .three-col .plugin_box.col { + width: 29.81%; +} + +.slider-container input[type="text"] { + border: none; + text-align: center; + padding: 2px; + margin: 0; + font-size: 12px; + color: #333; + border-radius: 10px; + background-color: #f8f8f8; + -webkit-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + width: 42px; + height: 22px; +} + +.slider-container .ui-slider { + position: relative; + text-align: left; + height: 2px; + border-radius: 3px; + border: none; + margin-top: 10px; + margin-left: 10px; + display: inline-block; + width: 202px; + background: #d6d6d6; +} + +.slider-container .ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + top: -10px; + cursor: default; + -ms-touch-action: none; + touch-action: none; + width: 18px; + height: 18px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; + background-color: #fff; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + border: solid 1px #d7d7d7; + transform: translateX(-50%); +} + +.slider-container .ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: 0.7em; + display: block; + border: 0; + background-position: 0 0; + background: #E04D43; + top: 0; + bottom: 0; +} + +.widget-content label.block { + display: block; + margin-bottom: 10px; +} + +.widget-content input.rl-slider { + border: none; + text-align: center; + padding: 2px; + margin: 0 0 15px; + font-size: 12px; + color: #333; + border-radius: 10px; + background-color: #f8f8f8; + -webkit-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + box-shadow: inset 0px 2px 5px 0px rgba(0, 0, 0, 0.1); + width: 42px; + height: 22px; + cursor: pointer; +} + +.widget-content .ui-slider { + position: relative; + text-align: left; + height: 2px; + border-radius: 3px; + border: none; + margin-top: 10px; + margin-left: 15px; + display: inline-block; + width: 175px; + float: right; + background: #d6d6d6; +} + +.widget-content .ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: 0.7em; + display: block; + border: 0; + background-position: 0 0; + background: #E04D43; + top: 0; + bottom: 0; +} + +.widget-content .ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + top: -10px; + cursor: default; + -ms-touch-action: none; + touch-action: none; + width: 18px; + height: 18px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; + background-color: #fff; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + border: solid 1px #d7d7d7; + transform: translateX(-50%); +} + +.wp-admin .checkbox_switch { + display: inline-block; + width: 100%; + margin-bottom: 15px; +} + +.customize-control-title.onoffswitch_label { + width: 71%; +} + +.onoffswitch_label { + display: inline-block; + vertical-align: top; + margin-right: 21px; + margin-top: -1px; +} + +.onoffswitch { + position: relative; + width: 52px; + display: inline-block; + float: right; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} + +.onoffswitch-checkbox { + display: none !important; +} + +.onoffswitch-label { + display: block; + overflow: hidden; + cursor: pointer; + height: 22px; + padding: 0; + line-height: 19px; + transition: background-color 0.2s ease-in; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 30px; + background-color: #c4c4c4; + -webkit-box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.11); + -moz-box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.11); + box-shadow: inset 0 2px 1px rgba(0, 0, 0, 0.11); +} + +.onoffswitch-label:before { + content: ""; + display: block; + width: 18px; + height: 18px; + margin: 0; + position: absolute; + top: 2px; + bottom: 0; + right: 32px; + background-color: #fff; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + transition: all 0.2s ease-in 0s; +} + +.onoffswitch-label:after { + content: "OFF"; + display: block; + color: #FFF; + position: absolute; + top: 2px; + bottom: 2px; + right: 6px; + font-size: 11px; + font-family: 'Arial'; +} + +.onoffswitch-checkbox:checked + .onoffswitch-label { + background-color: #3caf0e; +} + +.onoffswitch-checkbox:checked + .onoffswitch-label, +.onoffswitch-checkbox:checked + .onoffswitch-label:before { + border-color: #3caf0e; +} + +.onoffswitch-checkbox:checked + .onoffswitch-label:before { + right: 2px; +} + +.onoffswitch-checkbox:checked + .onoffswitch-label:after { + content: "ON"; + display: block; + color: #FFF; + position: absolute; + top: 2px; + bottom: 2px; + right: 27px; + font-size: 11px; + font-family: 'Arial'; +} + +.widget-content .customize-control-title { + font-weight: 400; +} + +.widget-content .customize-control-title.onoffswitch_label { + width: 65%; + margin-right: 26px; +} + +.mte-tooltip { + width: 150px; + position: absolute; + background: #55AAD3; + color: #EEE; + font-size: 12px; + min-height: 50px; + border-radius: 5px; + left: -75px; + /* half of its width */ + bottom: 25px; + z-index: 10; + display: none; + padding: 12px; + line-height: 1.5; + font-family: 'Arial', sans-serif; +} + +.import-content-container .checkbox-group { + margin-bottom: 10px; + margin-top: 10px; + display: inline-block; + width: 100%; +} + +.import-content-container .checkbox-group label { + margin-right: 15px; +} + +.import-content-container { + display: none; +} diff --git a/inc/libraries/welcome-screen/data/demo.json b/inc/libraries/welcome-screen/data/demo.json new file mode 100644 index 0000000..ae101f5 --- /dev/null +++ b/inc/libraries/welcome-screen/data/demo.json @@ -0,0 +1,368 @@ +{ + "standard": { + "widgets": { + "footer-sidebar-1": { + "text-66": { + "title": "About MedZone", + "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed tempus est elit, et facilisis odio tempus in. Nam lobortis, est a scelerisque rhoncus.\r\n\r\nCurabitur facilisis convallis malesuada. Duis eget massa tristique, mattis lorem sit amet, molestie massa. Ut a ligula tristique, bibendum lacus ut, tempor tellus.", + "filter": true, + "visual": true + } + }, + "footer-sidebar-2": { + "medzone_featured_doctor-55": { + "title": "Featured Doctor", + "custom_url": "#", + "doctor_id": "Dr.-House-Greg" + } + } + }, + "options": { + "logo": { + "id": "logo", + "label": "Logo", + "setting": "custom_logo", + "content": "/assets/images/logo.png" + }, + "frontpage": { + "id": "frontpage", + "label": "Set frontpage to static", + "setting": "default", + "content": "default" + }, + "medzone_footer_columns": { + "id": "medzone_footer_columns", + "label": "Footer Columns", + "setting": "medzone_footer_columns", + "content": "{\"columnsCount\":2,\"columns\":{\"1\":{\"index\":1,\"span\":\"6\"},\"2\":{\"index\":2,\"span\":\"6\"}}}" + } + }, + "plugins": { + "contact-form-7": "Contact Form 7" + }, + "content": { + "doctors": { + "id": "doctors", + "setting": "medzone_doctors", + "label": "Doctors", + "content": { + "0": { + "doctor_name": "Dr. House Greg", + "doctor_group": "Godlike", + "doctor_description": "

Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius.

", + "doctor_image": "/assets/images/05_doctors_02.jpg", + "doctor_social_facebook": "https://facebook.com", + "doctor_social_twitter": "https://twitter.com", + "doctor_social_google": "https://google.com", + "doctor_social_linkedin": "https://linkedin.com" + }, + "1": { + "doctor_name": "Dr. Jonathan Doe", + "doctor_group": "Surgeon", + "doctor_description": "

Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius.

", + "doctor_image": "/assets/images/05_doctors_01.jpg", + "doctor_social_facebook": "https://facebook.com", + "doctor_social_twitter": "https://twitter.com", + "doctor_social_google": "https://google.com", + "doctor_social_linkedin": "https://linkedin.com" + }, + "2": { + "doctor_name": "Dr. Jean Doe", + "doctor_group": "Surgeon", + "doctor_description": "

Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius.

", + "doctor_image": "/assets/images/05_doctors_03.jpg", + "doctor_social_facebook": "https://facebook.com", + "doctor_social_twitter": "https://twitter.com", + "doctor_social_google": "https://google.com", + "doctor_social_linkedin": "https://linkedin.com" + }, + "3": { + "doctor_name": "Dr. Lisa Cuddy", + "doctor_group": "General", + "doctor_description": "

Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius.

", + "doctor_image": "/assets/images/05_doctors_04.jpg", + "doctor_social_facebook": "https://facebook.com", + "doctor_social_twitter": "https://twitter.com", + "doctor_social_google": "https://google.com", + "doctor_social_linkedin": "https://linkedin.com" + } + } + }, + "hero_cta": { + "id": "hero_cta", + "setting": "medzone_cta_services", + "label": "Hero CTA Services", + "content": { + "0": { + "service_title": "Ambulance", + "service_icon": "fa fa-ambulance", + "service_description": "Wrroom Wroom!" + }, + "1": { + "service_title": "Cardiology Department", + "service_icon": "fa fa-heartbeat", + "service_description": "Tristique senectus et netus et malesuada fames ac turpis egestas." + }, + "2": { + "service_title": "Doctors Appointments", + "service_icon": "fa fa-stethoscope", + "service_description": "Get Free help Now!" + }, + "3": { + "service_title": "Extra services", + "service_icon": "fa fa-hospital-o", + "service_description": "Get Free help Now!" + }, + "4": { + "service_title": "No minuses", + "service_icon": "fa fa-wheelchair", + "service_description": "Wrroom Wroom!" + } + } + }, + "specialties": { + "id": "specialties", + "setting": "medzone_specialties", + "label": "Specialties", + "content": { + "0": { + "specialties_title": "Neurology", + "specialties_icon": "fa fa-stethoscope", + "specialties_description": "Outside of a medical emergency, your primary care physician is the \"first responder\" to your healthcare needs" + }, + "1": { + "specialties_title": "Surgery", + "specialties_icon": "fa fa-cut", + "specialties_description": "State-of-the-art surgical facilities where expert surgeons perform a full complement of procedures." + }, + "2": { + "specialties_title": "Cardio", + "specialties_icon": "fa fa-heartbeat", + "specialties_description": "Few of us like to even think about having a heart attack or being with someone when they have one." + }, + "3": { + "specialties_title": "Oncology", + "specialties_icon": "fa fa-hand-stop-o", + "specialties_description": "Rehabilitation services for conditions ranging from stroke and brain injury to neurological disorders." + } + } + }, + "about": { + "id": "about", + "setting": "medzone_about_info", + "label": "About", + "content": { + "0": { + "info_title": "Mission", + "info_description": "

Our mission is to raise the long-term health status of our community by providing personalized, quality care with compassion, dignity, and respect.

" + }, + "1": { + "info_title": "Vision", + "info_description": "

We are a community of caring health professionals, recognized for promoting wellness through early detection and prevention.

" + }, + "2": { + "info_title": "Admission", + "info_description": "

When you arrive, unless you’re told otherwise, please go directly to the Admitting Department, located in the main hospital lobby.

" + } + } + }, + "information": { + "id": "information", + "setting": "medzone_hospital_information", + "label": "General Information", + "content": { + "0": { + "info_title": "24 Hours Support", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + }, + "1": { + "info_title": "Emergency Services", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + }, + "2": { + "info_title": "Online Appointment", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + }, + "3": { + "info_title": "Best Specialists", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + }, + "4": { + "info_title": "Latest Medical Equipments On The Market", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + }, + "5": { + "info_title": "Amazing Pacient Care", + "info_text": "Pellentesque dapibus tristique ornare. Quisque vitanimate viverra lorem. animatenean luctus lorem mi, et lobortis turpis porttitor ut. Donec dictum dolor varius metus pellentesque, quis elementum massa varius." + } + } + }, + "schedule": { + "id": "schedule", + "setting": "medzone_hospital_schedule", + "label": "Schedule", + "content": { + "0": { + "schedule_days": "Monday - Thursday", + "schedule_hours": "9:30 am - 8:30 pm" + }, + "1": { + "schedule_days": "Friday", + "schedule_hours": "9:30 am - 8:30 pm" + }, + "2": { + "schedule_days": "Weekend", + "schedule_hours": "10:30 am - 5:30 pm" + }, + "3": { + "schedule_days": "Holiday", + "schedule_hours": "Check Dates " + } + } + }, + "testimonials": { + "id": "testimonials", + "setting": "medzone_testimonials", + "label": "Testimonials", + "content": { + "0": { + "testimonial_title": "Doe Jane", + "testimonial_subtitle": "Attending Staff", + "testimonial_text": "\"One of the cleanest and professional plaes I had the chance to be in. The staff was friendly, The rooms very bright and the pacient care excellent. I went home after 3 days spent very well at Regina hospital.\"", + "testimonial_image": "/assets/images/08_testimonial.jpg" + }, + "1": { + "testimonial_title": "Jane Doe", + "testimonial_subtitle": "Attending Staff", + "testimonial_text": "\"One of the cleanest and professional place I had the chance to be in. The staff was friendly, The rooms very bright and the pacient care excellent. I went home after 3 days spent very well at Regina hospital.\"", + "testimonial_image": "/assets/images/08_testimonial.jpg" + } + } + } + }, + "sections": { + "hero": { + "id": "hero", + "label": "Hero", + "setting": "medzone_frontpage_sections", + "content": { + "hero_background_color": "#f9f9fa", + "hero_background": "/assets/images/01_header_01.png", + "hero_cta": "Best Medical Care you can get for you and your family.", + "hero_small": "More than 3000 specialists are here for you", + "hero_navigation": "", + "hero_repeater_field": "medzone_cta_services", + "type": "hero" + } + }, + "about": { + "id": "about", + "label": "About", + "setting": "medzone_frontpage_sections", + "content": { + "about_title": "Watch our impact in the
patient's life", + "about_description": "

We are a a full-service, non-profit community hospital, offering comprehensive medical, surgical and therapeutic services. With 281 beds, more than 1900 employees and a world-class medical staff, we provide innovative, technologically advanced care on a patient-friendly, just north of Seattle.

More

", + "about_image": "/assets/images/01_our_impact.jpg", + "about_grouping": [ + "all" + ], + "about_navigation": "", + "about_repeater_field": "medzone_about_info", + "type": "about" + } + }, + "specialties": { + "id": "specialties", + "label": "Specialties", + "setting": "medzone_frontpage_sections", + "content": { + "main_specialty_title": "Main Specialties", + "main_specialty": "We value our patients", + "main_specialty_description": "

MedZone provides complete medical and surgical services in both inpatient and outpatient settings, at in several convenient locations.

See all Specialities

", + "specialties_grouping": [ + "all" + ], + "specialties_navigation": "", + "specialties_repeater_field": "medzone_specialties", + "type": "specialties" + } + }, + "openhours": { + "id": "openhours", + "label": "Open Hours", + "setting": "medzone_frontpage_sections", + "content": { + "openhours_background": "/assets/images/03_top_experience.png", + "openhours_title": "Top notch
experience", + "openhours_text": "

Our specialist make sure you get the best care there is.

Make an appointment

", + "openhours_navigation": "", + "openhours_repeater_field": "medzone_hospital_schedule", + "type": "openhours" + } + }, + "accordion": { + "id": "openhours", + "label": "General Information", + "setting": "medzone_frontpage_sections", + "content": { + "accordion_title": "Why Choose Us?", + "accordion_text": "

We are a full-service, non-profit community hospital, offering comprehensive medical, surgical and therapeutic services.

", + "accordion_image": "/assets/images/04_why_choose_us.jpg", + "accordion_navigation": "", + "accordion_repeater_field": "medzone_hospital_information", + "type": "accordion" + } + }, + "doctors": { + "id": "doctors", + "label": "Doctors", + "setting": "medzone_frontpage_sections", + "content": { + "doctors_title": "Meet our Doctors", + "doctors_subtitle": "

Our experts are here for you every single day! We care about our patients and we
do our best to make them happy.

", + "doctors_group": [ + "all" + ], + "doctors_nabigation": "", + "doctors_repeater_field": "medzone_doctors", + "type": "doctors" + } + }, + "hospital": { + "id": "hospital", + "label": "Hospital", + "setting": "medzone_frontpage_sections", + "content": { + "hospital_title": "Explore our Hospital", + "hospital_info": "

MedZone Hospital is dedicated to improving the quality of care for the patients who suffer a heart attack and related illnesses.

VIew our rooms", + "hospital_image_1": "/assets/images/06_explore_hospital.jpg", + "hospital_image_2": "/assets/images/06_explore_hospital.jpg", + "hospital_image_3": "/assets/images/06_explore_hospital.jpg", + "type": "hospital" + } + }, + "involvement": { + "id": "involvement", + "label": "Involvement", + "setting": "medzone_frontpage_sections", + "content": { + "involvement_image": "/assets/images/07_involvment.jpg", + "involvement_title": "True Involvement in Pacient Care", + "involvement_text": "

MedZone earned the award by meeting specific criteria and standards of performance for the quick and appropriate treatment of STEMI patients by providing emergency procedures to re-establish blood flow to blocked arteries when needed.

Eligible hospitals must adhere to these measures at a set level for a designated period to receive the awards.

", + "type": "involvement" + } + }, + "testimonials": { + "id": "testimonials", + "label": "Testimonials", + "setting": "medzone_frontpage_sections", + "content": { + "testimonials_title": "Why Choose Us?", + "testimonials_navigation": "", + "testimonials_repeater_field": "medzone_testimonials", + "type": "testimonials" + } + } + } + } +} diff --git a/inc/admin/welcome-screen/img/ajax-loader.gif b/inc/libraries/welcome-screen/img/ajax-loader.gif similarity index 100% rename from inc/admin/welcome-screen/img/ajax-loader.gif rename to inc/libraries/welcome-screen/img/ajax-loader.gif diff --git a/inc/libraries/welcome-screen/img/colorlib.png b/inc/libraries/welcome-screen/img/colorlib.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd47353f1e48096e82d1dc31c6d38544294734e GIT binary patch literal 797197 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 H)VKdXAULJ! literal 0 HcmV?d00001 diff --git a/inc/libraries/welcome-screen/js/welcome.js b/inc/libraries/welcome-screen/js/welcome.js new file mode 100644 index 0000000..a23ba26 --- /dev/null +++ b/inc/libraries/welcome-screen/js/welcome.js @@ -0,0 +1,292 @@ +var welcomeScreenFunctions = { + /** + * Import demo content + */ + importDemoContent: function() { + var self = this; + jQuery( '.epsilon-ajax-button' ).click( function( e ) { + var action = jQuery( this ).attr( 'data-action' ) ? jQuery( this ).attr( 'data-action' ) : jQuery( this ).attr( 'id' ), + container = jQuery( this ).parents( '.action-required-box' ), + checkboxes = container.find( ':checkbox' ), + importThis = { + 'plugins': [], + 'options': [] + }; + + e.preventDefault(); + + jQuery.each( checkboxes, function( k, item ) { + + if ( jQuery( item ).prop( 'checked' ) ) { + importThis[ jQuery( item ).attr( 'name' ) ].push( jQuery( item ).val() ); + } + + } ); + + self._importPlugins( importThis[ 'plugins' ] ); + + if ( importThis[ 'plugins' ].length ) { + jQuery( document ).on( 'epsilon-all-plugins-imported', function() { + self._importContent( importThis, container ); + } ); + } else { + self._importContent( importThis, container ); + } + + } ); + }, + /** + * Import the actual content + * + * @param $import + * @param action + * @param container + * @private + * + * @todo send "argument" with demo slug + */ + _importContent: function( $import, container ) { + + var needImported = 'import-all'; + + if ( $import.options.length < 1 ) { + location.reload(); + return; + } + + if ( $import.options.length < 2 ) { + needImported = $import.options[0]; + } + + jQuery.ajax( { + type: 'POST', + data: { action: 'shapely_companion_import_content', 'import' : needImported }, + dataType: 'json', + url: ajaxurl, + success: function( json ) { + if ( container.length ) { + container.html( '

Demo content was imported successfully!

' ); + + window.setTimeout( function() { + container.slideUp( 300, function() { + container.remove(); + location.reload(); + } ); + }, 3000 ); + } + }, + /** + * Throw errors + * + * @param jqXHR + * @param textStatus + * @param errorThrown + */ + error: function( jqXHR, textStatus, errorThrown ) { + console.log( jqXHR + ' :: ' + textStatus + ' :: ' + errorThrown ); + } + + } ); + }, + /** + * Start the installation/activation of the plugin + * + * @param $plugins + * @private + */ + _importPlugins: function( $plugins ) { + var count = 0, + max = $plugins.length; + jQuery( 'a[data-slug="' + $plugins[ count ] + '"]' ).click(); + + jQuery( document ).on( 'epsilon-plugin-activated', function() { + count ++; + if ( count === max ) { + jQuery( document ).trigger( 'epsilon-all-plugins-imported' ); + } + + if ( 'undefined' !== typeof($plugins[ count ]) ) { + jQuery( 'a[data-slug="' + $plugins[ count ] + '"]' ).click(); + } + } ); + }, + + /** + * Dismiss action through AJAX + */ + dismissAction: function() { + var args; + + jQuery( '.required-action-button' ).click( function() { + args = { + action: [ 'Epsilon_Welcome_Screen', 'handle_required_action' ], + nonce: welcomeScreen.ajax_nonce, + args: { + 'do': jQuery( this ).attr( 'data-action' ), + 'id': jQuery( this ).attr( 'id' ) + } + }; + + jQuery.ajax( { + type: 'POST', + data: { action: 'welcome_screen_ajax_callback', args: args }, + dataType: 'json', + url: ajaxurl, + success: function() { + location.reload(); + }, + /** + * Throw errors + * + * @param jqXHR + * @param textStatus + * @param errorThrown + */ + error: function( jqXHR, textStatus, errorThrown ) { + console.log( jqXHR + ' :: ' + textStatus + ' :: ' + errorThrown ); + } + + } ); + } ); + }, + + /** + * Init Range sliders in backend + * + * @param context + */ + rangeSliders: function( context ) { + var sliders = context.find( '.slider-container' ); + + jQuery.each( sliders, function() { + var slider, input, inputId, id, instance, self; + self = jQuery( this ); + slider = jQuery( this ).find( '.ss-slider' ); + input = jQuery( this ).find( 'input' ); + inputId = input.attr( 'id' ); + id = slider.attr( 'id' ); + instance = jQuery( '#' + id ); + + instance.slider( { + value: self.find( 'input' ).attr( 'value' ), + range: 'min', + min: parseFloat( instance.attr( 'data-attr-min' ) ), + max: parseFloat( instance.attr( 'data-attr-max' ) ), + step: parseFloat( instance.attr( 'data-attr-step' ) ), + /** + * Removed Change event because server was flooded with requests from + * javascript, sending changesets on each increment. + * + * @param event + * @param ui + */ + slide: function( event, ui ) { + self.find( 'input' ).attr( 'value', ui.value ); + }, + /** + * Bind the change event to the "actual" stop + * @param event + * @param ui + */ + stop: function( event, ui ) { + jQuery( '#' + inputId ).trigger( 'change' ); + } + } ); + + jQuery( input ).on( 'focus', function() { + jQuery( this ).blur(); + } ); + + instance.attr( 'value', ( instance.slider( 'value' ) ) ); + instance.on( 'change', function() { + jQuery( '#' + id ).slider( { + value: jQuery( this ).val() + } ); + } ); + } ); + }, + + /** + * Activate the plugin when the plugin has been installed + */ + activatePlugin: function() { + var activateButtonSlug = jQuery( 'a[data-slug]' ); + jQuery( activateButtonSlug ).on( 'click', function( e ) { + var self = jQuery( this ), + dataToSend = { plugin: self.attr( 'data-slug' ) }; + if ( self.hasClass( 'install-now' ) || self.hasClass( 'deactivate-now' ) ) { + return; + } + e.preventDefault(); + + jQuery.ajax( { + beforeSend: function() { + self.replaceWith( '' + welcomeScreen.activating_string + '...' ); + }, + async: true, + type: 'GET', + dataType: 'html', + url: self.attr( 'href' ), + success: function( response ) { + var actions = jQuery( '#plugin-filter' ).find( '.action-required-box' ); + + if ( ! actions.length ) { + location.reload(); + } + + jQuery( '.updating-message' ).removeClass( 'updating-message' ).parents( '.action-required-box' ).slideUp( 200 ).remove(); + actions = jQuery( '#plugin-filter' ).find( '.action-required-box' ); + + jQuery( '.import-content-container' ).find( 'input[data-slug="' + self.attr( 'data-slug' ) + '"]' ).parent().remove(); + + if ( ! actions.length ) { + jQuery( '#plugin-filter' ).append( '' + welcomeScreen.no_actions + '' ); + } + + jQuery( document ).trigger( 'epsilon-plugin-activated', dataToSend ); + } + } ); + } ); + + jQuery( document ).on( 'wp-plugin-install-success', function( response, data ) { + var activateButton = jQuery( 'a[data-slug="' + data.slug + '"]' ), + dataToSend = { plugin: data.slug }; + if ( activateButton.length && ( jQuery( 'body' ).hasClass( welcomeScreen.body_class ) || jQuery( 'body' ).hasClass( 'wp-customizer' ) ) ) { + + jQuery.ajax( { + beforeSend: function() { + activateButton.replaceWith( '' + welcomeScreen.activating_string + '...' ); + }, + async: true, + type: 'GET', + dataType: 'html', + url: data.activateUrl, + success: function( response ) { + var actions = jQuery( '#plugin-filter' ).find( '.action-required-box' ); + + if ( ! actions.length ) { + location.reload(); + } + + jQuery( '.updating-message' ).removeClass( 'updating-message' ).parents( '.action-required-box' ).slideUp( 200 ).remove(); + jQuery( document ).trigger( 'epsilon-plugin-activated', dataToSend ); + } + } ); + } + } ); + } +}; + +jQuery( document ).ready( function() { + + welcomeScreenFunctions.dismissAction(); + welcomeScreenFunctions.importDemoContent(); + welcomeScreenFunctions.activatePlugin(); + + jQuery( '.epsilon-hidden-content-toggler' ).click( function( e ){ + var id = jQuery( this ).attr( 'href' ); + e.preventDefault(); + jQuery( id ).slideToggle(); + }); + +} ); diff --git a/inc/admin/welcome-screen/sections/getting-started.php b/inc/libraries/welcome-screen/sections/getting-started.php similarity index 93% rename from inc/admin/welcome-screen/sections/getting-started.php rename to inc/libraries/welcome-screen/sections/getting-started.php index e5e7863..975273a 100644 --- a/inc/admin/welcome-screen/sections/getting-started.php +++ b/inc/libraries/welcome-screen/sections/getting-started.php @@ -12,11 +12,11 @@

- +

+ href="">

+ +
+ actions ) ) { + $actions_left = $this->get_actions_left(); + foreach ( $this->actions as $key => $value ) { + $hidden = false; + + if ( isset( $actions_left[ $value['id'] ] ) && null !== $actions_left[ $value['id'] ] ) { + $hidden = $actions_left[ $value['id'] ]; + } + + if ( $value['check'] ) { + continue; + } + + ?> +
+ + + + +

+ + + +

+ +
+ +

+ + + $func(); + } else { + echo $value['help']; + } + ?> + + + + + + check_plugin( $value['plugin_slug'] ); + $link = $this->create_plugin_link( $plugin['needs'], $value['plugin_slug'] ); + + ?> +

+ +

+ + + +
+ + + + + + + + +
diff --git a/inc/libraries/welcome-screen/sections/recommended-plugins.php b/inc/libraries/welcome-screen/sections/recommended-plugins.php new file mode 100644 index 0000000..40833b3 --- /dev/null +++ b/inc/libraries/welcome-screen/sections/recommended-plugins.php @@ -0,0 +1,39 @@ + + + diff --git a/inc/admin/welcome-screen/sections/support.php b/inc/libraries/welcome-screen/sections/support.php similarity index 100% rename from inc/admin/welcome-screen/sections/support.php rename to inc/libraries/welcome-screen/sections/support.php From 5eada6aba45023a9f03399b80d2d95a50810a200 Mon Sep 17 00:00:00 2001 From: Giucu Date: Fri, 9 Feb 2018 15:28:28 +0200 Subject: [PATCH 6/9] Fixed Travis Review --- .travis.yml | 2 -- inc/class-shapely.php | 20 ++++++++++---------- inc/customizer.php | 6 +++--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94ce7a1..c4f48cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/inc/class-shapely.php b/inc/class-shapely.php index 0d29194..1309002 100644 --- a/inc/class-shapely.php +++ b/inc/class-shapely.php @@ -14,7 +14,7 @@ class Shapely { public $recommended_actions; public $theme_slug = 'shapely'; - + function __construct() { if ( ! is_admin() && ! is_customize_preview() ) { @@ -22,7 +22,7 @@ function __construct() { } $this->load_class(); - + $this->recommended_actions = apply_filters( 'shapely_required_actions', array( array( @@ -123,17 +123,17 @@ public function init_customizer( $wp_customize ) { } - private function generate_action_html(){ + private function generate_action_html() { $import_actions = array( - 'set-frontpage' => esc_html__( 'Set Static FrontPage', 'shapely' ), - 'import-widgets' => esc_html__( 'Import HomePage Widgets', 'shapely' ), + 'set-frontpage' => esc_html__( 'Set Static FrontPage', 'shapely' ), + 'import-widgets' => esc_html__( 'Import HomePage Widgets', 'shapely' ), ); $import_plugins = array( 'shapely-companion' => esc_html__( 'Shapely Companion', 'shapely' ), - 'jetpack' => esc_html__( 'Jetpack', 'shapely' ), - 'contact-form-7' => esc_html__( 'Contact Form 7', 'shapely' ), + 'jetpack' => esc_html__( 'Jetpack', 'shapely' ), + 'contact-form-7' => esc_html__( 'Contact Form 7', 'shapely' ), ); $plugins_html = ''; @@ -145,7 +145,7 @@ private function generate_action_html(){ $html = '

' . __( 'Import Demo Content', 'shapely' ) . ''; $html .= '' . __( 'Advanced', 'shapely' ) . '

'; $html .= '
'; - + foreach ( $import_plugins as $id => $label ) { if ( ! Shapely_Notify_System::shapely_has_plugin( $id ) ) { $plugins_html .= $this->generate_checkbox( $id, $label, 'plugins' ); @@ -160,7 +160,7 @@ private function generate_action_html(){ $html .= '
'; $html .= ''; } - + $html .= '
'; $html .= '

' . __( 'Demo Content', 'shapely' ) . '

'; $html .= '
'; @@ -182,4 +182,4 @@ private function generate_checkbox( $id, $label, $name = 'options', $block = fal } } -new Shapely(); \ No newline at end of file +new Shapely(); diff --git a/inc/customizer.php b/inc/customizer.php index 6040ece..ecdcbfd 100644 --- a/inc/customizer.php +++ b/inc/customizer.php @@ -1190,11 +1190,11 @@ function shapely_customizer_custom_control_css() { clear: both; } .widget-content .iris-picker .iris-strip .ui-slider-handle { - top: auto; - transform: translateX(0); + top: auto; + transform: translateX(0); } .widget-content .iris-picker .iris-slider-offset { - margin: 0; + margin: 0; } Date: Fri, 9 Feb 2018 15:36:31 +0200 Subject: [PATCH 7/9] Travis Review 2 --- assets/js/customizer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/js/customizer.js b/assets/js/customizer.js index 13a2e19..1a1c571 100644 --- a/assets/js/customizer.js +++ b/assets/js/customizer.js @@ -41,7 +41,6 @@ } control.shapelyInterval = setInterval( control.updateControl, 1000, control ); } - } ); control.heightElement.keyup( function() { From 2c0a0ed7e7e68cf640b53d6c36b41d35cd9d5aff Mon Sep 17 00:00:00 2001 From: Giucu Date: Fri, 9 Feb 2018 17:21:16 +0200 Subject: [PATCH 8/9] Fixed Related Project & Posts Image size --- inc/class-shapely-related-posts.php | 4 ++-- style.css | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/inc/class-shapely-related-posts.php b/inc/class-shapely-related-posts.php index 50cb4c9..c64282e 100644 --- a/inc/class-shapely-related-posts.php +++ b/inc/class-shapely-related-posts.php @@ -226,9 +226,9 @@ function output_related_posts() { echo '
'; if ( has_post_thumbnail( $related_posts->post->ID ) ) { - echo '' . get_the_post_thumbnail( $related_posts->post->ID, 'shapely-grid' ) . ''; + echo '' . get_the_post_thumbnail( $related_posts->post->ID, 'shapely-grid' ) . ''; } else { - echo ''; + echo ''; } if ( $show_title ) { diff --git a/style.css b/style.css index ae859ca..9742fb6 100644 --- a/style.css +++ b/style.css @@ -4155,6 +4155,17 @@ footer.bg-dark a { margin-right: 20px; color: #001c28; } +.shapely-related-posts .owl-carousel .owl-item .related-item-thumbnail img { + display: none; +} +.shapely-related-posts .related-item-thumbnail { + display: block; + padding-bottom: 85%; + background-repeat: no-repeat; + background-size: cover; + background-position: center; +} + .pt0 { padding-top: 30px; } From c38077e4771dc7f8e28a12e126ce279532efba3e Mon Sep 17 00:00:00 2001 From: Giucu Date: Fri, 9 Feb 2018 17:28:36 +0200 Subject: [PATCH 9/9] Version bump --- changelog.txt | 3 +++ package.json | 2 +- style.css | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index bd09f61..c14ca0e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 diff --git a/package.json b/package.json index 57d685c..52ba18f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "shapely", "main": "Gruntfile.js", - "version": "1.2.0", + "version": "1.2.1", "homepage": "https://www.colorlib.com", "author": "Colorlib", "license": "GPL v3", diff --git a/style.css b/style.css index 9742fb6..f1fc7b0 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: https://colorlib.com/wp/themes/shapely Author: colorlib Author URI: https://colorlib.com/ Description: Shapely is a powerful and versatile one page WordPress theme with pixel perfect design and outstanding functionality. It is by far the most advanced free WordPress theme available today with loads of unmatched customization options. This theme comes with several homepage widgets that can be used to add portfolio, testimonials, parallax sections, your product or service information, call for action and much more. Shapely supports most free and premium WordPress plugins such as WooCommerce, Jetpack, Gravity Forms, Contact Form 7, Yoast SEO, Google Analytics by Yoast and much more. This theme is the best suited for business, landing page, portfolio, ecommerce, store, local business, personal websites but can be tweaked to be used as blog, magazine or any other awesome website while highlighting its unique one page setup. This is going to be the last WordPress theme you will ever want to use because it is so much better than anything you have seen. Needless to say that this theme is SEO friendly thanks to its well optimized strucutre. Shapely theme is mobile friendly and fully responsive making it your best multipurpose partnert for any project and website. -Version: 1.2 +Version: 1.2.1 License: GNU General Public License v3 License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: shapely