Ubuntu Developer Portal

Merge lp:~gbancroft-canonical/developer-ubuntu-com/up-to-date-update into lp:developer-ubuntu-com/wordpress

  1. up-to-date-update
  2. Merge into trunk
Proposed by Graham Bancroft
Status: Merged
Merged at revision: 66
Proposed branch: lp:~gbancroft-canonical/developer-ubuntu-com/up-to-date-update
Merge into: lp:developer-ubuntu-com/wordpress
Diff against target: 263 lines (+91/-40)
8 files modified
css/base.css (+44/-0)
css/gomobile.css (+10/-3)
header.php (+1/-1)
part-blog-latest-articles.php (+4/-1)
part-blog-latest-events.php (+3/-1)
part-social-links.php (+8/-0)
template-gomobile.php (+14/-28)
template-home.php (+7/-6)
To merge this branch: bzr merge lp:~gbancroft-canonical/developer-ubuntu-com/up-to-date-update
Reviewer Review Type Date Requested Status
David Planella Pending
Review via email: mp+149277@code.launchpad.net

Description of the change

Keep up-to-date section updates, HTML & CSS

To post a comment you must log in.
lp:~gbancroft-canonical/developer-ubuntu-com/up-to-date-update updated
65. By Graham Bancroft

Amend get involved section on go mobile page

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'css/base.css'
--- css/base.css 2012-12-21 09:38:11 +0000
+++ css/base.css 2013-02-19 14:41:25 +0000
@@ -647,3 +647,47 @@
647 padding: 2px 4px 0;647 padding: 2px 4px 0;
648 white-space: nowrap;648 white-space: nowrap;
649}649}
650
651/* keep up-to-date - latest article lists and social links */
652#keep-up h3 {
653 color: #ADA79F;
654 font-size: 16px;
655 font-weight: 300;
656}
657
658.article h4, .event h4 {
659 font-weight: normal;
660}
661
662#keep-up .article h4 a {
663 font-size: 20px;
664 margin-bottom: 10px;
665}
666
667#keep-up .article p {
668 font-size: 16px;
669 margin-bottom: 5px;
670}
671
672#keep-up .event h4 a {
673 font-size: 16px;
674}
675
676#keep-up .box-clear time {
677 padding-bottom: 7px;
678}
679
680#keep-up .social-links {
681 margin-top: 20px;
682}
683
684#keep-up .social-links a {
685 padding: 4px 0 4px 24px;
686}
687
688#keep-up .social-links a.link-twitter { background: url(../img/icon-twitter.png) 0 50% no-repeat; }
689
690#keep-up .social-links a.link-facebook { background: url(../img/icon-facebook.png) 0 50% no-repeat; }
691
692#keep-up .social-links a.link-google-plus { background: url(../img/icon-google-plus.png) 0 50% no-repeat; }
693
650694
=== modified file 'css/gomobile.css'
--- css/gomobile.css 2012-12-24 14:25:43 +0000
+++ css/gomobile.css 2013-02-19 14:41:25 +0000
@@ -315,9 +315,6 @@
315 width: 850px;315 width: 850px;
316 margin: 5px 0px 0px 20px;316 margin: 5px 0px 0px 20px;
317}317}
318#step-get-involved {
319 margin-bottom: 20px;
320}
321.step a {318.step a {
322 margin-top: 20px; 319 margin-top: 20px;
323}320}
@@ -325,3 +322,13 @@
325 margin: 30px 0 0 40px;322 margin: 30px 0 0 40px;
326 float: left;323 float: left;
327}324}
325
326#get-involved {
327 background: url(../img/pictogram-love-heart.jpg) 92% 50% no-repeat;
328 margin-bottom: 20px;
329 margin-top: 20px;
330}
331
332#get-involved p {
333 padding-right: 20px;
334}
328335
=== modified file 'header.php'
--- header.php 2012-06-22 16:51:34 +0000
+++ header.php 2013-02-19 14:41:25 +0000
@@ -7,7 +7,7 @@
77
8<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>8<title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
99
10<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic">10<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:300,400,400italic">
11<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu+Mono:400">11<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu+Mono:400">
12<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/reset.css" />12<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/reset.css" />
13<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/960.css" />13<link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/960.css" />
1414
=== added file 'img/icon-facebook.png'
15Binary files img/icon-facebook.png 1970-01-01 00:00:00 +0000 and img/icon-facebook.png 2013-02-19 14:41:25 +0000 differ15Binary files img/icon-facebook.png 1970-01-01 00:00:00 +0000 and img/icon-facebook.png 2013-02-19 14:41:25 +0000 differ
=== added file 'img/icon-google-plus.png'
16Binary files img/icon-google-plus.png 1970-01-01 00:00:00 +0000 and img/icon-google-plus.png 2013-02-19 14:41:25 +0000 differ16Binary files img/icon-google-plus.png 1970-01-01 00:00:00 +0000 and img/icon-google-plus.png 2013-02-19 14:41:25 +0000 differ
=== added file 'img/pictogram-love-heart.jpg'
17Binary files img/pictogram-love-heart.jpg 1970-01-01 00:00:00 +0000 and img/pictogram-love-heart.jpg 2013-02-19 14:41:25 +0000 differ17Binary files img/pictogram-love-heart.jpg 1970-01-01 00:00:00 +0000 and img/pictogram-love-heart.jpg 2013-02-19 14:41:25 +0000 differ
=== modified file 'part-blog-latest-articles.php'
--- part-blog-latest-articles.php 2012-12-18 15:15:10 +0000
+++ part-blog-latest-articles.php 2013-02-19 14:41:25 +0000
@@ -3,7 +3,10 @@
3$args = array('numberposts' => 3, 'category' => $category_id);3$args = array('numberposts' => 3, 'category' => $category_id);
4$posts = get_posts($args);4$posts = get_posts($args);
5foreach ($posts as $post): ?>5foreach ($posts as $post): ?>
6 <a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a>6<div class="article">
7 <h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a></h4>
8 <?php if (has_excerpt() ) { the_excerpt(); } ?>
7 <time datetime="<?php echo get_the_date('Y-m-d') ?>"><?php echo get_the_date('d F Y'); ?></time>9 <time datetime="<?php echo get_the_date('Y-m-d') ?>"><?php echo get_the_date('d F Y'); ?></time>
10</div>
8<?php endforeach; ?>11<?php endforeach; ?>
9<a href="/?&amp;feed=rss2"><div class="rss">App developer blog &rsaquo;</div></a>12<a href="/?&amp;feed=rss2"><div class="rss">App developer blog &rsaquo;</div></a>
1013
=== modified file 'part-blog-latest-events.php'
--- part-blog-latest-events.php 2012-12-18 15:15:10 +0000
+++ part-blog-latest-events.php 2013-02-19 14:41:25 +0000
@@ -3,8 +3,10 @@
3$args = array('numberposts' => 3, 'category' => $category_id);3$args = array('numberposts' => 3, 'category' => $category_id);
4$posts = get_posts($args);4$posts = get_posts($args);
5foreach ($posts as $post): ?>5foreach ($posts as $post): ?>
6 <a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a>6<div class="event">
7 <h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a></h4>
7 <span class="location"><?php echo get_post_meta($post->ID, 'location', true); ?></span> 8 <span class="location"><?php echo get_post_meta($post->ID, 'location', true); ?></span>
8 <time datetime="<?php echo date('Y-m-d', strtotime(str_replace(',', '', get_post_meta($post->ID, 'date-start', true)))); ?>"><?php echo get_post_meta($post->ID, 'date-start', true); ?> &ndash; <?php echo get_post_meta($post->ID, 'date-end', true); ?></time>9 <time datetime="<?php echo date('Y-m-d', strtotime(str_replace(',', '', get_post_meta($post->ID, 'date-start', true)))); ?>"><?php echo get_post_meta($post->ID, 'date-start', true); ?> &ndash; <?php echo get_post_meta($post->ID, 'date-end', true); ?></time>
10</div>
9<?php endforeach; ?>11<?php endforeach; ?>
10<a href="/?cat=<?php echo $category_id; ?>&amp;feed=rss2"><div class="rss">All upcoming events &rsaquo;</div></a>12<a href="/?cat=<?php echo $category_id; ?>&amp;feed=rss2"><div class="rss">All upcoming events &rsaquo;</div></a>
1113
=== added file 'part-social-links.php'
--- part-social-links.php 1970-01-01 00:00:00 +0000
+++ part-social-links.php 2013-02-19 14:41:25 +0000
@@ -0,0 +1,8 @@
1<div class="social-links box-clear">
2 <h3>Follow us on:</h3>
3 <ul>
4 <li><a class="link-twitter" href="http://twitter.com/ubuntuappdev">Twitter &rsaquo;</a></li>
5 <li><a class="link-facebook" href="#">Facebook &rsaquo;</a></li>
6 <li><a class="link-google-plus" href="#">Google+ &rsaquo;</a></li>
7 </ul>
8</div>
0\ No newline at end of file9\ No newline at end of file
110
=== modified file 'template-gomobile.php'
--- template-gomobile.php 2013-02-13 13:10:48 +0000
+++ template-gomobile.php 2013-02-19 14:41:25 +0000
@@ -6,8 +6,6 @@
6?>6?>
77
8<?php get_header(); ?>8<?php get_header(); ?>
9
10
11 <div class="grid-12"> 9 <div class="grid-12">
12 <div class="box clearfix">10 <div class="box clearfix">
13 <h2>The best tools to unlock your creativity</h2>11 <h2>The best tools to unlock your creativity</h2>
@@ -130,49 +128,37 @@
130 </div>128 </div>
131 </div>129 </div>
132130
133 <div id="step-get-involved" class="step clearfix">131 <div id="get-involved" class="box clearfix">
134 <span class="number">5</span>132 <div class="grid-8">
135 <div>
136 <h2>Get involved</h2>133 <h2>Get involved</h2>
137 <div class="infobox">134 <p>The phone and tablet are a huge milestone in the Ubuntu project. One that has generated a huge amount of excitement and received lots of attention. But this is just the beginning.</p>
138 <?php $gomobile_form_shortcode = get_post_meta($post->ID, 'gomobile_form_shortcode', true);135 <p>It&rsquo;s all about creating the technology of the future for the leading free operating system. The same technology that will power the next million Ubuntu phones and tablets. It&rsquo;s about being part of the action and providing input, review and working closely with the best experts in the design and development teams for Ubuntu.</p>
139 if (empty($gomobile_form_shortcode)) {136 <p>We hope you think this is exciting and want to join us in this journey. If you want, tell us a bit about yourself and what you are doing and we can use your email to tell you about key moments along the way.</p>
140 $gomobile_form_shortcode = "[contact-form-7 id='3694' title='Skunkworks']";137 <p><a href="https://forms.canonical.com/capetown-dev/">Tell us what you are working on &rsaquo;</a></p>
141 } ?>
142 <p><?php echo do_shortcode($gomobile_form_shortcode); ?></p>
143 </div>
144 <p>The phone is a huge milestone in the Ubuntu project. One that will generate a huge amount of excitement and get lots of attention. But this is just the beginning.</p>
145
146 <p>There are a few projects related to Ubuntu on the phone that are currently in the works, and we’d like to engage with community members that are interested in contributing to those projects before they are unveiled.</p>
147
148 <p>It’s all about creating the technology of the future for the leading free operating system. The same technology that will power the next million Ubuntu phones. It’s about being part of the action and providing input, review and working closely with the best experts in the design and development teams for Ubuntu.</p>
149
150 <p>If you think this is exciting and want to join us in this journey, tell us a bit about yourself and your areas of expertise in the form on the side.</p>
151
152 <p>Do get in touch, we’re looking forward to working together!</p>
153 </div>138 </div>
154 </div>139 </div>
155140
156 </div>141 </div>
157142
158 <div class="grid-12">143 <div id="keep-up" class="grid-12">
159 <h2>Keep up-to-date</h2>144 <h2>Keep up-to-date</h2>
160145
161 <div class="grid-4 alpha border">146 <div class="grid-6 alpha border">
162 <h3>Latest from the blog</h3>147 <h3>Latest from the blog:</h3>
163 <div class="box-clear border">148 <div class="box-clear border">
164 <?php get_template_part('part', 'blog-latest-articles'); ?>149 <?php get_template_part('part', 'blog-latest-articles'); ?>
165 </div>150 </div>
166 </div>151 </div>
167152
168 <div class="grid-4">153 <div class="grid-3">
169 <h3>Latest events</h3>154 <h3>Latest events:</h3>
170 <div class="box-clear">155 <div class="box-clear">
171 <?php get_template_part('part', 'blog-latest-events'); ?>156 <?php get_template_part('part', 'blog-latest-events'); ?>
157 <?php get_template_part('part', 'social-links'); ?>
172 </div>158 </div>
173 </div>159 </div>
174160
175 <div class="grid-4 omega">161 <div class="grid-3 omega">
176 <div class="box-clear">162 <div class="box-clear">
177 <div class="container-tweet">163 <div class="container-tweet">
178 <div class="tweet clearfix"></div>164 <div class="tweet clearfix"></div>
@@ -182,4 +168,4 @@
182 </div>168 </div>
183 </div>169 </div>
184170
185<?php get_footer(); ?>171<?php get_footer(); ?>
186\ No newline at end of file172\ No newline at end of file
187173
=== modified file 'template-home.php'
--- template-home.php 2013-02-13 11:36:32 +0000
+++ template-home.php 2013-02-19 14:41:25 +0000
@@ -152,24 +152,25 @@
152 </div>152 </div>
153 </div>153 </div>
154154
155 <div class="grid-12">155 <div id="keep-up" class="grid-12">
156 <h2>Keep up-to-date</h2>156 <h2>Keep up-to-date</h2>
157157
158 <div class="grid-4 alpha border">158 <div class="grid-6 alpha border">
159 <h3>Latest from the blog</h3>159 <h3>Latest from the blog:</h3>
160 <div class="box-clear border">160 <div class="box-clear border">
161 <?php get_template_part('part', 'blog-latest-articles'); ?>161 <?php get_template_part('part', 'blog-latest-articles'); ?>
162 </div>162 </div>
163 </div>163 </div>
164164
165 <div class="grid-4">165 <div class="grid-3">
166 <h3>Latest events</h3>166 <h3>Latest events:</h3>
167 <div class="box-clear">167 <div class="box-clear">
168 <?php get_template_part('part', 'blog-latest-events'); ?>168 <?php get_template_part('part', 'blog-latest-events'); ?>
169 <?php get_template_part('part', 'social-links'); ?>
169 </div>170 </div>
170 </div>171 </div>
171172
172 <div class="grid-4 omega">173 <div class="grid-3 omega">
173 <div class="box-clear">174 <div class="box-clear">
174 <div class="container-tweet">175 <div class="container-tweet">
175 <div class="tweet clearfix"></div>176 <div class="tweet clearfix"></div>

Subscribers

People subscribed via source and target branches