Skip to content

Commit cdb098d

Browse files
author
Eddie Machado
committed
Merge pull request eddiemachado-zz#458 from cfoellmann/some-fixes
spacing corrections to comply better with wp php coding standards
2 parents b27b538 + 3721cb7 commit cdb098d

17 files changed

Lines changed: 174 additions & 172 deletions

‎404.php‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
<header class="article-header">
1212

13-
<h1><?php _e("Epic 404 - Article Not Found", "bonestheme"); ?></h1>
13+
<h1><?php _e( 'Epic 404 - Article Not Found', 'bonestheme' ); ?></h1>
1414

1515
</header> <!-- end article header -->
1616

1717
<section class="entry-content">
1818

19-
<p><?php _e("The article you were looking for was not found, but maybe try looking again!", "bonestheme"); ?></p>
19+
<p><?php _e( 'The article you were looking for was not found, but maybe try looking again!', 'bonestheme' ); ?></p>
2020

2121
</section> <!-- end article section -->
2222

@@ -28,7 +28,7 @@
2828

2929
<footer class="article-footer">
3030

31-
<p><?php _e("This is the 404.php template.", "bonestheme"); ?></p>
31+
<p><?php _e( 'This is the 404.php template.', 'bonestheme' ); ?></p>
3232

3333
</footer> <!-- end article footer -->
3434

‎archive-custom_type.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
1212

13-
<article id="post-<?php the_ID(); ?>" <?php post_class('clearfix'); ?> role="article">
13+
<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?> role="article">
1414

1515
<header class="article-header">
1616

1717
<h3 class="h2"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
1818
<p class="byline vcard"><?php
19-
printf(__('Posted <time class="updated" datetime="%1$s" pubdate>%2$s</time> by <span class="author">%3$s</span>.', 'bonestheme'), get_the_time('Y-m-j'), get_the_time(__('F jS, Y', 'bonestheme')), bones_get_the_author_posts_link());
19+
printf( __( 'Posted <time class="updated" datetime="%1$s" pubdate>%2$s</time> by <span class="author">%3$s</span>.', 'bonestheme' ), get_the_time( 'Y-m-j' ), get_the_time( __( 'F jS, Y', 'bonestheme' ) ), bones_get_the_author_posts_link());
2020
?></p>
2121

2222
</header> <!-- end article header -->
@@ -35,13 +35,13 @@
3535

3636
<?php endwhile; ?>
3737

