Merge pull request #271 from MachoThemes/master

2.1.0 update
ColorlibHQ · May 8, 2018 · 0a7189a · 0a7189a
2 parents 68ee489 + 2532c22
commit 0a7189a
Show file tree

Hide file tree

Showing 47 changed files with 14,065 additions and 3,846 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 sudo: false
 language: php
-dist: precise
+dist: trusty
 matrix:
   fast_finish: true
   include:
-  - php: '5.3'
   - php: '5.4'
   - php: '5.5'
   - php: '5.6'

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+### V 2.1.0
+- updated grunt package.json
+- Fixed #256 (videos in project section, they need an image backup)
+- Updated FancyBox to latest version
+- Added Colorlib Login Customizer as recommended plugin
+- Fixes #267 (add option to hide footer widget area || footer copyright message area)
+
 ### V 2.0.4
 	- Fixed Customizer issue ( https://github.com/puikinsh/illdy/issues/230 )
 

diff --git a/footer.php b/footer.php
@@ -8,61 +8,69 @@
 ?>
 <?php
 
+$show_footer           = get_theme_mod( 'illdy_show_footer', 1 );
+$show_footer_copyright = get_theme_mod( 'illdy_show_footer_copyright', 1 );
+
 if ( current_user_can( 'edit_theme_options' ) ) {
 	$footer_copyright = get_theme_mod( 'illdy_footer_copyright', sprintf( __( '&copy; Copyright %s. All Rights Reserved.', 'illdy' ), date( 'Y' ) ) );
 } else {
 	$footer_copyright = get_theme_mod( 'illdy_footer_copyright' );
 }
 ?>
-<footer id="footer">
-	<div class="container">
-		<div class="row">
-			<?php
-			$the_widget_args = array(
-				'before_widget' => '<div class="widget">',
-				'after_widget'  => '</div>',
-				'before_title'  => '<div class="widget-title"><h5>',
-				'after_title'   => '</h5></div>',
-			);
-			?>
-			<div class="col-md-3 col-sm-6 col-xs-12">
-				<?php
-				if ( is_active_sidebar( 'footer-sidebar-1' ) ) :
-					dynamic_sidebar( 'footer-sidebar-1' );
-				elseif ( current_user_can( 'edit_theme_options' ) ) :
-					the_widget( 'WP_Widget_Text', 'title=' . __( 'Products', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Our work', 'illdy' ) . '">' . __( 'Our work', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Club', 'illdy' ) . '">' . __( 'Club', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'News', 'illdy' ) . '">' . __( 'News', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Announcement', 'illdy' ) . '">' . __( 'Announcement', 'illdy' ) . '</a></li></ul>', $the_widget_args );
-				endif;
-				?>
-			</div><!--/.col-sm-3-->
-			<div class="col-md-3 col-sm-6 col-xs-12">
-				<?php
-				if ( is_active_sidebar( 'footer-sidebar-2' ) ) :
-					dynamic_sidebar( 'footer-sidebar-2' );
-				elseif ( current_user_can( 'edit_theme_options' ) ) :
-					the_widget( 'WP_Widget_Text', 'title=' . __( 'Information', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Pricing', 'illdy' ) . '">' . __( 'Pricing', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Terms', 'illdy' ) . '">' . __( 'Terms', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Affiliates', 'illdy' ) . '">' . __( 'Affiliates', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Blog', 'illdy' ) . '">' . __( 'Blog', 'illdy' ) . '</a></li></ul>', $the_widget_args );
-				endif;
-				?>
-			</div><!--/.col-sm-3-->
-			<div class="col-md-3 col-sm-6 col-xs-12">
-				<?php
-				if ( is_active_sidebar( 'footer-sidebar-3' ) ) :
-					dynamic_sidebar( 'footer-sidebar-3' );
-				elseif ( current_user_can( 'edit_theme_options' ) ) :
-					the_widget( 'WP_Widget_Text', 'title=' . __( 'Support', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Documentation', 'illdy' ) . '">' . __( 'Documentation', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'FAQs', 'illdy' ) . '">' . __( 'FAQs', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Forums', 'illdy' ) . '">' . __( 'Forums', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Contact', 'illdy' ) . '">' . __( 'Contact', 'illdy' ) . '</a></li></ul>', $the_widget_args );
-				endif;
-				?>
-			</div><!--/.col-sm-3-->
-			<div class="col-md-3 col-sm-6 col-xs-12">
+<?php if ( 1 == $show_footer ) { ?>
+	<footer id="footer">
+		<div class="container">
+			<div class="row">
 				<?php
-				if ( is_active_sidebar( 'footer-sidebar-4' ) ) :
-					dynamic_sidebar( 'footer-sidebar-4' );
-				elseif ( current_user_can( 'edit_theme_options' ) ) :
-					the_widget( 'WP_Widget_Text', 'title=' . __( 'Support', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Documentation', 'illdy' ) . '">' . __( 'Documentation', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'FAQs', 'illdy' ) . '">' . __( 'FAQs', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Forums', 'illdy' ) . '">' . __( 'Forums', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Contact', 'illdy' ) . '">' . __( 'Contact', 'illdy' ) . '</a></li></ul>', $the_widget_args );
-				endif;
+				$the_widget_args = array(
+					'before_widget' => '<div class="widget">',
+					'after_widget'  => '</div>',
+					'before_title'  => '<div class="widget-title"><h5>',
+					'after_title'   => '</h5></div>',
+				);
 				?>
-			</div><!--/.col-sm-3-->
-		</div><!--/.row-->
-	</div><!--/.container-->
+				<div class="col-md-3 col-sm-6 col-xs-12">
+					<?php
+					if ( is_active_sidebar( 'footer-sidebar-1' ) ) :
+						dynamic_sidebar( 'footer-sidebar-1' );
+					elseif ( current_user_can( 'edit_theme_options' ) ) :
+						the_widget( 'WP_Widget_Text', 'title=' . __( 'Products', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Our work', 'illdy' ) . '">' . __( 'Our work', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Club', 'illdy' ) . '">' . __( 'Club', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'News', 'illdy' ) . '">' . __( 'News', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Announcement', 'illdy' ) . '">' . __( 'Announcement', 'illdy' ) . '</a></li></ul>', $the_widget_args );
+					endif;
+					?>
+				</div><!--/.col-sm-3-->
+				<div class="col-md-3 col-sm-6 col-xs-12">
+					<?php
+					if ( is_active_sidebar( 'footer-sidebar-2' ) ) :
+						dynamic_sidebar( 'footer-sidebar-2' );
+					elseif ( current_user_can( 'edit_theme_options' ) ) :
+						the_widget( 'WP_Widget_Text', 'title=' . __( 'Information', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Pricing', 'illdy' ) . '">' . __( 'Pricing', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Terms', 'illdy' ) . '">' . __( 'Terms', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Affiliates', 'illdy' ) . '">' . __( 'Affiliates', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Blog', 'illdy' ) . '">' . __( 'Blog', 'illdy' ) . '</a></li></ul>', $the_widget_args );
+					endif;
+					?>
+				</div><!--/.col-sm-3-->
+				<div class="col-md-3 col-sm-6 col-xs-12">
+					<?php
+					if ( is_active_sidebar( 'footer-sidebar-3' ) ) :
+						dynamic_sidebar( 'footer-sidebar-3' );
+					elseif ( current_user_can( 'edit_theme_options' ) ) :
+						the_widget( 'WP_Widget_Text', 'title=' . __( 'Support', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Documentation', 'illdy' ) . '">' . __( 'Documentation', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'FAQs', 'illdy' ) . '">' . __( 'FAQs', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Forums', 'illdy' ) . '">' . __( 'Forums', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Contact', 'illdy' ) . '">' . __( 'Contact', 'illdy' ) . '</a></li></ul>', $the_widget_args );
+					endif;
+					?>
+				</div><!--/.col-sm-3-->
+				<div class="col-md-3 col-sm-6 col-xs-12">
+					<?php
+					if ( is_active_sidebar( 'footer-sidebar-4' ) ) :
+						dynamic_sidebar( 'footer-sidebar-4' );
+					elseif ( current_user_can( 'edit_theme_options' ) ) :
+						the_widget( 'WP_Widget_Text', 'title=' . __( 'Support', 'illdy' ) . '&text=<ul><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Documentation', 'illdy' ) . '">' . __( 'Documentation', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'FAQs', 'illdy' ) . '">' . __( 'FAQs', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Forums', 'illdy' ) . '">' . __( 'Forums', 'illdy' ) . '</a></li><li><a href="' . esc_url( '#' ) . '" title="' . __( 'Contact', 'illdy' ) . '">' . __( 'Contact', 'illdy' ) . '</a></li></ul>', $the_widget_args );
+					endif;
+					?>
+				</div><!--/.col-sm-3-->
+			</div><!--/.row-->
+		</div><!--/.container-->
+	</footer>
+<?php } ?>
+
+<?php if ( 1 == $show_footer_copyright ) { ?>
 	<div class="bottom-footer">
 		<div class="container">
 			<p class="copyright">
@@ -71,12 +79,11 @@
 			</p>
 		</div>
 	</div>
-</footer><!--/#footer-->
+<?php } ?>
 
 <?php if ( 'page' == get_option( 'show_on_front' ) && is_front_page() && get_theme_mod( 'illdy_go_to_top', false ) ) : ?>
 	<a href="#" class="illdy-top"><i class="fa fa-angle-up" aria-hidden="true"></i></a>
 <?php endif ?>
 
 <?php wp_footer(); ?>
-</body>
-</html>
+</body></html>
diff --git a/functions.php b/functions.php
@@ -163,7 +163,7 @@ function illdy_enqueue_stylesheets() {
 		wp_enqueue_style( 'font-awesome', get_template_directory_uri() . '/layout/css/font-awesome.min.css', array(), '4.5.0', 'all' );
 		wp_enqueue_style( 'owl-carousel', get_template_directory_uri() . '/layout/css/owl-carousel.min.css', array(), '2.0.0', 'all' );
 		if ( get_theme_mod( 'illdy_projects_lightbox', 0 ) == 1 ) {
-			wp_enqueue_style( 'illdy-fancybox', get_template_directory_uri() . '/layout/css/jquery.fancybox.css', array(), '', 'all' );
+			wp_enqueue_style( 'illdy-fancybox', get_template_directory_uri() . '/layout/css/jquery-fancybox.min.css', array(), '3.3.5', 'all' );
 		}
 		wp_enqueue_style( 'illdy-main', get_template_directory_uri() . '/layout/css/main.css', array(), '', 'all' );
 		if ( get_theme_mod( 'illdy_sticky_header_enable', false ) ) {
@@ -200,7 +200,7 @@ function illdy_enqueue_javascripts() {
 		wp_enqueue_script( 'illdy-count-to', get_template_directory_uri() . '/layout/js/count-to/count-to.min.js', array( 'jquery' ), '', true );
 		wp_enqueue_script( 'illdy-visible', get_template_directory_uri() . '/layout/js/visible/visible.min.js', array( 'jquery' ), '', true );
 		if ( get_theme_mod( 'illdy_projects_lightbox', 0 ) == 1 ) {
-			wp_enqueue_script( 'illdy-fancybox', get_template_directory_uri() . '/layout/js/fancybox/jquery.fancybox.js', array( 'jquery' ), '', true );
+			wp_enqueue_script( 'illdy-fancybox', get_template_directory_uri() . '/layout/js/fancybox/jquery.fancybox.min.js', array( 'jquery' ), '3.3.5', true );
 			wp_add_inline_script( 'illdy-fancybox', 'jQuery(".fancybox").fancybox();' );
 		}
 		if ( get_theme_mod( 'illdy_sticky_header_enable', false ) ) {

diff --git a/inc/class-illdy.php b/inc/class-illdy.php
@@ -4,16 +4,19 @@
 class Illdy {
 
 	public $recommended_plugins = array(
-		'kiwi-social-share'        => array(
+		'kiwi-social-share'         => array(
 			'recommended' => true,
 		),
-		'contact-form-7'           => array(
+		'contact-form-7'            => array(
 			'recommended' => false,
 		),
-		'simple-custom-post-order' => array(
+		'simple-custom-post-order'  => array(
 			'recommended' => false,
 		),
-		'fancybox-for-wordpress'   => array(
+		'fancybox-for-wordpress'    => array(
+			'recommended' => false,
+		),
+		'colorlib-login-customizer' => array(
 			'recommended' => false,
 		),
 	);

diff --git a/inc/customizer/panels/counter.php b/inc/customizer/panels/counter.php
@@ -67,10 +67,10 @@
 $wp_customize->add_control(
 	new WP_Customize_Image_Control(
 		$wp_customize, $prefix . '_counter_background_image', array(
-			'label'    => __( 'Background Image', 'illdy' ),
-			'section'  => $prefix . '_counter_general',
-			'settings' => $prefix . '_counter_background_image',
-			'priority' => 2,
+			'label'           => __( 'Background Image', 'illdy' ),
+			'section'         => $prefix . '_counter_general',
+			'settings'        => $prefix . '_counter_background_image',
+			'priority'        => 2,
 		)
 	)
 );

diff --git a/inc/customizer/panels/full-width.php b/inc/customizer/panels/full-width.php
@@ -86,7 +86,6 @@
 	new Epsilon_Control_Text_Editor(
 		$wp_customize, $prefix . '_full_width_general_entry', array(
 			'label'       => __( 'Entry', 'illdy' ),
-			'description' => __( 'Add the content for this section.', 'illdy' ),
 			'section'     => $panel_id,
 			'priority'    => 3,
 			'type'        => 'epsilon-text-editor',

diff --git a/inc/customizer/panels/general-options.php b/inc/customizer/panels/general-options.php
@@ -346,11 +346,13 @@
 );
 
 /* Footer Copyright */
+
 $wp_customize->add_setting(
 	$prefix . '_footer_copyright', array(
-		'sanitize_callback' => 'illdy_sanitize_html',
-		'default'           => sprintf( __( '&copy; Copyright %s. All Rights Reserved.', 'illdy' ), date( 'Y' ) ),
-		'transport'         => 'postMessage',
+		'sanitize_callback'       => 'illdy_sanitize_html',
+		// translators: copyright footer message
+						'default' => sprintf( __( '&copy; Copyright %s. All Rights Reserved.', 'illdy' ), date( 'Y' ) ),
+		'transport'               => 'postMessage',
 	)
 );
 
@@ -385,3 +387,48 @@
 		)
 	)
 );
+
+$wp_customize->add_setting(
+	$prefix . '_show_footer', array(
+		'sanitize_callback' => $prefix . '_value_checkbox_helper',
+		'default'           => 1,
+	)
+);
+$wp_customize->add_control(
+	new Epsilon_Control_Toggle(
+		$wp_customize, $prefix . '_show_footer', array(
+			'type'     => 'epsilon-toggle',
+			'label'    => __( 'Show footer widget area?', 'illdy' ),
+			'section'  => $prefix . '_general_footer_section',
+			'priority' => 4,
+		)
+	)
+);
+
+$wp_customize->selective_refresh->add_partial(
+	$prefix . '_show_footer', array(
+		'selector' => '#footer',
+	)
+);
+$wp_customize->add_setting(
+	$prefix . '_show_footer_copyright', array(
+		'sanitize_callback' => $prefix . '_value_checkbox_helper',
+		'default'           => 1,
+	)
+);
+$wp_customize->add_control(
+	new Epsilon_Control_Toggle(
+		$wp_customize, $prefix . '_show_footer_copyright', array(
+			'type'     => 'epsilon-toggle',
+			'label'    => __( 'Show footer copyright area?', 'illdy' ),
+			'section'  => $prefix . '_general_footer_section',
+			'priority' => 4,
+		)
+	)
+);
+
+$wp_customize->selective_refresh->add_partial(
+	$prefix . '_show_footer', array(
+		'selector' => '.bottom-footer',
+	)
+);
diff --git a/inc/libraries/epsilon-framework b/inc/libraries/epsilon-framework
diff --git a/inc/libraries/welcome-screen/css/welcome.css b/inc/libraries/welcome-screen/css/welcome.css
@@ -461,3 +461,7 @@
 .import-content-container {
     display: none;
 }
+
+.epsilon-framework-notice .epsilon-author-logo {
+	max-width: 100px;
+}
diff --git a/layout/.DS_Store b/layout/.DS_Store
diff --git a/layout/css/.DS_Store b/layout/css/.DS_Store
diff --git a/layout/css/bootstrap-theme.min.css b/layout/css/bootstrap-theme.min.css
diff --git a/layout/css/bootstrap.min.css b/layout/css/bootstrap.min.css
diff --git a/layout/css/custom.min.css b/layout/css/custom.min.css
diff --git a/layout/css/font-awesome.min.css b/layout/css/font-awesome.min.css