Merge pull request #159 from Codeinwp/development

NEW Blog and single layout
Display the sidebar on mobile, if the option to show the sidebar is selected
Added grunt + fixed all generated issues

.distignore

@@ -0,0 +1,12 @@
+.git
+.distignore
+.gitignore
+.travis.yml
+.jshintrc
+Gruntfile.js
+grunt
+phpcs.xml
+node_modules
+logs
+package.json
+npm-debug.log

.gitignore

@@ -0,0 +1,8 @@
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+node_modules
+logs
+npm-debug.log

.jshintrc

@@ -0,0 +1,23 @@
+{
+  "boss": true,
+  "curly": true,
+  "eqeqeq": true,
+  "eqnull": true,
+  "expr": true,
+  "immed": true,
+  "noarg": true,
+  "nonbsp": true,
+  "onevar": true,
+  "quotmark": "single",
+  "trailing": true,
+  "undef": true,
+  "unused": true,
+  "browser": true,
+  "globals": {
+    "_": false,
+    "Backbone": false,
+    "jQuery": false,
+    "JSON": false,
+    "wp": false
+  }
+}

.travis.yml

@@ -1,104 +1,45 @@
-# Travis CI configuration file.
-# @link https://travis-ci.org/
-
-
-# Declare project language and PHP versions to test against.
-# @link http://about.travis-ci.org/docs/user/languages/php/
 language: php
 
-matrix:
-    fast_finish: true
-
-    include:
-        # Current $required_php_version for WordPress: 5.2.4
-        # aliased to 5.2.17
-        - php: '5.2'
-        # aliased to a recent 5.6.x version
-        - php: '5.6'
-        # aliased to a recent 7.x version
-        - php: '7.0'
-        # aliased to a recent hhvm version
-        - php: 'hhvm'
-    allow_failures:
-        - php: 'hhvm'
-
-# Ditch sudo and use containers.
-# @link http://docs.travis-ci.com/user/migrating-from-legacy/#Why-migrate-to-container-based-infrastructure%3F
-# @link http://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure
+##  PHP versions to test  against
+php:
+    - "7.0"
+    - "5.6"
+    - "5.5"
+    - "5.4"
+    - "5.3"
+    - "5.2"
 sudo: false
-
-# Declare which versions of WordPress to test against.
-# Also declare whether or not to test in Multisite.
 env:
-    # Trunk (current version in development is 4.4)
-    # @link https://github.com/WordPress/WordPress
     - WP_VERSION=master WP_MULTISITE=0
-
-# Use this to prepare your build for testing.
-# e.g. copy database configurations, environment variables, etc.
-# Failures in this section will result in build status 'errored'.
+install:
+  - . $HOME/.nvm/nvm.sh
+  - nvm install stable
+  - nvm use stable
+  - npm install
+  - npm install grunt-cli -g
 before_script:
-    # Set up WordPress installation.
+    ## Install the wordpress latest version
     - export WP_DEVELOP_DIR=/tmp/wordpress/
     - mkdir -p $WP_DEVELOP_DIR
-    # Use the Git mirror of WordPress.
     - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
-    # Set up theme information.
     - theme_slug=$(basename $(pwd))
     - theme_dir=$WP_DEVELOP_DIR/src/wp-content/themes/$theme_slug
     - cd ..
     - mv $theme_slug $theme_dir
-    # Set up WordPress configuration.
     - cd $WP_DEVELOP_DIR
-    - echo $WP_DEVELOP_DIR
     - cp wp-tests-config-sample.php wp-tests-config.php
     - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
     - sed -i "s/yourusernamehere/root/" wp-tests-config.php
     - sed -i "s/yourpasswordhere//" wp-tests-config.php
-    # Create WordPress database.
     - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
-    # Install CodeSniffer for WordPress Coding Standards checks.
-    - mkdir php-codesniffer && curl -L https://github.com/squizlabs/PHP_CodeSniffer/archive/master.tar.gz | tar xz --strip-components=1 -C php-codesniffer
-    # Install WordPress Coding Standards.
+
+     ## install PHPCS and Wordpress standards
+    - pear install pear/PHP_CodeSniffer
     - mkdir wordpress-coding-standards && curl -L https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/archive/master.tar.gz | tar xz --strip-components=1 -C wordpress-coding-standards
-    # Hop into CodeSniffer directory.
-    - cd php-codesniffer
-    # Set install path for WordPress Coding Standards
-    # @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941
-    - scripts/phpcs --config-set installed_paths ../wordpress-coding-standards
-    # Hop into themes directory.
-    - cd $theme_dir
-    # After CodeSniffer install you should refresh your path.
     - phpenv rehash
