diff --git a/.travis.yml b/.travis.yml index 1f7529664..f9308d57f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -# Travis CI (MIT License) configuration file for the FoundationPress WordPress theme +# Travis CI (MIT License) configuration file for the FoundationPress WordPress theme. # @link https://travis-ci.org/ -# For use with the FoundationPress WordPress theme -# @link https://github.com/olefredrik/FoundationPress +# For use with the FoundationPress WordPress theme. +# @link https://github.com/olefredrik/foundationpress # Declare project language. # @link http://about.travis-ci.org/docs/user/languages/php/ @@ -10,38 +10,41 @@ language: php # Declare versions of PHP to use. Use one decimal max. php: - # aliased to a recent 5.5.x version - - "5.5" - # aliased to a recent 5.4.x version - - "5.4" - # aliased to a recent 5.3.x version - - "5.3" - # Current $required_php_version for WordPress: 5.2.4 - - "5.2" + # aliased to a recent 5.5.x version + - "5.5" + # aliased to a recent 5.4.x version + - "5.4" + # aliased to a recent 5.3.x version + - "5.3" + # Current $required_php_version for WordPress: 5.2.4 + - "5.2" # Declare which versions of WordPress to test against. # Also declare whether or not to test in Multisite. env: - # Trunk - # @link https://github.com/WordPress/WordPress - - WP_VERSION=master WP_MULTISITE=0 - # WordPress 4.1 - # @link https://github.com/WordPress/WordPress/tree/4.1-branch - - WP_VERSION=4.1 WP_MULTISITE=0 - # WordPress 4.0 - # @link https://github.com/WordPress/WordPress/tree/4.0-branch - - WP_VERSION=4.0 WP_MULTISITE=0 + # Trunk + # @link https://github.com/WordPress/WordPress + - WP_VERSION=master WP_MULTISITE=0 + - WP_VERSION=master WP_MULTISITE=1 + # WordPress 4.2 + # @link https://github.com/WordPress/WordPress/tree/4.2-branch + - WP_VERSION=4.2 WP_MULTISITE=0 + - WP_VERSION=4.2 WP_MULTISITE=1 + # WordPress 4.1 + # @link https://github.com/WordPress/WordPress/tree/4.1-branch + - WP_VERSION=4.1 WP_MULTISITE=0 + - WP_VERSION=4.1 WP_MULTISITE=1 # Declare 5.6 beta in test matrix. # @link https://buddypress.trac.wordpress.org/ticket/5620 # @link http://docs.travis-ci.com/user/build-configuration/ matrix: - include: - - php: 5.6 - env: WP_VERSION=master - allow_failures: - - php: 5.6 - fast_finish: true + include: + - php: 5.6 + env: WP_VERSION=master + allow_failures: + - php: 5.6 + fast_finish: true # Use this to prepare the system to install prerequisites or dependencies. # e.g. sudo apt-get update. @@ -52,59 +55,57 @@ matrix: # e.g. copy database configurations, environment variables, etc. # Failures in this section will result in build status 'errored'. before_script: - # Set up WordPress installation. - - 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. - - git clone https://github.com/squizlabs/PHP_CodeSniffer.git php-codesniffer - # Install WordPress Coding Standards. - - git clone https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git 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 + # Set up WordPress installation. + - 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. + - git clone https://github.com/squizlabs/PHP_CodeSniffer.git php-codesniffer + # Install WordPress Coding Standards. + - git clone https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git 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 # 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 for PHP syntax errors. - - find . \( -name '*.php' \) -exec php -lf {} \; - # WordPress Coding Standards - # @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. - # --ignore: Ignore these files/directories - - $WP_DEVELOP_DIR/php-codesniffer/scripts/phpcs -p -s -v -n . --standard=./codesniffer.ruleset.xml --extensions=php --ignore=./bower_components/ - + # Search for PHP syntax errors. + - find . \( -name '*.php' \) -exec php -lf {} \; + # WordPress Coding Standards + # @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 + email: false \ No newline at end of file diff --git a/404.php b/404.php index 650221d76..12870baa6 100644 --- a/404.php +++ b/404.php @@ -1,4 +1,13 @@ - +
diff --git a/archive.php b/archive.php index a1883ef72..a9992fb17 100644 --- a/archive.php +++ b/archive.php @@ -1,4 +1,23 @@ - + +
@@ -13,7 +32,7 @@ - + diff --git a/codesniffer.ruleset.xml b/codesniffer.ruleset.xml index 1a0e37591..b1c9050e9 100644 --- a/codesniffer.ruleset.xml +++ b/codesniffer.ruleset.xml @@ -1,19 +1,34 @@ - + - A series of tests used to check FoundationPress for compliance with WordPress Coding Standards + A custom set of code standard rules to check for WordPress themes. + + + + - + + + + + + + + + + + - - + + + \ No newline at end of file diff --git a/comments.php b/comments.php index 6641c3463..1f37e40be 100644 --- a/comments.php +++ b/comments.php @@ -1,4 +1,15 @@ @@ -35,9 +46,12 @@ ?> @@ -66,30 +80,53 @@

