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

[Graham Bancroft]

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

[lp:~gbancroft-canonical/developer-ubuntu-com/up-to-date-update]

65. By Graham Bancroft on 2013-02-19

Amend get involved section on go mobile page

=== 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 @@
     padding: 2px 4px 0;
     white-space: nowrap;
 }
+
+/* keep up-to-date - latest article lists and social links */
+#keep-up h3 {
+	color: #ADA79F;
+	font-size: 16px;
+	font-weight: 300;
+}
+
+.article h4, .event h4 {
+	font-weight: normal;
+}
+
+#keep-up .article h4 a {
+	font-size: 20px;
+	margin-bottom: 10px;
+}
+
+#keep-up .article p {
+	font-size: 16px;
+	margin-bottom: 5px;
+}
+
+#keep-up .event h4 a {
+	font-size: 16px;
+}
+
+#keep-up .box-clear time {
+	padding-bottom: 7px;
+}
+
+#keep-up .social-links {
+	margin-top: 20px;
+}
+
+#keep-up .social-links a {
+	padding: 4px 0 4px 24px;
+}
+
+#keep-up .social-links a.link-twitter {	background: url(../img/icon-twitter.png) 0 50% no-repeat; }
+
+#keep-up .social-links a.link-facebook { background: url(../img/icon-facebook.png) 0 50% no-repeat; }
+
+#keep-up .social-links a.link-google-plus { background: url(../img/icon-google-plus.png) 0 50% no-repeat; }
+

=== 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 @@
 	width: 850px;
 	margin: 5px 0px 0px 20px;
 }
-#step-get-involved {
-	margin-bottom: 20px;
-}
 .step a {
 	margin-top: 20px;	
 }
@@ -325,3 +322,13 @@
 	margin: 30px 0 0 40px;
 	float: left;
 }
+
+#get-involved {
+	background: url(../img/pictogram-love-heart.jpg) 92% 50% no-repeat;
+	margin-bottom: 20px;
+	margin-top: 20px;
+}
+
+#get-involved p {
+	padding-right: 20px;
+}

=== 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 @@
 
 <title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
 
-<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic">
+<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:300,400,400italic">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu+Mono:400">
 <link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/reset.css" />
 <link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/960.css" />

=== added file 'img/icon-facebook.png'
Binary 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'
Binary 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'
Binary 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 @@
 $args = array('numberposts' => 3, 'category' => $category_id);
 $posts = get_posts($args);
 foreach ($posts as $post): ?>
-	<a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a>
+<div class="article">
+	<h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a></h4>
+	<?php if (has_excerpt() ) { the_excerpt(); } ?>
 	<time datetime="<?php echo get_the_date('Y-m-d') ?>"><?php echo get_the_date('d F Y'); ?></time>
+</div>
 <?php endforeach; ?>
 <a href="/?&amp;feed=rss2"><div class="rss">App developer blog &rsaquo;</div></a>

=== 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 @@
 $args = array('numberposts' => 3, 'category' => $category_id);
 $posts = get_posts($args);
 foreach ($posts as $post): ?>
-	<a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a>
+<div class="event">
+	<h4><a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a></h4>
 	<span class="location"><?php echo get_post_meta($post->ID, 'location', true); ?></span>	
 	<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>
+</div>
 <?php endforeach; ?>
 <a href="/?cat=<?php echo $category_id; ?>&amp;feed=rss2"><div class="rss">All upcoming events &rsaquo;</div></a>

=== 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 @@
+<div class="social-links box-clear">
+	<h3>Follow us on:</h3>
+	<ul>
+		<li><a class="link-twitter" href="http://twitter.com/ubuntuappdev">Twitter &rsaquo;</a></li>
+		<li><a class="link-facebook" href="#">Facebook &rsaquo;</a></li>
+		<li><a class="link-google-plus" href="#">Google+ &rsaquo;</a></li>
+	</ul>
+</div>
\ No newline at end of file

=== 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 @@
 ?>
 
 <?php get_header(); ?>
-
-	
 	<div class="grid-12">	
 		<div class="box clearfix">
 			<h2>The best tools to unlock your creativity</h2>
@@ -130,49 +128,37 @@
 					</div>
 				</div>
 
-				<div id="step-get-involved" class="step clearfix">
-				<span class="number">5</span>
-					<div>
+				<div id="get-involved" class="box clearfix">
+					<div class="grid-8">
 						<h2>Get involved</h2>
-						<div class="infobox">
-						<?php $gomobile_form_shortcode = get_post_meta($post->ID, 'gomobile_form_shortcode', true);
-		                    if (empty($gomobile_form_shortcode)) {
-	   							$gomobile_form_shortcode = "[contact-form-7 id='3694' title='Skunkworks']";
-	   						} ?>
-						<p><?php echo do_shortcode($gomobile_form_shortcode); ?></p>
-						</div>
-						<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>
-
-                        <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>
-
-                        <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>
-
-                        <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> 
-                        
-                        <p>Do get in touch, we’re looking forward to working together!</p>
+							<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>
+							<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>
+							<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> 
+							<p><a href="https://forms.canonical.com/capetown-dev/">Tell us what you are working on &rsaquo;</a></p>
 					</div>
 				</div>
 
 			</div>
 
-	<div class="grid-12">
+	<div id="keep-up" class="grid-12">
 		<h2>Keep up-to-date</h2>
 
-		<div class="grid-4 alpha border">
-			<h3>Latest from the blog</h3>
+		<div class="grid-6 alpha border">
+			<h3>Latest from the blog:</h3>
 			<div class="box-clear border">
 				<?php get_template_part('part', 'blog-latest-articles'); ?>
 			</div>
 		</div>
 
-		<div class="grid-4">
-			<h3>Latest events</h3>
+		<div class="grid-3">
+			<h3>Latest events:</h3>
 			<div class="box-clear">
 				<?php get_template_part('part', 'blog-latest-events'); ?>
+				<?php get_template_part('part', 'social-links'); ?>
 			</div>
 		</div>
 
-		<div class="grid-4 omega">
+		<div class="grid-3 omega">
 			<div class="box-clear">
 				<div class="container-tweet">
 					<div class="tweet clearfix"></div>
@@ -182,4 +168,4 @@
 		</div>
 	</div>
 
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file

=== 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 @@
 		</div>
 	</div>
 
-	<div class="grid-12">
+	<div id="keep-up" class="grid-12">
 		<h2>Keep up-to-date</h2>
 
-		<div class="grid-4 alpha border">
-			<h3>Latest from the blog</h3>
+		<div class="grid-6 alpha border">
+			<h3>Latest from the blog:</h3>
 			<div class="box-clear border">
 				<?php get_template_part('part', 'blog-latest-articles'); ?>
 			</div>
 		</div>
 
-		<div class="grid-4">
-			<h3>Latest events</h3>
+		<div class="grid-3">
+			<h3>Latest events:</h3>
 			<div class="box-clear">
 				<?php get_template_part('part', 'blog-latest-events'); ?>
+				<?php get_template_part('part', 'social-links'); ?>
 			</div>
 		</div>
 
-		<div class="grid-4 omega">
+		<div class="grid-3 omega">
 			<div class="box-clear">
 				<div class="container-tweet">
 					<div class="tweet clearfix"></div>