-    # Install JSCS: JavaScript Code Style checker
-    # @link http://jscs.info/
-    - npm install -g jscs
-    # Install JSHint, a JavaScript Code Quality Tool
-    # @link http://jshint.com/docs/
-    - npm install -g jshint
-    - wget https://develop.svn.wordpress.org/trunk/.jshintrc
+    - phpcs --config-set installed_paths $WP_DEVELOP_DIR/wordpress-coding-standards
+    - phpenv rehash
+    - cd $theme_dir
 
-# Run test script commands.
-# Default is specific to project language.
-# All commands must exit with code 0 on success. Anything else is considered failure.
 script:
-    # Search theme for PHP syntax errors.
-    - find . \( -name '*.php' \) -exec php -lf {} \;
-    # Run the theme through JSHint
-    - jshint .
-    # WordPress Coding Standards
-    - jscs .
-    # @link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
-    # @link http://pear.php.net/package/PHP_CodeSniffer/
-    # -p flag: Show progress of the run.
-    # -s flag: Show sniff codes in all reports.
-    # -v flag: Print verbose output.
-    # -n flag: Do not print warnings (shortcut for --warning-severity=0)
-    # --standard: Use WordPress as the standard.
-    # --extensions: Only sniff PHP files.
-    - $WP_DEVELOP_DIR/php-codesniffer/scripts/phpcs -p -s -v -n . --standard=./codesniffer.ruleset.xml --extensions=php
-
-# Receive notifications for build results.
-# @link http://docs.travis-ci.com/user/notifications/#Email-notifications
-notifications:
-    email: false
+     grunt travis

Gruntfile.js

@@ -0,0 +1,15 @@
+// jshint node:true
+
+module.exports = function( grunt ) {
+    'use strict';
+
+    var loader = require( 'load-project-config' ),
+        config = require( 'grunt-theme-fleet' );
+    config = config();
+    config.files.php.push( '!inc/admin/**/*.php' );
+    config.files.js.push( '!inc/admin/**/*.js' );
+    config.files.js.push( '!js/bootstrap.js' );
+    config.files.js.push( '!js/bootstrap.min.js' );
+    config.files.js.push( '!js/skip-link-focus-fix.js' );
+    loader( grunt, config ).init();
+};

archive.php

@@ -25,7 +25,7 @@
 
 		<div class="content-wrap">
 
-			<div id="primary" class="content-area content-area-arch<?php echo $zillah_sidebar_show !== false ? " content-area-with-sidebar" : ""; ?>">
+			<div id="primary" class="content-area content-area-arch<?php echo $zillah_sidebar_show !== false ? ' content-area-with-sidebar' : ''; ?>">
 				<main id="main" class="site-main" role="main">
 					<?php zillah_hook_archive_top(); ?>
 
@@ -58,9 +58,9 @@
 			</div><!-- #primary -->
 
 			<?php
-				if ( $zillah_sidebar_show !== false || ( $zillah_sidebar_show === false && is_customize_preview() ) ) {
-					get_sidebar();
-				}
+			if ( $zillah_sidebar_show !== false || ( $zillah_sidebar_show === false && is_customize_preview() ) ) {
+				get_sidebar();
+			}
 			?>
 
 		</div><!-- .content-wrap -->

comments.php

@@ -28,11 +28,24 @@
 	if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
+			$comments_number = get_comments_number();
+			if ( 1 === $comments_number ) {
+				/* translators: %s: post title */
+				printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'zillah' ), '<span>' . get_the_title() . '</span>' );
+			} else {
 				printf(
-					esc_html( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'zillah' ) ),
-					number_format_i18n( get_comments_number() ),
+					/* translators: 1: number of comments, 2: post title */
+					_nx(
+						'%1$s thought on &ldquo;%2$s&rdquo;',
+						'%1$s thoughts on &ldquo;%2$s&rdquo;',
+						$comments_number,
+						'comments title',
+						'zillah'
+					),
+					number_format_i18n( $comments_number ),
 					'<span>' . get_the_title() . '</span>'
 				);
+			}
 			?>
 		</h2>
 
@@ -53,7 +66,7 @@
 				wp_list_comments( array(
 					'style'      	=> 'ol',
 					'short_ping' 	=> true,
-					'avatar_size' 	=> 105
+					'avatar_size' 	=> 105,
 				) );
 			?>
 		</ol><!-- .comment-list -->
@@ -86,4 +99,4 @@
 
 	<?php zillah_hook_comments_bottom(); ?>
 </div><!-- #comments -->
-<?php zillah_hook_comments_after(); ?>
+<?php zillah_hook_comments_after(); ?>