Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions content-frontpage.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
endif;

$contactus_subtitle_default = '';
if ( ! defined( 'PIRATE_FORMS_VERSION' ) ) {
if ( ! defined( 'WPFORMS_PLUGIN_DIR' ) ) {
/* translators: Pirate Forms plugin install link */
$contactus_subtitle_default = sprintf( __( 'You need to install %s to create a contact form.', 'zerif-lite' ), sprintf( '<a href="%1$s" class="zerif-default-links">%2$s</a>', esc_url( wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=pirate-forms' ), 'install-plugin_pirate-forms' ) ), 'Pirate Forms' ) );
$contactus_subtitle_default = sprintf( __( 'You need to install %s to create a contact form.', 'zerif-lite' ), sprintf( '<a href="%1$s" class="zerif-default-links">%2$s</a>', esc_url( wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=wpforms-lite' ), 'install-plugin_wpforms-lite' ) ), 'WPForms' ) );
}

if ( current_user_can( 'edit_theme_options' ) ) {
Expand Down
39 changes: 23 additions & 16 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function zerif_load_sdk( $products ) {
}


define( 'ZERIF_LITE_VERSION', '1.8.5.46' );
define( 'ZERIF_LITE_VERSION', '1.8.5.47' );



Expand Down Expand Up @@ -91,8 +91,10 @@ function zerif_setup() {
$zerif_default_image = get_template_directory_uri() . '/images/bg.jpg';
}
add_theme_support(
'custom-background', apply_filters(
'zerif_custom_background_args', array(
'custom-background',
apply_filters(
'zerif_custom_background_args',
array(
'default-color' => 'ffffff',
'default-image' => $zerif_default_image,
)
Expand All @@ -101,7 +103,8 @@ function zerif_setup() {

/* Enable support for HTML5 markup. */
add_theme_support(
'html5', array(
'html5',
array(
'comment-list',
'search-form',
'comment-form',
Expand All @@ -114,7 +117,8 @@ function zerif_setup() {

/* Enable support for custom logo */
add_theme_support(
'custom-logo', array(
'custom-logo',
array(
'flex-width' => true,
)
);
Expand Down Expand Up @@ -445,12 +449,12 @@ function zerif_setup() {
'plugin_slug' => 'themeisle-companion',
'id' => 'themeisle-companion',
),
'pirate-forms' => array(
'title' => 'Pirate Forms',
'wpforms-lite' => array(
'title' => 'WPForms',
'description' => __( 'Makes your contact page more engaging by creating a good-looking contact form on your website. The interaction with your visitors was never easier.', 'zerif-lite' ),
'check' => defined( 'PIRATE_FORMS_VERSION' ),
'plugin_slug' => 'pirate-forms',
'id' => 'pirate-forms',
'plugin_slug' => 'wpforms-lite',
'id' => 'wpforms-lite',
),

),
Expand Down Expand Up @@ -672,11 +676,13 @@ function zerif_scripts() {
wp_enqueue_style( 'zerif_font', zerif_slug_fonts_url(), array(), null );

wp_enqueue_style(
'zerif_font_all', add_query_arg(
'zerif_font_all',
add_query_arg(
array(
'family' => urlencode( 'Open Sans:300,300italic,400,400italic,600,600italic,700,700italic,800,800italic' ),
'subset' => urlencode( 'latin' ),
), '//fonts.googleapis.com/css'
),
'//fonts.googleapis.com/css'
)
);

Expand Down Expand Up @@ -795,8 +801,8 @@ function zerif_register_required_plugins() {
'required' => false,
),
array(
'name' => 'Pirate Forms',
'slug' => 'pirate-forms',
'name' => 'WPForms',
'slug' => 'wpforms-lite',
'required' => false,
),
array(
Expand All @@ -810,8 +816,8 @@ function zerif_register_required_plugins() {

$plugins = array(
array(
'name' => 'Pirate Forms',
'slug' => 'pirate-forms',
'name' => 'WPForms',
'slug' => 'wpforms-lite',
'required' => false,
),
array(
Expand Down Expand Up @@ -1943,7 +1949,8 @@ function zerif_starter_content() {
* Starter Content Support
*/
add_theme_support(
'starter-content', array(
'starter-content',
array(
// Twenty Seventeen
'posts' => array(
'home',
Expand Down
8 changes: 6 additions & 2 deletions inc/admin/welcome-screen/welcome-screen.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ public function zerif_lite_welcome_style_and_scripts( $hook_suffix ) {
endif;

wp_localize_script(
'zerif-lite-welcome-screen-js', 'zerifLiteWelcomeScreenObject', array(
'zerif-lite-welcome-screen-js',
'zerifLiteWelcomeScreenObject',
array(
'nr_actions_required' => $nr_actions_required,
'ajaxurl' => admin_url( 'admin-ajax.php' ),
'template_directory' => get_template_directory_uri(),
Expand Down Expand Up @@ -149,7 +151,9 @@ public function zerif_lite_welcome_scripts_for_customizer() {
endif;

wp_localize_script(
'zerif-lite-welcome-screen-customizer-js', 'zerifLiteWelcomeScreenCustomizerObject', array(
'zerif-lite-welcome-screen-customizer-js',
'zerifLiteWelcomeScreenCustomizerObject',
array(
'nr_actions_required' => $nr_actions_required,
'aboutpage' => esc_url( admin_url( 'themes.php?page=zerif-lite-welcome#actions_required' ) ),
'customizerpage' => esc_url( admin_url( 'customize.php#actions_required' ) ),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ public function sections( $manager ) {
// Main Documentation Link In Customizer Root.
$manager->add_section(
new Zerif_Customizer_Theme_Info_Main(
$manager, 'zerif-theme-info', array(
$manager,
'zerif-theme-info',
array(
'theme_info_title' => __( 'Zerif Lite', 'zerif-lite' ),
'label_url' => esc_url( 'http://docs.themeisle.com/article/5-zerif-lite-documentation' ),
'label_text' => __( 'Documentation', 'zerif-lite' ),
Expand All @@ -88,7 +90,9 @@ public function sections( $manager ) {
// Frontpage Sections Upsell.
$manager->add_section(
new Zerif_Customizer_Upsell_Section(
$manager, 'zerif-upsell-frontpage-sections', array(
$manager,
'zerif-upsell-frontpage-sections',
array(
'panel' => 'zerif_frontpage_sections_panel',
'priority' => 500,
'options' => array(
Expand Down
9 changes: 6 additions & 3 deletions inc/customizer-info/class/class-zerif-customize-upsell.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public function sections( $manager ) {

$manager->add_section(
new Zerif_Customizer_Upsell_Pro(
$manager, 'zerif-upsell-pro',
$manager,
'zerif-upsell-pro',
array(
'upsell_title' => __( 'View PRO version', 'zerif-lite' ),
'label_url' => 'https://themeisle.com/themes/zerif-pro-one-page-wordpress-theme/upgrade/',
Expand All @@ -76,7 +77,8 @@ public function sections( $manager ) {

$manager->add_section(
new Zerif_Customizer_Upsell_Features(
$manager, 'zerif-upsell-features-1',
$manager,
'zerif-upsell-features-1',
array(
'upsell_text' => sprintf( '<a href="' . esc_url( 'http://themeisle.com/themes/zerif-pro-one-page-wordpress-theme/' ) . '" target="_blank">%s</a>', __( 'View PRO version', 'zerif-lite' ) ) . '. ' . __( 'It adds a background video and a background slider.', 'zerif-lite' ),
'panel' => 'panel_big_title',
Expand All @@ -87,7 +89,8 @@ public function sections( $manager ) {

$manager->add_section(
new Zerif_Customizer_Upsell_Features(
$manager, 'zerif-upsell-features-2',
$manager,
'zerif-upsell-features-2',
array(
'upsell_text' => sprintf( '<a href="' . esc_url( 'https://themeisle.com/themes/zerif-pro-one-page-wordpress-theme/upgrade/' ) . '" target="_blank">%s</a>', __( 'View PRO version', 'zerif-lite' ) ) . '. ' . __( 'It adds 5 new sections, the ability to re-order existing ones and easily add custom content to frontpage.', 'zerif-lite' ),
'panel' => 'panel_general',
Expand Down
Loading