%s.', 'foundationpress' ), get_option( 'siteurl' ), $user_identity ); ?>

- + >

- + >

- +

- +

-

XHTML:

+

XHTML: + + + + +

ID ); ?> - + + endif; // If you delete this the sky will fall on your head. + endif; // If you delete this the sky will fall on your head. +?> \ No newline at end of file diff --git a/content-none.php b/content-none.php index 65f5ce254..1b50e051d 100644 --- a/content-none.php +++ b/content-none.php @@ -1,10 +1,14 @@
diff --git a/content.php b/content.php index 7f88c8285..4004d3e71 100755 --- a/content.php +++ b/content.php @@ -1,10 +1,14 @@
> @@ -16,7 +20,7 @@
-

+

- + \ No newline at end of file diff --git a/footer.php b/footer.php index 0a6b15e1e..388f9ecbf 100644 --- a/footer.php +++ b/footer.php @@ -1,3 +1,16 @@ + +
@@ -12,4 +25,4 @@ - + \ No newline at end of file diff --git a/functions.php b/functions.php index b48c82272..a6fa13ec2 100644 --- a/functions.php +++ b/functions.php @@ -1,36 +1,48 @@ +?> \ No newline at end of file diff --git a/header.php b/header.php index c49d70bd0..6ab661b55 100644 --- a/header.php +++ b/header.php @@ -1,25 +1,41 @@ + > - <?php if ( is_category() ) { - echo 'Category Archive for "'; single_cat_title(); echo '" | '; bloginfo( 'name' ); - } elseif ( is_tag() ) { - echo 'Tag Archive for "'; single_tag_title(); echo '" | '; bloginfo( 'name' ); - } elseif ( is_archive() ) { - wp_title( '' ); echo ' Archive | '; bloginfo( 'name' ); - } elseif ( is_search() ) { - echo 'Search for "'.esc_html( $s ).'" | '; bloginfo( 'name' ); - } elseif ( is_home() || is_front_page() ) { - bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); - } elseif ( is_404() ) { - echo 'Error 404 Not Found | '; bloginfo( 'name' ); - } elseif ( is_single() ) { - wp_title( '' ); - } else { - echo wp_title( ' | ', 'false', 'right' ); bloginfo( 'name' ); - } ?> + + <?php + if ( is_category() ) { + echo 'Category Archive for "'; single_cat_title(); echo '" | '; bloginfo( 'name' ); + } elseif ( is_tag() ) { + echo 'Tag Archive for "'; single_tag_title(); echo '" | '; bloginfo( 'name' ); + } elseif ( is_archive() ) { + wp_title( '' ); echo ' Archive | '; bloginfo( 'name' ); + } elseif ( is_search() ) { + echo 'Search for "'.esc_html( $s ).'" | '; bloginfo( 'name' ); + } elseif ( is_home() || is_front_page() ) { + bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); + } elseif ( is_404() ) { + echo 'Error 404 Not Found | '; bloginfo( 'name' ); + } elseif ( is_single() ) { + wp_title( '' ); + } else { + echo wp_title( ' | ', 'false', 'right' ); bloginfo( 'name' ); + } + ?> + @@ -43,7 +59,9 @@
-

