Skip to content
This repository was archived by the owner on Jan 28, 2019. It is now read-only.

Commit 9e5a5fe

Browse files
stefan-cotitosustefan-cotitosu
committed
Polylang Compatibility Added
grunt errors fixed
1 parent 2ddbe4b commit 9e5a5fe

File tree

75 files changed

+8539
-7158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+8539
-7158
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ before_script:
4242
- mysql -e 'CREATE DATABASE wordpress_test;' -uroot
4343

4444
## install PHPCS and Wordpress standards
45-
- pear install pear/PHP_CodeSniffer
45+
- pear install pear/PHP_CodeSniffer-2.9.0
4646
- 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
4747
- phpenv rehash
4848
- phpcs --config-set installed_paths $WP_DEVELOP_DIR/wordpress-coding-standards

‎404.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php parallax_hook_header_after(); ?>
1818
<div class="content-wrap">
1919
<div class="container">
20-
<?php parallax_hook_404_content() ?>
20+
<?php parallax_hook_404_content(); ?>
2121
</div>
2222
</div><!-- .content-wrap -->
2323

‎Gruntfile.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// jshint node:true
22

33
module.exports = function( grunt ) {
4-
'use strict';
4+
'use strict';
55

6-
var loader = require( 'load-project-config' ),
7-
config = require( 'grunt-theme-fleet' );
8-
config = config();
9-
config.files.php.push( '!inc/admin/**/*.php' );
10-
config.files.php.push( '!class-tgm-plugin-activation.php' );
11-
config.files.js.push( '!inc/admin/**/*.js' );
12-
config.files.js.push( '!inc/icon-picker/js/*.js' );
13-
config.files.js.push( '!js/bootstrap.js' );
14-
config.files.js.push( '!js/bootstrap.min.js' );
15-
config.files.js.push( '!js/html5shiv.min.js' );
16-
config.files.js.push( '!js/html5shiv.js' );
17-
config.files.js.push( '!js/plugin.home.js' );
18-
config.files.js.push( '!js/scrollReveal.js' );
19-
config.files.js.push( '!js/skip-link-focus-fix.js' );
20-
loader( grunt, config ).init();
21-
};
6+
var loader = require( 'load-project-config' ),
7+
config = require( 'grunt-theme-fleet' );
8+
config = config();
9+
config.files.php.push( '!inc/admin/**/*.php' );
10+
config.files.php.push( '!class-tgm-plugin-activation.php' );
11+
config.files.js.push( '!inc/admin/**/*.js' );
12+
config.files.js.push( '!inc/icon-picker/js/*.js' );
13+
config.files.js.push( '!js/bootstrap.js' );
14+
config.files.js.push( '!js/bootstrap.min.js' );
15+
config.files.js.push( '!js/html5shiv.min.js' );
16+
config.files.js.push( '!js/html5shiv.js' );
17+
config.files.js.push( '!js/plugin.home.js' );
18+
config.files.js.push( '!js/scrollReveal.js' );
19+
config.files.js.push( '!js/skip-link-focus-fix.js' );
20+
loader( grunt, config ).init();
21+
};

‎archive-download.php

+10-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
<div class="container">
2121

2222
<div id="primary" class="content-area col-md-12">
23-
<main <?php if ( have_posts() ) { echo 'itemscope itemtype="http://schema.org/Blog"';} ?> id="main" class="site-main" role="main">
23+
<main
24+
<?php
25+
if ( have_posts() ) {
26+
echo 'itemscope itemtype="http://schema.org/Blog"';}
27+
?>
28+
id="main" class="site-main" role="main">
2429

2530
<?php if ( have_posts() ) : ?>
2631

@@ -31,8 +36,10 @@
3136
?>
3237
</header><!-- .page-header -->
3338

34-
<?php /* Start the Loop */ ?>
35-
<?php while ( have_posts() ) : the_post();
39+
<?php ;/* Start the Loop */ ?>
40+
<?php
41+
while ( have_posts() ) :
42+
the_post();
3643

3744
/*
3845
Include the Post-Format-specific template for the content.

‎archive.php

+11-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
<div class="container">
2424

2525
<div id="primary" class="content-area col-md-8 post-list">
26-
<main <?php if ( have_posts() ) { echo 'itemscope itemtype="http://schema.org/Blog"';} ?> id="main" class="site-main" role="main">
26+
<main
27+
<?php
28+
if ( have_posts() ) {
29+
echo 'itemscope itemtype="http://schema.org/Blog"';}
30+
?>
31+
id="main" class="site-main" role="main">
2732

2833
<?php if ( have_posts() ) : ?>
2934

@@ -34,8 +39,11 @@
3439
?>
3540
</header><!-- .page-header -->
3641

37-
<?php /* Start the Loop */ ?>
38-
<?php while ( have_posts() ) : the_post(); ?>
42+
<?php ;/* Start the Loop */ ?>
43+
<?php
44+
while ( have_posts() ) :
45+
the_post();
46+
?>
3947
<?php parallax_hook_entry_before(); ?>
4048
<?php
4149

