Merge pull request #253 from MachoThemes/master

Illdy Update - 2.0.5
ColorlibHQ · Jan 8, 2018 · 57cb694 · 57cb694
2 parents 02ff05b + a1f157c
commit 57cb694
Show file tree

Hide file tree

Showing 74 changed files with 5,100 additions and 3,481 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,16 +10,17 @@ matrix:
   - php: '5.6'
   - php: '7.0'
   - php: '7.1'
-    env: SNIFF=1
-    env: DEPLOY=1
+    env:
+        - DEPLOY=1
+        - SNIFF=1
 before_script:
 - export PHPCS_DIR=/tmp/phpcs
 - export SNIFFS_DIR=/tmp/sniffs
 - if [[ "$SNIFF" == "1" ]]; then git clone -b 2.9 --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git
   $PHPCS_DIR; fi
 - if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git
   $SNIFFS_DIR; fi
-- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git
+- if [[ "$SNIFF" == "1" ]]; then git clone -b 7.1.4 --depth 1 https://github.com/wimg/PHPCompatibility.git
   $SNIFFS_DIR/PHPCompatibility; fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs --config-set installed_paths
   $SNIFFS_DIR; fi
@@ -50,10 +51,10 @@ script:
   --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/*.php;
   fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./**/**/**/**/*.php
-  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/*.php;
+  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/*.php,./inc/libraries/epsilon-framework/*.php;
   fi
 - if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n ./**/**/**/**/**/*.php
-  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/**/*.php;
+  --standard=./phpcs.ruleset.xml --extensions=php --ignore=./node_modules/**/**/**/**/*.php,./inc/libraries/epsilon-framework/**/*.php;
   fi
 notifications:
   email: false

diff --git a/404.php b/404.php
@@ -10,8 +10,8 @@
 <?php
 
 
