Merge pull request #410 from Codeinwp/development

Make contact form on contact page full width when the page content is empty
Fixed issue with large menus loading slowly in header
Improved code
Make About section full width when no image is selected
Add an improved icon picker in customizer

Author: rodica-andronache

content-contact.php

@@ -17,17 +17,21 @@
 
 			<?php
 				$parallax_one_contact_form_shortcode = get_theme_mod('parallax_one_contact_form_shortcode');
+
+				$contact_column = empty($parallax_one_contact_form_shortcode) || $post->post_content === "" ? "col-md-12" : "col-md-6";
+
+				if( $post->post_content !== "" ):
+					echo '<div class="' . $contact_column . '">';
+						the_content();
+					echo '</div>';
+				endif;
+
+				if(!empty($parallax_one_contact_form_shortcode)) {
+					echo '<div class="' . $contact_column . '">';
+					echo do_shortcode( $parallax_one_contact_form_shortcode);
+					echo '</div>';
+				}
 			?>
-			<div class="col-md-6">
-				<?php the_content(); ?>
-			</div>
-				<?php 
-					if(!empty($parallax_one_contact_form_shortcode)) {
-						echo '<div class="col-md-6">';
-						echo do_shortcode( $parallax_one_contact_form_shortcode);
-						echo '</div>';
-					}
-				?>
 
 			<footer class="entry-footer">
 				<?php edit_post_link( esc_html__( 'Edit', 'parallax-one' ), '<span class="edit-link">', '</span>' ); ?>

css/admin-style.css

@@ -45,13 +45,12 @@
 
 		<div class="footer-bottom-wrap">
 			<?php
-			global $wp_customize;
 			$paralax_one_copyright = get_theme_mod('parallax_one_copyright','Themeisle');
 
 			if( !empty($paralax_one_copyright) ){ ?>
 				<span class="parallax_one_copyright_content"><?php echo esc_attr($paralax_one_copyright); ?></span>
 			<?php	
-			} elseif ( isset( $wp_customize )   ) { ?>
+			} elseif ( is_customize_preview() ) { ?>
 				<span class="parallax_one_copyright_content paralax_one_only_customizer"></span>
 			<?php
 			} ?>

footer.php

@@ -186,9 +186,9 @@ function parallax_one_wp_page_menu()
 
 
 function parallax_one_customizer_scripts(){
-	wp_register_script( 'parallax_ddslick', get_template_directory_uri() .'/js/jquery.ddslick.js', array("jquery"), '1.0.0');
 
-	wp_enqueue_script( 'parallax_one_customizer_script', parallax_get_file('/js/parallax_one_customizer.js'), array("jquery","jquery-ui-draggable","parallax_ddslick"),'1.0.2', true  );
+
+	wp_enqueue_script( 'parallax_one_customizer_script', parallax_get_file('/js/parallax_one_customizer.js'), array("jquery","jquery-ui-draggable"),'1.0.2', true  );
 
 	wp_localize_script( 'parallax_one_customizer_script', 'parallaxOneCustomizerObject', array(
 

functions.php

@@ -33,9 +33,7 @@
     ============================== -->
 	<?php
 
-	 global $wp_customize;
-
-	 if(is_front_page() && !isset( $wp_customize ) && get_option( 'show_on_front' ) != 'page' ):
+	 if(is_front_page() && !is_customize_preview() && get_option( 'show_on_front' ) != 'page' ):
 
 		$parallax_one_disable_preloader = get_theme_mod('paralax_one_disable_preloader');
 
@@ -119,7 +117,7 @@
 
 							else:
 
-								if( isset( $wp_customize ) ):
+								if( is_customize_preview() ):
 
 									echo '<a href="'.esc_url( home_url( '/' ) ).'" class="navbar-brand paralax_one_only_customizer" title="'.get_bloginfo('title').'">';
 

header.php

@@ -0,0 +1,9 @@
+( function( $ ) {
+
+	$( function() {
+		$( '.icp' ).iconpicker().on( 'iconpickerUpdated', function() {
+			$( this ).trigger( 'change' );
+		} );
+	} );
+
+} )( jQuery );