+

+ +

diff --git a/index.php b/index.php index ba07a5e0d..083c54514 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,21 @@ - + +
@@ -31,4 +48,4 @@
- + \ No newline at end of file diff --git a/kitchen-sink.php b/kitchen-sink.php index 7b0e19ab8..c0128fa9d 100644 --- a/kitchen-sink.php +++ b/kitchen-sink.php @@ -732,7 +732,7 @@
- +
diff --git a/library/cleanup.php b/library/cleanup.php index 2efed843e..3c5e5246a 100644 --- a/library/cleanup.php +++ b/library/cleanup.php @@ -1,31 +1,31 @@ (.*?)!s", '', $css ); @@ -137,10 +138,7 @@ function foundationpress_gallery_style($css) { * ---------------------------------------------------------------------------- */ - -// Remove default inline style of wp-caption - - +// Remove default inline style of wp-caption. if ( ! function_exists( 'foundationpress_fixed_img_caption_shortcode' ) ) : add_shortcode( 'wp_caption', 'foundationpress_fixed_img_caption_shortcode' ); add_shortcode( 'caption', 'foundationpress_fixed_img_caption_shortcode' ); @@ -173,7 +171,7 @@ function foundationpress_fixed_img_caption_shortcode($attr, $content = null) { } endif; -// Clean the output of attributes of images in editor +// Clean the output of attributes of images in editor. if ( ! function_exists( 'foundationpress_image_tag_class' ) ) : function foundationpress_image_tag_class($class, $id, $align, $size) { $align = 'align' . esc_attr( $align ); @@ -199,7 +197,7 @@ function foundationpress_image_editor($html, $id, $alt, $title) { } endif; -// Wrap images with figure tag - Credit: Robert O'Rourke - http://bit.ly/1q0WHFs +// Wrap images with figure tag - Credit: Robert O'Rourke - http://bit.ly/1q0WHFs . if ( ! function_exists( 'img_unauto' ) ) : function img_unautop($pee) { $pee = preg_replace( '/

\\s*?(<\\/a>|)?\\s*<\\/p>/s', '

