Depreciate - Canonical design blog

Merge lp:~jacekn/blahblahblah/fixes3 into lp:blahblahblah

  1. fixes3
  2. Merge into live
Proposed by Jacek Nykis
Status: Merged
Approved by: Anthony Dillon
Approved revision: 57
Merged at revision: 53
Proposed branch: lp:~jacekn/blahblahblah/fixes3
Merge into: lp:blahblahblah
Diff against target: 165 lines (+8/-21)
10 files modified
comments.php (+0/-1)
header.php (+1/-3)
includes/_nav_archive.php (+2/-2)
includes/_popular_posts.php (+1/-1)
includes/_result_list_item.php (+0/-1)
index.php (+1/-2)
launchpad_comments.php (+0/-1)
search.php (+0/-1)
single.php (+2/-6)
team.php (+1/-3)
To merge this branch: bzr merge lp:~jacekn/blahblahblah/fixes3
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Jacek Nykis (community) Needs Resubmitting
Robin Winslow (community) Approve
Review via email: mp+278134@code.launchpad.net

Description of the change

Multiple PHP tab fixes

To post a comment you must log in.
lp:~jacekn/blahblahblah/fixes3 updated
56. By Jacek Nykis

Whitespace fix to make title appear on one line

Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good, two comments in code to remove commented out code.

review: Needs Fixing
Revision history for this message
Robin Winslow (nottrobin) wrote :

LGTM

review: Approve
lp:~jacekn/blahblahblah/fixes3 updated
57. By Jacek Nykis

Removed 2 lines which were comments only

Revision history for this message
Jacek Nykis (jacekn) wrote :

Good point ant, branch updated