-$page_subtitle = get_theme_mod( 'illdy_404_subtitle', esc_html__( 'OOOPS!', 'illdy' ) );
-$page_content = get_theme_mod( 'illdy_404_content', esc_html__( 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet lorem ac orci dictum sodales et eget orci. Vestibulum a laoreet dolor. Sed finibus vulputate nisl, at pulvinar nisi commodo ac. Proin placerat auctor libero. Phasellus nec suscipit mi, sed faucibus purus.', 'illdy' ) );
+$page_subtitle     = get_theme_mod( 'illdy_404_subtitle', esc_html__( 'OOOPS!', 'illdy' ) );
+$page_content      = get_theme_mod( 'illdy_404_content', esc_html__( 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet lorem ac orci dictum sodales et eget orci. Vestibulum a laoreet dolor. Sed finibus vulputate nisl, at pulvinar nisi commodo ac. Proin placerat auctor libero. Phasellus nec suscipit mi, sed faucibus purus.', 'illdy' ) );
 $page_button_label = get_theme_mod( 'illdy_404_button_label', esc_html__( 'Home', 'illdy' ) );
 
 ?>
@@ -21,12 +21,12 @@
 			<section id="blog">
 				<div class="row row-404">
 					<div class="col-md-2 text-right">
-						<span class="error-code"><?php _e( '404', 'illdy' ) ?></span>
+						<span class="error-code"><?php _e( '404', 'illdy' ); ?></span>
 					</div>
 					<div class="col-md-10">
-						<h2 class="subheading-404"><?php echo wp_kses_post( $page_subtitle ) ?></h2>
-						<div class="content-404"><?php echo wp_kses_post( $page_content ) ?></div>
-						<a href="<?php echo site_url() ?>" class="button button-404"><?php echo esc_html( $page_button_label ) ?></a>
+						<h2 class="subheading-404"><?php echo wp_kses_post( $page_subtitle ); ?></h2>
+						<div class="content-404"><?php echo wp_kses_post( $page_content ); ?></div>
+						<a href="<?php echo site_url(); ?>" class="button button-404"><?php echo esc_html( $page_button_label ); ?></a>
 					</div>
 				</div>
 			</section><!--/#blog-->

diff --git a/comments.php b/comments.php
@@ -54,10 +54,12 @@
 				</h3>
 				<ul class="comments">
 					<?php
-					wp_list_comments( array(
-						'callback'  => 'illdy_comment',
-						'max_depth' => 5,
-					) );
+					wp_list_comments(
+						array(
+							'callback'  => 'illdy_comment',
+							'max_depth' => 5,
+						)
+					);
 					?>
 				</ul><!--/.comments-->
 			</div><!--/#comments-list-->
@@ -84,8 +86,8 @@
 
 	<?php
 	$commenter = wp_get_current_commenter();
-	$req = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
+	$req       = get_option( 'require_name_email' );
+	$aria_req  = ( $req ? " aria-required='true'" : '' );
 
 	if ( '' != $commenter['comment_author'] ) {
 		$name = esc_attr( $commenter['comment_author'] );
@@ -107,8 +109,8 @@
 
 	$fields = array(
 		'author' => '<div class="row"><div class="col-sm-4"><input class="input-full" placeholder="' . __( 'Name', 'illdy' ) . '" name="author" type="text" value="' . esc_attr( $name ) . '" ' . $aria_req . ' /></div>',
-		'email' => '<div class="col-sm-4"><input class="input-full" placeholder="' . __( 'Email', 'illdy' ) . '" name="email" type="email" value="' . esc_attr( $email ) . '" ' . $aria_req . ' /></div>',
-		'url' => '<div class="col-sm-4"><input class="input-full" placeholder="' . __( 'Website', 'illdy' ) . '" name="url" type="url" value="' . esc_url( $url ) . '" /></div>',
+		'email'  => '<div class="col-sm-4"><input class="input-full" placeholder="' . __( 'Email', 'illdy' ) . '" name="email" type="email" value="' . esc_attr( $email ) . '" ' . $aria_req . ' /></div>',
+		'url'    => '<div class="col-sm-4"><input class="input-full" placeholder="' . __( 'Website', 'illdy' ) . '" name="url" type="url" value="' . esc_url( $url ) . '" /></div>',
 	);
 
 	if ( is_user_logged_in() ) {
@@ -118,13 +120,15 @@
 	}
 	?>
 	<?php
-	comment_form( array(
-		'fields' => $fields,
-		'comment_field' => $comment_textarea,
-		'id_submit' => 'input-submit',
-		'label_submit' => esc_attr__( 'Send', 'illdy' ),
-		'title_reply' => esc_attr__( 'Leave a comment', 'illdy' ),
-		'title_reply_to' => esc_attr__( 'Leave a comment to %s', 'illdy' ),
-	) );
+	comment_form(
+		array(
+			'fields'         => $fields,
+			'comment_field'  => $comment_textarea,
+			'id_submit'      => 'input-submit',
+			'label_submit'   => esc_attr__( 'Send', 'illdy' ),
+			'title_reply'    => esc_attr__( 'Leave a comment', 'illdy' ),
+			'title_reply_to' => esc_attr__( 'Leave a comment to %s', 'illdy' ),
+		)
+	);
 	?>
 </div><!--/#comments-->
diff --git a/footer.php b/footer.php
@@ -9,9 +9,9 @@
 <?php
 
 if ( current_user_can( 'edit_theme_options' ) ) {
-	$footer_copyright  = get_theme_mod( 'illdy_footer_copyright', __( '&copy; Copyright 2016. All Rights Reserved.', 'illdy' ) );
+	$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_copyright = get_theme_mod( 'illdy_footer_copyright' );
 }
 ?>
 <footer id="footer">
@@ -72,6 +72,11 @@
 		</div>
 	</div>
 </footer><!--/#footer-->
+
+<?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>
diff --git a/front-page.php b/front-page.php
@@ -11,7 +11,7 @@
 
 
 if ( get_option( 'show_on_front' ) == 'posts' ) : ?>
-	
+
 	<div class="container">
 		<div class="row">
 			<div class="col-sm-7">
@@ -37,19 +37,21 @@
 <?php
 else :
 
-	$sections_order_first_section = get_theme_mod( 'illdy_general_sections_order_first_section', 1 );
-	$sections_order_second_section = get_theme_mod( 'illdy_general_sections_order_second_section', 2 );
-	$sections_order_third_section = get_theme_mod( 'illdy_general_sections_order_third_section', 3 );
-	$sections_order_fourth_section = get_theme_mod( 'illdy_general_sections_order_fourth_section', 4 );
-	$sections_order_fifth_section = get_theme_mod( 'illdy_general_sections_order_fifth_section', 5 );
-	$sections_order_sixth_section = get_theme_mod( 'illdy_general_sections_order_sixth_section', 6 );
+	$sections_order_first_section   = get_theme_mod( 'illdy_general_sections_order_first_section', 1 );
+	$sections_order_second_section  = get_theme_mod( 'illdy_general_sections_order_second_section', 2 );
+	$sections_order_third_section   = get_theme_mod( 'illdy_general_sections_order_third_section', 3 );
+	$sections_order_fourth_section  = get_theme_mod( 'illdy_general_sections_order_fourth_section', 4 );
+	$sections_order_fifth_section   = get_theme_mod( 'illdy_general_sections_order_fifth_section', 5 );
+	$sections_order_sixth_section   = get_theme_mod( 'illdy_general_sections_order_sixth_section', 6 );
 	$sections_order_seventh_section = get_theme_mod( 'illdy_general_sections_order_seventh_section', 7 );
-	$sections_order_eighth_section = get_theme_mod( 'illdy_general_sections_order_eighth_section', 8 );
+	$sections_order_eighth_section  = get_theme_mod( 'illdy_general_sections_order_eighth_section', 8 );
 
 	if ( have_posts() ) :
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 			$static_page_content = get_the_content();
-			if ( '' != $static_page_content ) : ?>
+			if ( '' != $static_page_content ) :
+			?>
 				<section class="front-page-section" id="static-page-content">
 					<div class="section-header">
 						<div class="container">