$1
', $pee ); @@ -207,4 +205,4 @@ function img_unautop($pee) { } endif; -?> +?> \ No newline at end of file diff --git a/library/custom-header.php b/library/custom-header.php index 61ddb340a..54f2eb506 100644 --- a/library/custom-header.php +++ b/library/custom-header.php @@ -1,6 +1,6 @@ '', diff --git a/library/enqueue-scripts.php b/library/enqueue-scripts.php index 7b31175af..d0685667c 100644 --- a/library/enqueue-scripts.php +++ b/library/enqueue-scripts.php @@ -1,31 +1,38 @@ +?> \ No newline at end of file diff --git a/library/entry-meta.php b/library/entry-meta.php index 24f8ecf45..8401d52ac 100644 --- a/library/entry-meta.php +++ b/library/entry-meta.php @@ -1,4 +1,12 @@ '. sprintf( __( 'Posted on %s at %s.', 'foundationpress' ), get_the_date(), get_the_time() ) .''; diff --git a/library/foundation.php b/library/foundation.php index 8f2c3d2e5..890b72734 100644 --- a/library/foundation.php +++ b/library/foundation.php @@ -1,5 +1,13 @@ …", "
  • …
    • ", $paginate_links ); $paginate_links = preg_replace( '/\s*page-numbers/', '', $paginate_links ); - // Display the pagination if more than one page is found + // Display the pagination if more than one page is found. if ( $paginate_links ) { echo '
    '; echo $paginate_links; @@ -42,7 +50,7 @@ function foundationpress_pagination() { if ( ! function_exists( 'foundationpress_menu_fallback' ) ) : function foundationpress_menu_fallback() { echo '
    '; - // Translators 1: Link to Menus, 2: Link to Customize + // Translators 1: Link to Menus, 2: Link to Customize. printf( __( 'Please assign a menu to the primary menu location under %1$s or %2$s the design.', 'foundationpress' ), sprintf( __( 'Menus', 'foundationpress' ), get_admin_url( get_current_blog_id(), 'nav-menus.php' ) @@ -55,7 +63,7 @@ function foundationpress_menu_fallback() { } endif; -// Add Foundation 'active' class for the current menu item +// Add Foundation 'active' class for the current menu item. if ( ! function_exists( 'foundationpress_active_nav_class' ) ) : function foundationpress_active_nav_class( $classes, $item ) { if ( 1 == $item->current || true == $item->current_item_ancestor ) { @@ -68,7 +76,7 @@ function foundationpress_active_nav_class( $classes, $item ) { /** * Use the active class of ZURB Foundation on wp_list_pages output. - * From required+ Foundation http://themes.required.ch + * From required+ Foundation http://themes.required.ch. */ if ( ! function_exists( 'foundationpress_active_list_pages_class' ) ) : function foundationpress_active_list_pages_class( $input ) { @@ -86,7 +94,7 @@ function foundationpress_active_list_pages_class( $input ) { if ( ! class_exists( 'Foundationpress_Comments' ) ) : class Foundationpress_Comments extends Walker_Comment{ - // init classwide variables + // Init classwide variables. var $tree_type = 'comment'; var $db_fields = array( 'parent' => 'comment_parent', 'id' => 'comment_ID' ); diff --git a/library/menu-walker.php b/library/menu-walker.php index 18bc46d41..4d07743be 100644 --- a/library/menu-walker.php +++ b/library/menu-walker.php @@ -1,7 +1,12 @@ 'Left Top Bar', // registers the menu in the WordPress admin menu editor + 'top-bar-l' => 'Left Top Bar', // Registers the menu in the WordPress admin menu editor. 'top-bar-r' => 'Right Top Bar', 'mobile-off-canvas' => 'Mobile', )); @@ -18,18 +22,18 @@ if ( ! function_exists( 'foundationpress_top_bar_l' ) ) { function foundationpress_top_bar_l() { wp_nav_menu(array( - 'container' => false, // remove nav container - 'container_class' => '', // class of container - 'menu' => '', // menu name - 'menu_class' => 'top-bar-menu left', // adding custom nav class - 'theme_location' => 'top-bar-l', // where it's located in the theme - 'before' => '', // before each link - 'after' => '', // after each link - 'link_before' => '', // before each link text - 'link_after' => '', // after each link text - 'depth' => 5, // limit the depth of the nav - 'fallback_cb' => false, // fallback function (see below) - 'walker' => new Foundationpress_Top_Bar_Walker() + 'container' => false, // Remove nav container + 'container_class' => '', // Class of container + 'menu' => '', // Menu name + 'menu_class' => 'top-bar-menu left', // Adding custom nav class + 'theme_location' => 'top-bar-l', // Where it's located in the theme + 'before' => '', // Before each link + 'after' => '', // After each link + 'link_before' => '', // Before each link text + 'link_after' => '', // After each link text + 'depth' => 5, // Limit the depth of the nav + 'fallback_cb' => false, // Fallback function (see below) + 'walker' => new Foundationpress_Top_Bar_Walker(), )); } } @@ -40,18 +44,18 @@ function foundationpress_top_bar_l() { if ( ! function_exists( 'foundationpress_top_bar_r' ) ) { function foundationpress_top_bar_r() { wp_nav_menu(array( - 'container' => false, // remove nav container - 'container_class' => '', // class of container - 'menu' => '', // menu name - 'menu_class' => 'top-bar-menu right', // adding custom nav class - 'theme_location' => 'top-bar-r', // where it's located in the theme - 'before' => '', // before each link - 'after' => '', // after each link - 'link_before' => '', // before each link text - 'link_after' => '', // after each link text - 'depth' => 5, // limit the depth of the nav - 'fallback_cb' => false, // fallback function (see below) - 'walker' => new Foundationpress_Top_Bar_Walker() + 'container' => false, // Remove nav container + 'container_class' => '', // Class of container + 'menu' => '', // Menu name + 'menu_class' => 'top-bar-menu right', // Adding custom nav class + 'theme_location' => 'top-bar-r', // Where it's located in the theme + 'before' => '', // Before each link + 'after' => '', // After each link + 'link_before' => '', // Before each link text + 'link_after' => '', // After each link text + 'depth' => 5, // Limit the depth of the nav + 'fallback_cb' => false, // Fallback function (see below) + 'walker' => new Foundationpress_Top_Bar_Walker(), )); } } @@ -62,18 +66,18 @@ function foundationpress_top_bar_r() { if ( ! function_exists( 'foundationpress_mobile_off_canvas' ) ) { function foundationpress_mobile_off_canvas() { wp_nav_menu(array( - 'container' => false, // remove nav container - 'container_class' => '', // class of container - 'menu' => '', // menu name - 'menu_class' => 'off-canvas-list', // adding custom nav class - 'theme_location' => 'mobile-off-canvas', // where it's located in the theme - 'before' => '', // before each link - 'after' => '', // after each link - 'link_before' => '', // before each link text - 'link_after' => '', // after each link text - 'depth' => 5, // limit the depth of the nav - 'fallback_cb' => false, // fallback function (see below) - 'walker' => new Foundationpress_Offcanvas_Walker() + 'container' => false, // Remove nav container + 'container_class' => '', // Class of container + 'menu' => '', // Menu name + 'menu_class' => 'off-canvas-list', // Adding custom nav class + 'theme_location' => 'mobile-off-canvas', // Where it's located in the theme + 'before' => '', // Before each link + 'after' => '', // After each link + 'link_before' => '', // Before each link text + 'link_after' => '', // After each link text + 'depth' => 5, // Limit the depth of the nav + 'fallback_cb' => false, // Fallback function (see below) + 'walker' => new Foundationpress_Offcanvas_Walker(), )); } } diff --git a/library/offcanvas-walker.php b/library/offcanvas-walker.php index 30f6c8ded..4ace82027 100644 --- a/library/offcanvas-walker.php +++ b/library/offcanvas-walker.php @@ -1,7 +1,12 @@ +
    diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php index f6a8c11c3..a3806e01b 100644 --- a/parts/off-canvas-menu.php +++ b/parts/off-canvas-menu.php @@ -1,3 +1,13 @@ + \ No newline at end of file diff --git a/parts/top-bar.php b/parts/top-bar.php index f1aa04408..7ef732ec0 100644 --- a/parts/top-bar.php +++ b/parts/top-bar.php @@ -1,3 +1,13 @@ +
    -
    +
    \ No newline at end of file diff --git a/search.php b/search.php index a93ba559f..504484990 100644 --- a/search.php +++ b/search.php @@ -1,4 +1,14 @@ - + +
    diff --git a/searchform.php b/searchform.php index 836bfd36f..a6fc13c3d 100644 --- a/searchform.php +++ b/searchform.php @@ -1,4 +1,13 @@ - + - + \ No newline at end of file diff --git a/sidebar-left.php b/sidebar-left.php index 45a42dbc6..ebacae6cd 100644 --- a/sidebar-left.php +++ b/sidebar-left.php @@ -1,5 +1,15 @@ + + \ No newline at end of file diff --git a/sidebar.php b/sidebar.php index c9de6409f..1f8694f73 100644 --- a/sidebar.php +++ b/sidebar.php @@ -1,5 +1,15 @@ + + \ No newline at end of file diff --git a/single.php b/single.php index 82f69f26e..dde6737f9 100644 --- a/single.php +++ b/single.php @@ -1,4 +1,14 @@ - + +
    @@ -38,4 +48,4 @@
    - + \ No newline at end of file diff --git a/woocommerce.php b/woocommerce.php index 305d882cc..452cf44de 100644 --- a/woocommerce.php +++ b/woocommerce.php @@ -1,4 +1,13 @@ - +
    @@ -29,4 +38,4 @@
    - + \ No newline at end of file