diff --git a/comments.php b/comments.php index 5a1cf62..30f0af2 100644 --- a/comments.php +++ b/comments.php @@ -93,7 +93,7 @@ // If comments are closed and there are comments, let's leave a little note, shall we? if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : - ?> + ?>

@@ -104,6 +104,6 @@ 'comment_notes_after' => '', ) ); -?> + ?> diff --git a/content-archive-download.php b/content-archive-download.php index e3816ba..fefa583 100644 --- a/content-archive-download.php +++ b/content-archive-download.php @@ -6,10 +6,10 @@ */ ?> -
+
- + get_the_ID(), ) ); -?> + ?>
diff --git a/content-frontpage.php b/content-frontpage.php index 602f819..163dcd6 100644 --- a/content-frontpage.php +++ b/content-frontpage.php @@ -84,7 +84,7 @@ if ( ( isset( $zerif_contactus_show ) && $zerif_contactus_show != 1 ) || is_customize_preview() ) : echo '
'; -?> + ?>
@@ -118,11 +118,12 @@ } elseif ( is_customize_preview() ) { echo '
'; } - ?> + ?>
'; echo do_shortcode( $zerif_alternative_contact_form ); diff --git a/content-large.php b/content-large.php index 76a0cfe..e836f7c 100644 --- a/content-large.php +++ b/content-large.php @@ -115,11 +115,11 @@ if ( $categories_list && zerif_categorized_blog() ) : - ?> + ?> - + @@ -133,11 +133,11 @@ if ( $tags_list ) : - ?> + ?> - + diff --git a/content-page-no-title.php b/content-page-no-title.php index 10532e8..36d5c56 100644 --- a/content-page-no-title.php +++ b/content-page-no-title.php @@ -26,7 +26,7 @@ ) ); - ?> + ?>
diff --git a/content-page.php b/content-page.php index 86bdcb9..866610f 100644 --- a/content-page.php +++ b/content-page.php @@ -36,7 +36,7 @@ ) ); - ?> + ?>
diff --git a/content-single.php b/content-single.php index e1d5afd..17f6ecc 100644 --- a/content-single.php +++ b/content-single.php @@ -30,7 +30,7 @@ 'after' => '
', ) ); - ?> + ?> @@ -80,7 +80,7 @@ esc_url( get_permalink() ) ); - ?> + ?> ', '' ); ?> diff --git a/functions.php b/functions.php index cd3eec3..6c93392 100644 --- a/functions.php +++ b/functions.php @@ -5,10 +5,17 @@ * @package zerif-lite */ + + $vendor_file = trailingslashit( get_template_directory() ) . 'vendor/autoload.php'; if ( is_readable( $vendor_file ) ) { require_once $vendor_file; } + +if ( ! defined( 'WPFORMS_SHAREASALE_ID' ) ) { + define( 'WPFORMS_SHAREASALE_ID', '848264' ); +} + add_filter( 'themeisle_sdk_products', 'zerif_load_sdk' ); /** * Loads products array. @@ -28,7 +35,7 @@ function zerif_load_sdk( $products ) { } -define( 'ZERIF_LITE_VERSION', '1.8.5.44' ); +define( 'ZERIF_LITE_VERSION', '1.8.5.45' ); @@ -128,14 +135,7 @@ function zerif_setup() { require_once get_template_directory() . '/ti-prevdem/init-prevdem.php'; /* woocommerce support */ - $woocommerce_settings = apply_filters( - 'zerif_woocommerce_args', array( - 'single_image_width' => 1600, - 'thumbnail_image_width' => 300, - 'gallery_thumbnail_image_width' => 165, - ) - ); - add_theme_support( 'woocommerce', $woocommerce_settings ); + add_theme_support( 'woocommerce' ); add_theme_support( 'wc-product-gallery-zoom' ); add_theme_support( 'wc-product-gallery-lightbox' ); add_theme_support( 'wc-product-gallery-slider' ); @@ -406,6 +406,9 @@ function zerif_setup() { 'activate_label' => esc_html__( 'Activate', 'zerif-lite' ), 'deactivate_label' => esc_html__( 'Deactivate', 'zerif-lite' ), 'content' => array( + array( + 'slug' => 'wpforms-lite', + ), array( 'slug' => 'translatepress-multilingual', ), @@ -521,7 +524,7 @@ function zerif_set_woo_image_sizes() { update_option( 'zerif_update_woocommerce_customizer_controls', true ); } -add_action( 'after_setup_theme', 'zerif_set_woo_image_sizes', 10 ); + /** * Migrate logo from theme to core @@ -2097,36 +2100,132 @@ function megamenu_add_theme_zerif_lite_max_menu( $themes ) { add_filter( 'megamenu_themes', 'megamenu_add_theme_zerif_lite_max_menu' ); -add_action( 'admin_notices', 'zerif_fagri_notice' ); /** - * Add a dismissible notice in the dashboard to let users know that we have a new child theme for Hestia, Fagri - * TODO: Remove this in a future release + * Function that decide if current date is before a certain date. + * + * @param string $date Date to compare. + * @return bool */ -function zerif_fagri_notice() { +function zerif_is_before_date( $date ) { + $countdown_time = strtotime( $date ); + $current_time = time(); + return $current_time <= $countdown_time; +} + +/** + * Add a dismissible notice in the dashboard to let users know they can migrate to Hestia + */ +function zerif_hestia_notice() { global $current_user; $user_id = $current_user->ID; - /* Check that the user hasn't already clicked to ignore the message */ - if ( ! get_user_meta( $user_id, 'zerif_ignore_fagri_notice' ) ) { - echo '
'; - printf( '', '?zerif_nag_ignore_fagri=0' ); - echo '

'; - /* translators: Install Fagri link */ - printf( esc_html__( 'We just launched a new free %s, you might like it.', 'zerif-lite' ), sprintf( '%2$s', admin_url( 'theme-install.php?theme=fagri' ), esc_html__( 'theme', 'zerif-lite' ) ) ); - echo '

'; - echo '
'; + + $ignored_notice = get_user_meta( $user_id, 'zerif_ignore_hestia_notice' ); + if ( ! empty( $ignored_notice ) ) { + return; } + + $should_display_notice = zerif_is_before_date( '2018-11-01' ); + if ( ! $should_display_notice ) { + return; + } + + $message = + sprintf( + /* translators: Install Hestia link */ + esc_html__( 'Check out our %s, fully compatible with your current Zerif Lite theme. You will love it!', 'zerif-lite' ), + sprintf( + '%2$s', + admin_url( 'theme-install.php?theme=hestia' ), + esc_html__( 'best 2018 free theme', 'zerif-lite' ) + ) + ); + + $dismiss_button = sprintf( + '', + '?zerif_nag_ignore_hestia=0' + ); + + printf( '
%1$s

%2$s

', $dismiss_button, $message ); } +add_action( 'admin_notices', 'zerif_hestia_notice' ); + -add_action( 'admin_init', 'zerif_nag_ignore_fagri' ); +/** + * Update the zerif_ignore_hestia_notice option to true, to dismiss the notice from the dashboard + */ +function zerif_nag_ignore_hestia() { + global $current_user; + $user_id = $current_user->ID; + /* If user clicks to ignore the notice, add that to their user meta */ + if ( isset( $_GET['zerif_nag_ignore_hestia'] ) && '0' == $_GET['zerif_nag_ignore_hestia'] ) { + add_user_meta( $user_id, 'zerif_ignore_hestia_notice', 'true', true ); + } +} +add_action( 'admin_init', 'zerif_nag_ignore_hestia' ); + +/** + * Add a dismissible notice in the dashboard to let users know they can migrate to Zelle and read about Zerif renaming + */ +function zerif_neve_notice() { + global $current_user; + $user_id = $current_user->ID; + + $ignored_notice = get_user_meta( $user_id, 'zerif_ignore_neve_notice' ); + if ( ! empty( $ignored_notice ) ) { + return; + } + + $should_display_notice = ! zerif_is_before_date( '2018-11-01' ); + if ( ! $should_display_notice ) { + return; + } + + $dismiss_button = + sprintf( + '', + '?zerif_nag_ignore_neve=0' + ); + + $message1 = + sprintf( + /* translators: Install Neve link */ + esc_html__( 'Zerif changes its name and will be no longer maintained. But don\'t worry about that. Check out %s, fully compatible with Zerif Lite. It\'s free and it\'s superb. You will love it!', 'zerif-lite' ), + sprintf( + '%2$s', + esc_url( 'https://themeisle.com/themes/neve/?notice=1' ), + esc_html__( 'our newest theme', 'zerif-lite' ) + ) + ); + + $message2 = + sprintf( + /* translators: Zerif renaming article link */ + esc_html__( '%s about the Zerif renaming and our next plans.', 'zerif-lite' ), + sprintf( + '%2$s', + esc_url( 'https://themeisle.com/blog/zerif-changes-its-name-to-zelle/' ), + esc_html__( 'Read more', 'zerif-lite' ) + ) + ); + + printf( + '
%1$s

%2$s

%3$s

', + $dismiss_button, + $message1, + $message2 + ); +} +add_action( 'admin_notices', 'zerif_neve_notice' ); /** - * Update the zerif_ignore_fagri_notice option to true, to dismiss the notice from the dashboard + * Update the zerif_ignore_hestia_notice option to true, to dismiss the notice from the dashboard */ -function zerif_nag_ignore_fagri() { +function zerif_nag_ignore_neve() { global $current_user; $user_id = $current_user->ID; /* If user clicks to ignore the notice, add that to their user meta */ - if ( isset( $_GET['zerif_nag_ignore_fagri'] ) && '0' == $_GET['zerif_nag_ignore_fagri'] ) { - add_user_meta( $user_id, 'zerif_ignore_fagri_notice', 'true', true ); + if ( isset( $_GET['zerif_nag_ignore_neve'] ) && '0' == $_GET['zerif_nag_ignore_neve'] ) { + add_user_meta( $user_id, 'zerif_ignore_neve_notice', 'true', true ); } } +add_action( 'admin_init', 'zerif_nag_ignore_neve' ); diff --git a/header.php b/header.php index a511f74..abdb1f7 100644 --- a/header.php +++ b/header.php @@ -30,7 +30,7 @@ > - +?>
@@ -90,7 +90,7 @@ } else { - ?> + ?>

@@ -103,7 +103,7 @@ $description = get_bloginfo( 'description', 'display' ); if ( ! empty( $description ) ) : - ?> + ?>

diff --git a/home.php b/home.php index 31a745e..3582b68 100644 --- a/home.php +++ b/home.php @@ -17,15 +17,15 @@

- + ?>

- diff --git a/inc/admin/welcome-screen/sections/actions-required.php b/inc/admin/welcome-screen/sections/actions-required.php index ecd046e..8e8b784 100644 --- a/inc/admin/welcome-screen/sections/actions-required.php +++ b/inc/admin/welcome-screen/sections/actions-required.php @@ -11,7 +11,7 @@

-
+
+ ?>

+ ?>

+ ?>

-
+
Zerif Lite + ?> diff --git a/inc/admin/welcome-screen/sections/getting-started.php b/inc/admin/welcome-screen/sections/getting-started.php index ae00c36..e24ee10 100644 --- a/inc/admin/welcome-screen/sections/getting-started.php +++ b/inc/admin/welcome-screen/sections/getting-started.php @@ -15,7 +15,7 @@

Welcome to Zerif Lite! + ?>

@@ -23,7 +23,7 @@ -
+
@@ -35,7 +35,7 @@
-
+
@@ -49,37 +49,37 @@

-
+

-
+

-
+

-
+

-
+

-
+

@@ -93,37 +93,37 @@

-
+

-
+

-
+

-
+

-
+

-
+

@@ -143,7 +143,7 @@
-
+

@@ -161,16 +161,16 @@ + ?>

+?> -
+

@@ -182,16 +182,16 @@ + ?>

+?> -
+

@@ -203,15 +203,15 @@ + ?>

+?> -
+

Adblock Notify

@@ -222,13 +222,13 @@ + ?>

Adblock Notify

+?>
@@ -244,15 +244,15 @@ + ?>

+?> -
+

@@ -264,15 +264,15 @@ + ?>

+?> -
+

@@ -284,15 +284,15 @@ + ?>

+?> -
+

FEEDZY RSS Feeds

@@ -303,13 +303,13 @@ + ?>

FEEDZY RSS Feeds

+?> diff --git a/inc/class/class-customizer-theme-info-control/class-customizer-theme-info-control.php b/inc/class/class-customizer-theme-info-control/class-customizer-theme-info-control.php index 4c4e434..32b025c 100644 --- a/inc/class/class-customizer-theme-info-control/class-customizer-theme-info-control.php +++ b/inc/class/class-customizer-theme-info-control/class-customizer-theme-info-control.php @@ -108,7 +108,7 @@ public function content_template() { <# } #> - <# } #> - + ?>

  • diff --git a/inc/customizer-info/class/class-zerif-customize-upsell-pro.php b/inc/customizer-info/class/class-zerif-customize-upsell-pro.php index 3b3d3f1..a6161f8 100644 --- a/inc/customizer-info/class/class-zerif-customize-upsell-pro.php +++ b/inc/customizer-info/class/class-zerif-customize-upsell-pro.php @@ -65,7 +65,7 @@ public function json() { * @return void */ protected function render_template() { - ?> + ?>

  • diff --git a/inc/customizer.php b/inc/customizer.php index 43ef7cc..b39b067 100644 --- a/inc/customizer.php +++ b/inc/customizer.php @@ -563,7 +563,7 @@ function zerif_contactus_title_render_callback() { * Render callback for zerif_contactus_button_label */ function zerif_contactus_button_label_render_callback() { - ?> + ?> @@ -2254,7 +2254,7 @@ function zerif_blog_header_title_subtitle_callback() { /* Contactus subtitle */ - /* translators: Pirate Forms plugin */ + /* translators: WPForms Lite plugin */ $default = ! defined( 'PIRATE_FORMS_VERSION' ) ? sprintf( __( 'You need to install %s to create a contact form.', 'zerif-lite' ), 'Pirate Forms' ) : ''; $wp_customize->add_setting( 'zerif_contactus_subtitle', array( diff --git a/package.json b/package.json index 16755dc..08134bb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zerif-lite", "nicename": "Zerif Lite", - "version": "1.8.5-44", + "version": "1.8.5-45", "description": "Zerif Lite theme", "category": "themes", "repository": { diff --git a/page.php b/page.php index cc19c92..22726a3 100644 --- a/page.php +++ b/page.php @@ -62,7 +62,7 @@ zerif_after_page_content_trigger(); zerif_sidebar_trigger(); } - ?> + ?> diff --git a/rtl.css b/rtl.css index b83b493..0461b8c 100644 --- a/rtl.css +++ b/rtl.css @@ -1680,6 +1680,18 @@ ul.nav > li.current_page_item > a:before { } } +/*--------------------------------------- + ** WPForms Lite ----- +-----------------------------------------*/ + +.home div.wpforms-container-full .wpforms-form input[type=text], .home div.wpforms-container-full .wpforms-form input[type=email], .home div.wpforms-container-full .wpforms-form textarea { + padding: 9px 15px 9px 9px; +} + +div.wpforms-container-full .wpforms-form .wpforms-submit-container { + text-align: left; +} + /*--------------------------------------- ** Responsive ----- diff --git a/search.php b/search.php index 26d10f6..dc4db70 100644 --- a/search.php +++ b/search.php @@ -28,7 +28,7 @@ ' . get_search_query() . '' ); - ?> + ?>

    @@ -55,7 +55,7 @@ } zerif_after_search_trigger(); - ?> +?> diff --git a/sections/about_us.php b/sections/about_us.php index 335acdc..38926f9 100644 --- a/sections/about_us.php +++ b/sections/about_us.php @@ -158,145 +158,145 @@ if ( $there_is_skills != '' ) : -?> + ?>
    @@ -330,7 +330,7 @@ echo '
    '; dynamic_sidebar( 'sidebar-aboutus' ); echo '
    '; - echo '
    '; + echo ''; endif; ?> diff --git a/sidebar.php b/sidebar.php index 1e405e5..7d36cec 100644 --- a/sidebar.php +++ b/sidebar.php @@ -30,7 +30,7 @@ 'type' => 'monthly', ) ); -?> + ?> diff --git a/single.php b/single.php index 29ab612..8667861 100644 --- a/single.php +++ b/single.php @@ -37,7 +37,7 @@ comments_template( '' ); endif; endwhile; // end of the loop. - ?> + ?> diff --git a/style.css b/style.css index e75c375..b8280e1 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: https://themeisle.com/themes/zerif-lite/ Author: ThemeIsle Author URI: https://themeisle.com Description: Zerif LITE is a free one page WordPress theme. It's perfect for web agency business,corporate business,personal and parallax business portfolio, photography sites and freelancer.Is built on BootStrap with parallax support, is responsive, clean, modern, flat and minimal. Zerif Lite is ecommerce (WooCommerce) Compatible, WPML, RTL, Retina-Ready, SEO Friendly and with parallax, full screen image is one of the best business themes. -Version: 1.8.5.44 +Version: 1.8.5.45 License: GNU General Public License version 3 License URI: license.txt WordPress Available: yes @@ -835,72 +835,7 @@ textarea:focus { border: 1px solid rgba(0, 0, 0, 0.3); outline: 0; } -/* Support for Contact Form 7 plugin */ -.contact-us form.wpcf7-form label, .contact-us form.wpcf7-form .wpcf7-list-item-label { - color: #fff; -} - -form.wpcf7-form p label { - display: block; - text-align: left; -} - -form.wpcf7-form p label > span { - margin-top: 5px; -} - -span.wpcf7-form-control-wrap { - display: block; -} - -.contact-us .wpcf7-list-item{ - margin: 0; - width: 100%; - text-align: left; -} - -span.wpcf7-form-control-wrap input:not([type="checkbox"]):not([type="radio"]), -span.wpcf7-form-control-wrap select{ - display: block; - width: 100%; - border-radius: 4px; - padding: 9px 9px 9px 15px; -} -span.wpcf7-form-control-wrap input[type="file"]{ - padding: 0; -} - -span.wpcf7-form-control-wrap input::placeholder { - color: #A0A0A0; -} - -span.wpcf7-form-control-wrap textarea { - color: #A0A0A0; - padding: 9px 9px 9px 15px; -} - -.contact-us form.wpcf7-form input[type="submit"] { - float: right; - margin-right: 0; -} -.pirate-forms-fields-container .form_field_wrap{ - text-align: left; -} - -.pirate-forms-file-upload-hidden.form-control { - height: auto; -} - -@media screen and (max-width: 767px) { - .pirate-forms-fields-container .form_field_wrap { - clear: both; - } -} - -.form-control { - height: auto; -} /*--------------------------------------- ** 5.0 Navigation ----- @@ -2542,18 +2477,12 @@ section#contact .pirate_forms .contact_checkbox_wrap p { } .pirate-forms-maps-custom { float: left; - text-align: left; } .contact-us .pirate-forms-maps-custom, .contact-us .contact_checkbox_wrap { color: #ffffff; } -.contact-us .pirate_forms .contact_checkbox_wrap, -.contact-us .pirateform_wrap_classes_spam_wrap { - text-align: left; -} - .zerif_hidden_if_not_customizer { display: none !important; } @@ -2634,10 +2563,57 @@ section#contact .pirate_forms .contact_checkbox_wrap p { background-size: 30px 30px; } +/****************************************************************/ +/*********************** WPFORMS Lite style ********************/ +/****************************************************************/ -/*--------------------------------------- - ** Section: About us; ----- ------------------------------------------*/ +.home div.wpforms-container-full .wpforms-form input[type=text], .home div.wpforms-container-full .wpforms-form input[type=email], .home div.wpforms-container-full .wpforms-form textarea { + border-radius: 4px; + padding: 9px 9px 9px 15px; + font-size: 14px; + background-color: rgba(255, 255, 255, 0.95); +} + +.home div.wpforms-container-full .wpforms-form .wpforms-submit-container { + text-align: right; +} + +.home div.wpforms-container-full .wpforms-form .wpforms-submit-container .wpforms-submit { + background-color: #e96656; + border-width: 0; + border-radius: 4px; + color: #fff; + font-size: 14px; + text-transform: uppercase; + padding: 13px 35px 13px 35px; +} + +.home div.wpforms-container-full .wpforms-form .wpforms-submit-container .wpforms-submit:hover { + background-color: #cb4332; + border-width: 0; + border-radius: 4px; + color: #fff; + font-size: 14px; + text-transform: uppercase; + padding: 13px 35px 13px 35px; +} + +.home .wpforms-field-label, .home .wpforms-field-description, .home .wpforms-field-sublabel, .home .wpforms-field-checkbox, .home .wpforms-field-radio, .home .wpforms-image-choices-none label { + color: rgba(255, 255, 255, 0.95); + text-align: left; +} + +.home .wpforms-field-checkbox .wpforms-image-choices, .home .wpforms-field-radio .wpforms-image-choices{ + color: #404040; +} + +.home div.wpforms-container-full .wpforms-form ul.wpforms-image-choices-classic .wpforms-selected label { + border-color: #e96656; +} + + /*--------------------------------------- + ** Section: About us; ----- + -----------------------------------------*/ .about-us { color: #fff; @@ -6743,6 +6719,10 @@ body.custom-background { .pirate-forms-g-recaptcha > div { display: inline-block; } + .pirate_forms .pirate-forms-submit-button { + display: inline-block; + text-align: center; + } .contact_submit_wrap { text-align: center; } @@ -6798,9 +6778,6 @@ body.custom-background { } } @media (max-width: 480px) { - .contact-us form.wpcf7-form input[type="submit"] { - width: 100%; - } /* HOME */ .intro { margin-top: 60%; diff --git a/ti-about-page/class-ti-about-page.php b/ti-about-page/class-ti-about-page.php index 187e296..f12037a 100644 --- a/ti-about-page/class-ti-about-page.php +++ b/ti-about-page/class-ti-about-page.php @@ -134,7 +134,7 @@ * 'deactivate_label' => esc_html__( 'Deactivate', 'flymag' ), * 'content' => array( * array( - * 'slug' => 'pirate-forms', + * 'slug' => 'wp-forms', * ), * array( * 'link' => 'http://themeisle.com/plugins/easy-content-types/', @@ -485,6 +485,8 @@ public function call_plugin_api( $slug ) { public function check_if_plugin_active( $slug ) { if ( ( $slug == 'intergeo-maps' ) || ( $slug == 'visualizer' ) ) { $plugin_root_file = 'index'; + } elseif ( $slug == 'wpforms-lite' ) { + $plugin_root_file = 'wpforms'; } elseif ( $slug == 'adblock-notify-by-bweb' ) { $plugin_root_file = 'adblock-notify'; } else { @@ -544,6 +546,8 @@ public function create_action_link( $state, $slug ) { $plugin_root_file = 'index'; } elseif ( $slug == 'adblock-notify-by-bweb' ) { $plugin_root_file = 'adblock-notify'; + } elseif ( $slug == 'wpforms-lite' ) { + $plugin_root_file = 'wpforms'; } else { $plugin_root_file = $slug; } diff --git a/ti-customizer-notify/ti-customizer-notify-section.php b/ti-customizer-notify/ti-customizer-notify-section.php index b277ee6..6a47972 100644 --- a/ti-customizer-notify/ti-customizer-notify-section.php +++ b/ti-customizer-notify/ti-customizer-notify-section.php @@ -271,7 +271,7 @@ public function json() { * Outputs the structure for the customizer control */ protected function render_template() { - ?> + ?> <# if( data.recommended_actions.length > 0 || data.recommended_plugins.length > 0 ){ #>
  • @@ -349,6 +349,6 @@ class="{{ data.recommended_plugins[action].button_class }}"
    • <# } #> -