‎class-tgm-plugin-activation.php

+28-7
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,9 @@ protected function do_plugin_install() {
890890

891891
if ( 'update' === $install_type ) {
892892
// Inject our info into the update transient.
893-
$to_inject = array( $slug => $this->plugins[ $slug ] );
893+
$to_inject = array(
894+
$slug => $this->plugins[ $slug ],
895+
);
894896
$to_inject[ $slug ]['source'] = $source;
895897
$this->inject_update_info( $to_inject );
896898

@@ -1024,10 +1026,20 @@ public function maybe_adjust_source_dir( $source, $remote_source, $upgrader ) {
10241026
if ( true === $GLOBALS['wp_filesystem']->move( $from_path, $to_path ) ) {
10251027
return trailingslashit( $to_path );
10261028
} else {
1027-
return new WP_Error( 'rename_failed', esc_html__( 'The remote plugin package does not contain a folder with the desired slug and renaming did not work.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array( 'found' => $subdir_name, 'expected' => $desired_slug ) );
1029+
return new WP_Error(
1030+
'rename_failed', esc_html__( 'The remote plugin package does not contain a folder with the desired slug and renaming did not work.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array(
1031+
'found' => $subdir_name,
1032+
'expected' => $desired_slug,
1033+
)
1034+
);
10281035
}
10291036
} elseif ( empty( $subdir_name ) ) {
1030-
return new WP_Error( 'packaged_wrong', esc_html__( 'The remote plugin package consists of more than one file, but the files are not packaged in a folder.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array( 'found' => $subdir_name, 'expected' => $desired_slug ) );
1037+
return new WP_Error(
1038+
'packaged_wrong', esc_html__( 'The remote plugin package consists of more than one file, but the files are not packaged in a folder.', 'tgmpa' ) . ' ' . esc_html__( 'Please contact the plugin provider and ask them to package their plugin according to the WordPress guidelines.', 'tgmpa' ), array(
1039+
'found' => $subdir_name,
1040+
'expected' => $desired_slug,
1041+
)
1042+
);
10311043
}
10321044
}
10331045

@@ -1648,7 +1660,14 @@ protected function get_plugins_api( $slug ) {
16481660
require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
16491661
}
16501662

1651-
$response = plugins_api( 'plugin_information', array( 'slug' => $slug, 'fields' => array( 'sections' => false ) ) );
1663+
$response = plugins_api(
1664+
'plugin_information', array(
1665+
'slug' => $slug,
1666+
'fields' => array(
1667+
'sections' => false,
1668+
),
1669+
)
1670+
);
16521671

16531672
$api[ $slug ] = false;
16541673

@@ -3407,12 +3426,14 @@ public function bulk_install( $plugins, $args = array() ) {
34073426
* @type array $packages Array of plugin, theme, or core packages to update.
34083427
* }
34093428
*/
3410-
do_action( 'upgrader_process_complete', $this, array(
3411-
'action' => 'install', // [TGMPA + ] adjusted.
3429+
do_action(
3430+
'upgrader_process_complete', $this, array(
3431+
'action' => 'install', // [TGMPA + ] adjusted.
34123432
'type' => 'plugin',
34133433
'bulk' => true,
34143434
'plugins' => $plugins,
3415-
) );
3435+
)
3436+
);
34163437

34173438
$this->skin->bulk_footer();
34183439

‎comments.php

+19-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<?php parallax_hook_comments_before(); ?>
2121
<div id="comments" class="comments-area">
2222
<?php parallax_hook_comments_top(); ?>
23-
<?php // You can start editing here -- including this comment! ?>
2423

2524
<?php if ( have_comments() ) : ?>
2625
<h2 class="comments-title">
@@ -46,7 +45,9 @@
4645
?>
4746
</h2>
4847

49-
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
48+
<?php
49+
if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
50+
?>
5051
<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
5152
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'parallax-one' ); ?></h2>
5253
<div class="nav-links">
@@ -56,19 +57,25 @@
5657

5758
</div><!-- .nav-links -->
5859
</nav><!-- #comment-nav-above -->
59-
<?php endif; // check for comment navigation ?>
60+
<?php
61+
endif; // check for comment navigation
62+
?>
6063

6164
<ol class="comment-list">
6265
<?php
63-
wp_list_comments( array(
64-
'style' => 'ol',
65-
'short_ping' => true,
66-
'avatar_size' => 60,
67-
) );
66+
wp_list_comments(
67+
array(
68+
'style' => 'ol',
69+
'short_ping' => true,
70+
'avatar_size' => 60,
71+
)
72+
);
6873
?>
6974
</ol><!-- .comment-list -->
7075

71-
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
76+
<?php
77+
if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through
78+
?>
7279
<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
7380
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'parallax-one' ); ?></h2>
7481
<div class="nav-links">
@@ -78,7 +85,9 @@
7885

7986
</div><!-- .nav-links -->
8087
</nav><!-- #comment-nav-below -->
81-
<?php endif; // check for comment navigation ?>
88+
<?php
89+
endif; // check for comment navigation
90+
?>
8291

8392
<?php endif; ?>
8493

‎content-archive-download.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
<div itemprop="description" class="edd_download_excerpt">
2525
<?php the_excerpt(); ?>
2626
</div><!-- .entry-content -->
27-
<?php echo edd_get_purchase_link( array(
28-
'download_id' => get_the_ID(),
29-
) ); ?>
27+
<?php
28+
echo edd_get_purchase_link(
29+
array(
30+
'download_id' => get_the_ID(),
31+
)
32+
);
33+
?>
3034
</div>
3135
</div><!-- #post-## -->

‎content-none.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818

1919
<p>
2020
<?php
21-
/* translators: %s is link to new post */
22-
printf( esc_html__( 'Ready to publish your first post? %s', 'parallax-one' ),
21+
printf( /* translators: %s is link to new post */
22+
esc_html__( 'Ready to publish your first post? %s', 'parallax-one' ),
2323
/* translators: %1$s is url to new post, %2$s is link text */
24-
printf( '<a href="%1$s">%2$s</a>',
24+
printf(
25+
'<a href="%1$s">%2$s</a>',
2526
esc_url( admin_url( 'post-new.php' ) ),
2627
esc_html__( 'Get started here', 'parallax-one' )
2728
)
28-
); ?>
29+
);
30+
?>
2931
</p>
3032

3133
<?php elseif ( is_search() ) : ?>

‎content-page-no-title.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
1010
<?php parallax_hook_page_top(); ?>
1111

12-
<div class="entry-content content-page <?php if ( empty( $page_title ) ) { echo 'parallax-one-top-margin-5px'; } ?>" itemprop="text">
12+
<div class="entry-content content-page
13+
<?php
14+
if ( empty( $page_title ) ) {
15+
echo 'parallax-one-top-margin-5px'; }
16+
?>
17+
" itemprop="text">
1318
<?php the_content(); ?>
1419
</div><!-- .entry-content -->
1520

‎content-page.php

+14-6
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,29 @@
1111

1212
<?php
1313
$page_title = get_the_title();
14-
if ( ! empty( $page_title ) ) { ?>
14+
if ( ! empty( $page_title ) ) {
15+
?>
1516
<header class="entry-header">
1617
<?php the_title( '<h1 class="entry-title single-title" itemprop="headline">', '</h1>' ); ?>
1718
<div class="colored-line-left"></div>
1819
<div class="clearfix"></div>
1920
</header><!-- .entry-header -->
2021
<?php } ?>
2122

22-
<div class="entry-content content-page <?php if ( empty( $page_title ) ) { echo 'parallax-one-top-margin-5px'; } ?>" itemprop="text">
23+
<div class="entry-content content-page
24+
<?php
25+
if ( empty( $page_title ) ) {
26+
echo 'parallax-one-top-margin-5px'; }
27+
?>
28+
" itemprop="text">
2329
<?php the_content(); ?>
2430
<?php
25-
wp_link_pages( array(
26-
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
27-
'after' => '</div>',
28-
) );
31+
wp_link_pages(
32+
array(
33+
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
34+
'after' => '</div>',
35+
)
36+
);
2937
?>
3038
</div><!-- .entry-content -->
3139

‎content-search.php

+11-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<header class="entry-header">
1414

1515
<div class="post-img-wrap">
16-
<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
16+
<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
1717

1818
<?php
1919
if ( has_post_thumbnail() ) { // check if the post has a Post Thumbnail assigned to it.
@@ -81,16 +81,20 @@
8181
<div class="entry-content">
8282
<?php
8383
$ismore = strpos( $post->post_content, '<!--more-->' );
84-
if ( $ismore ) : the_content();
85-
else : the_excerpt();
84+
if ( $ismore ) :
85+
the_content();
86+
else :
87+
the_excerpt();
8688
endif;
8789
?>
8890

8991
<?php
90-
wp_link_pages( array(
91-
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
92-
'after' => '</div>',
93-
) );
92+
wp_link_pages(
93+
array(
94+
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
95+
'after' => '</div>',
96+
)
97+
);
9498
?>
9599
</div><!-- .entry-content -->
96100
<?php parallax_hook_search_bottom(); ?>

‎content-single-download.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626

2727
<?php the_content(); ?>
2828
<?php
29-
wp_link_pages( array(
30-
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
31-
'after' => '</div>',
32-
) );
29+
wp_link_pages(
30+
array(
31+
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'parallax-one' ),
32+
'after' => '</div>',
33+
)
34+
);
3335
?>
3436
</div><!-- .entry-content -->
3537

0 commit comments

Comments
 (0)