38-
<?php if (function_exists('bones_page_navi')) { ?>
38+
<?php if ( function_exists( 'bones_page_navi' ) ) { ?>
3939
<?php bones_page_navi(); ?>
4040
<?php } else { ?>
4141
<nav class="wp-prev-next">
4242
<ul class="clearfix">
43-
<li class="prev-link"><?php next_posts_link(__('&laquo; Older Entries', "bonestheme")) ?></li>
44-
<li class="next-link"><?php previous_posts_link(__('Newer Entries &raquo;', "bonestheme")) ?></li>
43+
<li class="prev-link"><?php next_posts_link( __( '&laquo; Older Entries', 'bonestheme' )) ?></li>
44+
<li class="next-link"><?php previous_posts_link( __( 'Newer Entries &raquo;', 'bonestheme' )) ?></li>
4545
</ul>
4646
</nav>
4747
<?php } ?>
@@ -50,13 +50,13 @@
5050

5151
<article id="post-not-found" class="hentry clearfix">
5252
<header class="article-header">
53-
<h1><?php _e("Oops, Post Not Found!", "bonestheme"); ?></h1>
53+
<h1><?php _e( 'Oops, Post Not Found!', 'bonestheme' ); ?></h1>
5454
</header>
5555
<section class="entry-content">
56-
<p><?php _e("Uh Oh. Something is missing. Try double checking things.", "bonestheme"); ?></p>
56+
<p><?php _e( 'Uh Oh. Something is missing. Try double checking things.', 'bonestheme' ); ?></p>
5757
</section>
5858
<footer class="article-footer">
59-
<p><?php _e("This is the error message in the custom posty type archive template.", "bonestheme"); ?></p>
59+
<p><?php _e( 'This is the error message in the custom posty type archive template.', 'bonestheme' ); ?></p>
6060
</footer>
6161
</article>
6262

‎archive.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<?php if (is_category()) { ?>
1010
<h1 class="archive-title h2">
11-
<span><?php _e("Posts Categorized:", "bonestheme"); ?></span> <?php single_cat_title(); ?>
11+
<span><?php _e( 'Posts Categorized:', 'bonestheme' ); ?></span> <?php single_cat_title(); ?>
1212
</h1>
1313

1414
<?php } elseif (is_tag()) { ?>
1515
<h1 class="archive-title h2">
16-
<span><?php _e("Posts Tagged:", "bonestheme"); ?></span> <?php single_tag_title(); ?>
16+
<span><?php _e( 'Posts Tagged:', 'bonestheme' ); ?></span> <?php single_tag_title(); ?>
1717
</h1>
1818

1919
<?php } elseif (is_author()) {
@@ -22,34 +22,34 @@
2222
?>
2323
<h1 class="archive-title h2">
2424

25-
<span><?php _e("Posts By:", "bonestheme"); ?></span> <?php the_author_meta('display_name', $author_id); ?>
25+
<span><?php _e( 'Posts By:', 'bonestheme' ); ?></span> <?php the_author_meta('display_name', $author_id); ?>
2626

2727
</h1>
2828
<?php } elseif (is_day()) { ?>
2929
<h1 class="archive-title h2">
30-
<span><?php _e("Daily Archives:", "bonestheme"); ?></span> <?php the_time('l, F j, Y'); ?>
30+
<span><?php _e( 'Daily Archives:', 'bonestheme' ); ?></span> <?php the_time('l, F j, Y'); ?>
3131
</h1>
3232

3333
<?php } elseif (is_month()) { ?>
3434
<h1 class="archive-title h2">
35-
<span><?php _e("Monthly Archives:", "bonestheme"); ?></span> <?php the_time('F Y'); ?>
35+
<span><?php _e( 'Monthly Archives:', 'bonestheme' ); ?></span> <?php the_time('F Y'); ?>
3636
</h1>
3737

3838
<?php } elseif (is_year()) { ?>
3939
<h1 class="archive-title h2">
40-
<span><?php _e("Yearly Archives:", "bonestheme"); ?></span> <?php the_time('Y'); ?>
40+
<span><?php _e( 'Yearly Archives:', 'bonestheme' ); ?></span> <?php the_time('Y'); ?>
4141
</h1>
4242
<?php } ?>
4343

4444
<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
4545

46-
<article id="post-<?php the_ID(); ?>" <?php post_class('clearfix'); ?> role="article">
46+
<article id="post-<?php the_ID(); ?>" <?php post_class( 'clearfix' ); ?> role="article">
4747

4848
<header class="article-header">
4949

5050
<h3 class="h2"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
5151
<p class="byline vcard"><?php
52-
printf(__('Posted <time class="updated" datetime="%1$s" pubdate>%2$s</time> by <span class="author">%3$s</span> <span class="amp">&</span> filed under %4$s.', 'bonestheme'), get_the_time('Y-m-j'), get_the_time(__('F jS, Y', 'bonestheme')), bones_get_the_author_posts_link(), get_the_category_list(', '));
52+
printf(__( 'Posted <time class="updated" datetime="%1$s" pubdate>%2$s</time> by <span class="author">%3$s</span> <span class="amp">&</span> filed under %4$s.', 'bonestheme' ), get_the_time('Y-m-j'), get_the_time(__( 'F jS, Y', 'bonestheme' )), bones_get_the_author_posts_link(), get_the_category_list(', '));
5353
?></p>
5454

5555
</header> <!-- end article header -->
@@ -70,13 +70,13 @@
7070

7171
<?php endwhile; ?>
7272

73-
<?php if (function_exists('bones_page_navi')) { ?>
73+
<?php if ( function_exists( 'bones_page_navi' ) ) { ?>
7474
<?php bones_page_navi(); ?>
7575
<?php } else { ?>
7676
<nav class="wp-prev-next">
7777
<ul class="clearfix">
78-
<li class="prev-link"><?php next_posts_link(__('&laquo; Older Entries', "bonestheme")) ?></li>
79-
<li class="next-link"><?php previous_posts_link(__('Newer Entries &raquo;', "bonestheme")) ?></li>
78+
<li class="prev-link"><?php next_posts_link( __( '&laquo; Older Entries', 'bonestheme' )) ?></li>
79+
<li class="next-link"><?php previous_posts_link( __( 'Newer Entries &raquo;', 'bonestheme' )) ?></li>
8080
</ul>
8181
</nav>
8282
<?php } ?>
@@ -85,13 +85,13 @@
8585

8686
<article id="post-not-found" class="hentry clearfix">
8787
<header class="article-header">
88-
<h1><?php _e("Oops, Post Not Found!", "bonestheme"); ?></h1>
88+
<h1><?php _e( 'Oops, Post Not Found!', 'bonestheme' ); ?></h1>
8989
</header>
9090
<section class="entry-content">
91-
<p><?php _e("Uh Oh. Something is missing. Try double checking things.", "bonestheme"); ?></p>
91+
<p><?php _e( 'Uh Oh. Something is missing. Try double checking things.', 'bonestheme' ); ?></p>
9292
</section>
9393
<footer class="article-footer">
94-
<p><?php _e("This is the error message in the archive.php template.", "bonestheme"); ?></p>
94+
<p><?php _e( 'This is the error message in the archive.php template.', 'bonestheme' ); ?></p>
9595
</footer>
9696
</article>
9797

‎comments.php‎

100755100644
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*/
55

66
// Do not delete these lines
7-
if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
7+
if ( ! empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
88
die ('Please do not load this page directly. Thanks!');
99

1010
if ( post_password_required() ) { ?>
1111
<div class="alert alert-help">
12-
<p class="nocomments"><?php _e("This post is password protected. Enter the password to view comments.", "bonestheme"); ?></p>
12+
<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.', 'bonestheme' ); ?></p>
1313
</div>
1414
<?php
1515
return;
@@ -19,7 +19,7 @@
1919
<!-- You can start editing here. -->
2020

2121
<?php if ( have_comments() ) : ?>
22-
<h3 id="comments" class="h2"><?php comments_number(__('<span>No</span> Responses', 'bonestheme'), __('<span>One</span> Response', 'bonestheme'), _n('<span>%</span> Response', '<span>%</span> Responses', get_comments_number(),'bonestheme') );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
22+
<h3 id="comments" class="h2"><?php comments_number( __( '<span>No</span> Responses', 'bonestheme' ), __( '<span>One</span> Response', 'bonestheme' ), _n( '<span>%</span> Response', '<span>%</span> Responses', get_comments_number(), 'bonestheme' ) );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
2323

2424
<nav id="comment-nav">
2525
<ul class="clearfix">
@@ -29,7 +29,7 @@
2929
</nav>
3030

3131
<ol class="commentlist">
32-
<?php wp_list_comments('type=comment&callback=bones_comments'); ?>
32+
<?php wp_list_comments( 'type=comment&callback=bones_comments' ); ?>
3333
</ol>
3434

3535
<nav id="comment-nav">
@@ -47,7 +47,7 @@
4747
<?php else : // comments are closed ?>
4848

4949
<!-- If comments are closed. -->
50-
<!--p class="nocomments"><?php _e("Comments are closed.", "bonestheme"); ?></p-->
50+
<!--p class="nocomments"><?php _e( 'Comments are closed.', 'bonestheme' ); ?></p-->
5151

5252
<?php endif; ?>
5353

@@ -58,60 +58,60 @@
5858

5959
<section id="respond" class="respond-form">
6060

61-
<h3 id="comment-form-title" class="h2"><?php comment_form_title( __('Leave a Reply', 'bonestheme'), __('Leave a Reply to %s', 'bonestheme' )); ?></h3>
61+
<h3 id="comment-form-title" class="h2"><?php comment_form_title( __( 'Leave a Reply', 'bonestheme' ), __( 'Leave a Reply to %s', 'bonestheme' )); ?></h3>
6262

6363
<div id="cancel-comment-reply">
6464
<p class="small"><?php cancel_comment_reply_link(); ?></p>
6565
</div>
6666

6767
<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
6868
<div class="alert alert-help">
69-
<p><?php printf( __('You must be %1$slogged in%2$s to post a comment.', 'bonestheme'), '<a href="<?php echo wp_login_url( get_permalink() ); ?>">', '</a>' ); ?></p>
69+
<p><?php printf( __( 'You must be %1$slogged in%2$s to post a comment.', 'bonestheme' ), '<a href="<?php echo wp_login_url( get_permalink() ); ?>">', '</a>' ); ?></p>
7070
</div>
7171
<?php else : ?>
7272

7373
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
7474

7575
<?php if ( is_user_logged_in() ) : ?>
7676

77-
<p class="comments-logged-in-as"><?php _e("Logged in as", "bonestheme"); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e("Log out of this account", "bonestheme"); ?>"><?php _e("Log out", "bonestheme"); ?> <?php _e("&raquo;", "bonestheme"); ?></a></p>
77+
<p class="comments-logged-in-as"><?php _e( 'Logged in as', 'bonestheme' ); ?> <a href="<?php echo get_option( 'siteurl' ); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php _e( 'Log out of this account', 'bonestheme' ); ?>"><?php _e( 'Log out', 'bonestheme' ); ?> <?php _e( '&raquo;', 'bonestheme' ); ?></a></p>
7878

7979
<?php else : ?>
8080

8181
<ul id="comment-form-elements" class="clearfix">
8282

8383
<li>
84-
<label for="author"><?php _e("Name", "bonestheme"); ?> <?php if ($req) _e("(required)"); ?></label>
85-
<input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" placeholder="<?php _e('Your Name*', 'bonestheme'); ?>" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
84+
<label for="author"><?php _e( 'Name', 'bonestheme' ); ?> <?php if ($req) _e( '(required)'); ?></label>
85+
<input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" placeholder="<?php _e( 'Your Name*', 'bonestheme' ); ?>" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
8686
</li>
8787

8888
<li>
89-
<label for="email"><?php _e("Mail", "bonestheme"); ?> <?php if ($req) _e("(required)"); ?></label>
90-
<input type="email" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" placeholder="<?php _e('Your E-Mail*', 'bonestheme'); ?>" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
91-
<small><?php _e("(will not be published)", "bonestheme"); ?></small>
89+
<label for="email"><?php _e( 'Mail', 'bonestheme' ); ?> <?php if ($req) _e( '(required)'); ?></label>
90+
<input type="email" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" placeholder="<?php _e( 'Your E-Mail*', 'bonestheme' ); ?>" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
91+
<small><?php _e("(will not be published)", 'bonestheme' ); ?></small>
9292
</li>
9393

9494
<li>
95-
<label for="url"><?php _e("Website", "bonestheme"); ?></label>
96-
<input type="url" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" placeholder="<?php _e('Got a website?', 'bonestheme'); ?>" tabindex="3" />
95+
<label for="url"><?php _e( 'Website', 'bonestheme' ); ?></label>
96+
<input type="url" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" placeholder="<?php _e( 'Got a website?', 'bonestheme' ); ?>" tabindex="3" />
9797
</li>
9898

9999
</ul>
100100

101101
<?php endif; ?>
102102

103-
<p><textarea name="comment" id="comment" placeholder="<?php _e('Your Comment here...', 'bonestheme'); ?>" tabindex="4"></textarea></p>
103+
<p><textarea name="comment" id="comment" placeholder="<?php _e( 'Your Comment here...', 'bonestheme' ); ?>" tabindex="4"></textarea></p>
104104

105105
<p>
106-
<input name="submit" type="submit" id="submit" class="button" tabindex="5" value="<?php _e('Submit', 'bonestheme'); ?>" />
106+
<input name="submit" type="submit" id="submit" class="button" tabindex="5" value="<?php _e( 'Submit', 'bonestheme' ); ?>" />
107107
<?php comment_id_fields(); ?>
108108
</p>
109109

110110
<div class="alert alert-info">
111-
<p id="allowed_tags" class="small"><strong>XHTML:</strong> <?php _e('You can use these tags', 'bonestheme'); ?>: <code><?php echo allowed_tags(); ?></code></p>
111+
<p id="allowed_tags" class="small"><strong>XHTML:</strong> <?php _e( 'You can use these tags', 'bonestheme' ); ?>: <code><?php echo allowed_tags(); ?></code></p>
112112
</div>
113113

114-
<?php do_action('comment_form', $post->ID); ?>
114+
<?php do_action( 'comment_form', $post->ID ); ?>
115115

116116
</form>
117117

‎footer.php‎

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
<nav role="navigation">
66
<?php bones_footer_links(); ?>
7-
</nav>
7+
</nav>
88

9-
<p class="source-org copyright">&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?>.</p>
9+
<p class="source-org copyright">&copy; <?php echo date('Y'); ?> <?php bloginfo( 'name' ); ?>.</p>
1010

1111
</div> <!-- end #inner-footer -->
1212

0 commit comments

Comments
 (0)