review: Needs Resubmitting
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Looks good +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'comments.php'
--- comments.php 2012-11-04 11:12:22 +0000
+++ comments.php 2015-11-20 14:58:00 +0000
@@ -108,7 +108,6 @@
108 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>108 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>
109 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>109 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>
110 </li>110 </li>
111 <!-- <li><p><strong>XHTML:</strong> You can use these tags: <code><?#php echo allowed_tags(); ?></code></p></li> -->
112 <li>111 <li>
113 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>112 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>
114 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />113 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
115114
=== modified file 'header.php'
--- header.php 2013-03-01 09:53:38 +0000
+++ header.php 2015-11-20 14:58:00 +0000
@@ -30,9 +30,7 @@
30<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->30<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
31<head> 31<head>
3232
33<title>33<title><?php if(is_author()) : ?><?php
34<?php if(is_author()) : ?>
35<?php
36 $curauth = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author)); 34 $curauth = (isset($_GET['author_name'])) ? get_user_by('slug', $author_name) : get_userdata(intval($author));
37 echo $curauth->first_name; ?> <?php echo $curauth->last_name;35 echo $curauth->first_name; ?> <?php echo $curauth->last_name;
38?> | Ubuntu <?php bloginfo('name'); ?> Blog36?> | Ubuntu <?php bloginfo('name'); ?> Blog
3937
=== modified file 'includes/_nav_archive.php'
--- includes/_nav_archive.php 2012-10-26 21:17:51 +0000
+++ includes/_nav_archive.php 2015-11-20 14:58:00 +0000
@@ -7,7 +7,7 @@
7 <li class="year"><h3><a href="<?php echo get_year_link($year); ?> "><?php echo $year; ?></a></h3>7 <li class="year"><h3><a href="<?php echo get_year_link($year); ?> "><?php echo $year; ?></a></h3>
88
9 <ul id="" class="no-bullets">9 <ul id="" class="no-bullets">
10 <? $months = $wpdb->get_col("SELECT DISTINCT MONTH(post_date) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' AND YEAR(post_date) = '".$year."' ORDER BY post_date DESC");10 <?php $months = $wpdb->get_col("SELECT DISTINCT MONTH(post_date) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' AND YEAR(post_date) = '".$year."' ORDER BY post_date DESC");
11 foreach($months as $month) :11 foreach($months as $month) :
12 ?>12 ?>
13 <li class=""><a href="<?php echo get_month_link($year, $month); ?>"><?php echo date( 'F', mktime(0, 0, 0, $month) );?>13 <li class=""><a href="<?php echo get_month_link($year, $month); ?>"><?php echo date( 'F', mktime(0, 0, 0, $month) );?>
@@ -19,4 +19,4 @@
19 </ul>19 </ul>
20 </li>20 </li>
21<?php endforeach; ?>21<?php endforeach; ?>
22</ul>
23\ No newline at end of file22\ No newline at end of file
23</ul>
2424
=== modified file 'includes/_popular_posts.php'
--- includes/_popular_posts.php 2012-10-26 21:17:51 +0000
+++ includes/_popular_posts.php 2015-11-20 14:58:00 +0000
@@ -9,7 +9,7 @@
9 $commentcount = $post->comment_count;9 $commentcount = $post->comment_count;
10 if ($commentcount != 0) { ?>10 if ($commentcount != 0) { ?>
11 <li><a href="<?php echo get_permalink($postid); ?>" title="<?php echo $title ?>">11 <li><a href="<?php echo get_permalink($postid); ?>" title="<?php echo $title ?>">
12 <?php echo $title ?><?#php echo $commentcount ?></a></li>12 <?php echo $title ?></a></li>
13 <?php } } ?>13 <?php } } ?>
14 </ul>14 </ul>
15</<?php if (is_home() ) { echo 'li'; } else { echo 'div'; } ?>><!-- /#popular-posts -->15</<?php if (is_home() ) { echo 'li'; } else { echo 'div'; } ?>><!-- /#popular-posts -->
1616
=== modified file 'includes/_result_list_item.php'
--- includes/_result_list_item.php 2012-10-26 21:17:51 +0000
+++ includes/_result_list_item.php 2015-11-20 14:58:00 +0000
@@ -3,6 +3,5 @@
3 <h2><a href="<?php the_permalink() ?>"><?php the_title(); ?></a></h2>3 <h2><a href="<?php the_permalink() ?>"><?php the_title(); ?></a></h2>
4 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>4 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
5 <?php the_excerpt(); ?>5 <?php the_excerpt(); ?>
6 <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
7 </article>6 </article>
8 </li>7 </li>
98
=== modified file 'index.php'
--- index.php 2012-10-30 13:10:59 +0000
+++ index.php 2015-11-20 14:58:00 +0000
@@ -97,7 +97,6 @@
97 </li>97 </li>
98<?php if(is_home() && !is_paged() && $postCount == 3) { get_template_part("tweet"); } // include tweet ?>98<?php if(is_home() && !is_paged() && $postCount == 3) { get_template_part("tweet"); } // include tweet ?>
99<?php endwhile;?>99<?php endwhile;?>
100<?#php else : ?>
101<?php endif; // if have_posts ends 100<?php endif; // if have_posts ends
102 wp_reset_query();101 wp_reset_query();
103?> 102?>
@@ -105,4 +104,4 @@
105</div><!-- /#articles -->104</div><!-- /#articles -->
106105
107<?php // get_sidebar(); ?>106<?php // get_sidebar(); ?>
108<?php get_footer(); ?>
109\ No newline at end of file107\ No newline at end of file
108<?php get_footer(); ?>
110109
=== modified file 'launchpad_comments.php'
--- launchpad_comments.php 2013-03-08 12:37:09 +0000
+++ launchpad_comments.php 2015-11-20 14:58:00 +0000
@@ -108,7 +108,6 @@
108 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>108 <label for="comment">Your comment <?php if ($req) echo "(required)"; ?></label>
109 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>109 <textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea>
110 </li>110 </li>
111 <!-- <li><p><strong>XHTML:</strong> You can use these tags: <code><?#php echo allowed_tags(); ?></code></p></li> -->
112 <li>111 <li>
113 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>112 <button name="submit" type="submit" id="submit" tabindex="5">Submit Comment</button>
114 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />113 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
115114
=== modified file 'search.php'
--- search.php 2012-10-31 16:09:07 +0000
+++ search.php 2015-11-20 14:58:00 +0000
@@ -34,7 +34,6 @@
34 <h2><a href="<?php the_permalink() ?>"><?php echo $title; ?></a></h2>34 <h2><a href="<?php the_permalink() ?>"><?php echo $title; ?></a></h2>
35 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>35 <p class="result-meta"><a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><<?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></p>
36 <?php echo $excerpt; ?>36 <?php echo $excerpt; ?>
37 <?#php comments_number('No <span class="postHeaderValue">Comments</span>','1 <span class="postHeaderValue">Comment</span>','% <span class="postHeaderValue">Comments</span>'); ?>
38 </article>37 </article>
39 </li>38 </li>
40 <?php endwhile; ?>39 <?php endwhile; ?>
4140
=== modified file 'single.php'
--- single.php 2013-05-24 14:26:14 +0000
+++ single.php 2015-11-20 14:58:00 +0000
@@ -69,7 +69,6 @@
69 ?> 69 ?>
70 </li>70 </li>
71 </ul>71 </ul>
72 <!-- <p><?#php comments_popup_link('there are currently no comments', 'there is currently 1 comment', 'there are currently % comments'); ?>.</p> -->
73 <div id="share-links">72 <div id="share-links">
74 <h3>Share this article:</h3>73 <h3>Share this article:</h3>
75 <ul id="social-links" class="no-bullets">74 <ul id="social-links" class="no-bullets">
@@ -120,7 +119,7 @@
120 <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a>119 <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a>
121 <span class="clearfix">by <a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></span>120 <span class="clearfix">by <a href="/author/<?php the_author_meta('user_nicename',$uid); ?>" title="View <?php if(get_the_author_meta('first_name',$uid)): ?><?php the_author_meta('first_name',$uid); ?><?php else : ?><?php the_author_meta('display_name',$uid); ?><?php endif; ?>'s bio and posts"><?php the_author() ?></a>, <time datetime="<?php the_time('Y-m-d') ?>" pubdate><?php the_time('j') ?><sup><?php the_time('S') ?></sup><?php the_time(' F Y') ?></time></span>
122 </li>121 </li>
123<? }122<?php }
124 echo '</ul>';123 echo '</ul>';
125 echo '</div><!-- /.six-col -->';124 echo '</div><!-- /.six-col -->';
126 echo '</div><!-- /.wrapper -->';125 echo '</div><!-- /.wrapper -->';
@@ -129,9 +128,7 @@
129}128}
130$post = $orig_post;129$post = $orig_post;
131wp_reset_query(); ?>130wp_reset_query(); ?>
132 <?#php comments_rss_link('&raquo; Comments RSS Feed'); ?>
133 <?php endwhile; // while have_posts ends ?> 131 <?php endwhile; // while have_posts ends ?>
134 <?#php else : ?>
135 <?php endif; // if have_posts ends ?> 132 <?php endif; // if have_posts ends ?>
136<div class="section-wrapper<?php if (get_comments_number()==0) { echo ' no-comments'; } ?><?php $tags = wp_get_post_tags($post->ID); if ($tags) { echo ' has-related'; } ?>">133<div class="section-wrapper<?php if (get_comments_number()==0) { echo ' no-comments'; } ?><?php $tags = wp_get_post_tags($post->ID); if ($tags) { echo ' has-related'; } ?>">
137 <div class="wrapper">134 <div class="wrapper">
@@ -141,5 +138,4 @@
141 </div><!-- /.wrapper -->138 </div><!-- /.wrapper -->
142</div><!-- /.section-wrapper -->139</div><!-- /.section-wrapper -->
143</section>140</section>
144<?#php get_sidebar(); ?>
145<?php get_footer(); ?>
146\ No newline at end of file141\ No newline at end of file
142<?php get_footer(); ?>
147143
=== modified file 'team.php'
--- team.php 2012-10-26 21:17:51 +0000
+++ team.php 2015-11-20 14:58:00 +0000
@@ -70,6 +70,4 @@
70</ul>70</ul>
71</div>71</div>
7272
73<?#php get_sidebar(); ?>
74
75<?php get_footer(); ?>
76\ No newline at end of file73\ No newline at end of file
74<?php get_footer(); ?>

Subscribers

People subscribed via source and target branches