Merge lp:~gbancroft-canonical/juju-website/homepage-redesign into lp:~jorge/juju-website/juju-website

[Graham Bancroft]

Implement new home page design. Add new home page contextual footer styles to 'Community' section.

=== modified file 'COPYING' (properties changed: -x to +x)
=== modified file 'css/base.css'
--- css/base.css	2012-12-04 16:42:26 +0000
+++ css/base.css	2013-06-27 15:13:40 +0000
@@ -12,18 +12,23 @@
 /**
 * @section Global
 */
-
+html { background: #f7f7f7; }
 body {
+	background: #fff;
 	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
-	font-size: 13px;
-	line-height: 1.4;
+	font-size: 16px;
+	line-height: 1.5;
 	color: #333;
+	font-weight: 300;
 }
 a {
 	color: #dd4814;
 	text-decoration: none;
 	outline: 0;
 }
+a:hover {
+	text-decoration: underline;
+}
 p, dl {
 	margin-bottom: 10px;
 }
@@ -43,33 +48,129 @@
 		-webkit-border-radius: 4px;
 	border-radius: 4px;
 }
+h1, h2, h3, h4 { 
+	font-weight: 300;
+	line-height: 1.3; 
+}
 h1 {
 	font-size: 36px;
-	line-height: 1.1;
 	margin-bottom: 20px;
 }
 article h1,
 h2 {
 	font-size: 24px;
-	line-height: 1.2;
 	margin-bottom: 14px;
 }
+article h1 a:hover {
+	text-decoration: underline;
+}
 h3 {
 	font-size: 16px;
-	line-height: 1.3;
 	margin-bottom: 8px;
 }
-h4 {
-	font-weight: bold;
-}
 
 time {
 	color:#999;
 }
 
+/* .list */
+#content .list {
+	margin-left: 0;
+	padding-left: 0;
+}
+		
+#content .list li {
+  border-bottom: 1px dotted #aea79f;
+	list-style: none !important;
+  margin-bottom: 0;
+  padding: 10px 0;
+	margin-left: 0 !important;
+}
+
+#content .list li:first-of-type, 
+#content .list li.first-item,
+#content .list li.first-child { 
+	padding-top: 0;
+}
+
+#content .list li:last-of-type, 
+#content .list li.last-item { 
+  border: 0;
+  padding-bottom: 0;
+}
+
 /**
 * @section Structure
 */
+.row {
+	border-bottom: 1px dotted #aea79f;
+	clear: both;
+	padding-top: 40px;
+	padding-bottom: 40px;
+	display: block;
+	float: left;
+	width: 100%;
+}
+
+.row:after { 
+   content: "."; 
+   visibility: hidden; 
+   display: block; 
+   height: 0; 
+   clear: both;
+}
+
+.row-grey {
+  background: #f7f7f7;
+}
+
+.no-border {
+	border-bottom: 0;
+}
+
+.inner-wrapper {
+	margin: 0 auto;
+	overflow: visible;
+	position: relative;
+	width: 940px;
+}
+
+.no-padding-bottom {
+	padding-bottom: 0;
+}
+
+/* vertical-divider */
+.vertical-divider > div,
+.vertical-divider > li {
+  border-right: 1px dotted #aea79f;
+  margin-right: 0;
+  padding-right: 20px;
+  padding-left: 20px;
+  float: none;
+  display: table-cell;
+  vertical-align: top;
+}
+.vertical-divider > div:last-child,
+.vertical-divider > li:last-child,
+.vertical-divider > div.last-col,
+.vertical-divider > li.last-col,
+.vertical-divider > div.omega,
+.vertical-divider > li.omega,
+.vertical-divider > div:last-of-type,
+.vertical-divider > li:last-of-type {
+  border-right: 0;
+  padding-right: 0;
+}
+.vertical-divider > div:first-child,
+.vertical-divider > li:first-child,
+.vertical-divider > div.first-col,
+.vertical-divider > div.alpha,
+.vertical-divider > li.alpha,
+.vertical-divider > li.first-col,
+.vertical-divider > div:first-of-type,
+.vertical-divider > li:first-of-type {
+  padding-left: 0;
+}
 
 .header-login,
 .header-navigation div,
@@ -100,7 +201,6 @@
 	color: #333;
 }
 .header-navigation {
-	border-top: 2px solid #dd4814;
 	border-bottom: 2px solid #dd4814;
 	background-color: #fff;
 	height: 54px;
@@ -124,6 +224,7 @@
 }
 .header-navigation nav a:hover {
 	background-color: #fcece7;
+	text-decoration: none;
 }
 .header-navigation nav .current_page_item a,
 .header-navigation nav .current_page_parent a,
@@ -157,6 +258,7 @@
 }
 .header-navigation .logo-ubuntu {
 	float: left;
+	padding-top: 7px;
 }
 .header-content .header-navigation-secondary {
 	margin-bottom: 40px;
@@ -176,12 +278,16 @@
 }
 .header-navigation-secondary nav li {
 	float: left;
+	font-size: 14px;
 }
 .header-navigation-secondary nav li a {
 	color: #333;
 	display: block;
 	height: 25px;
-	padding: 8px 8px 0;
+	padding: 8px 8px 2px;
+}
+.header-navigation-secondary nav li a:hover {
+	text-decoration: none;
 }
 .header-navigation-secondary nav li:hover,
 .header-navigation-secondary nav .current_page_item a {
@@ -198,43 +304,60 @@
 	overflow: hidden;
 }
 footer {
-	padding: 10px 10px 40px 10px;
 	position: relative;
-		-moz-border-radius: 0 0 4px 4px;
-		-webkit-border-radius: 0 0 4px 4px;
-	border-radius: 0 0 4px 4px;
 	font-size: 12px;
-	background: url("../img/background-footer.png") repeat scroll 0 0 #f7f6f5;
-}
-footer div {
-	margin: 0 auto;
-    padding: 0 10px;
-    width: 940px;
+	background: #f7f7f7;
+}
+footer .row {
+	border-bottom: 1px solid #d8d8d8;
+	padding-top: 30px;
+	padding-bottom: 30px;
+}
+footer .no-border {
+	border: 0;
 }
 footer a {
-	color: #000;
-}
-footer nav ul {
+	color: #333;
+}
+footer nav ul.footer-a {
+	display: table;
+	width: 100%;
+}
+footer nav li.grid-3 {
+	border-right: 1px dotted #aea79f;
 	margin: 10px 17px 30px 0;
 	width: 172px;
-	display: inline-block;
+	display: table-cell;
 	vertical-align: top;
-	height: auto;
+	padding-left: 20px;
 	zoom: 1;
-	*display: inline;
-}
-footer nav ul.last {
+	float: none;
+}
+footer nav li.first-col {
+	padding-left: 0;
+}
+footer nav li.last-col {
+	border-right: 0;
 	margin-right: 0;
 }
+footer nav li h4 {
+	font-weight: normal;
+	margin-bottom: 10px;
+}
 footer nav li {
-	margin-bottom: 8px;
-}
-footer nav li:first-child {
-	font-weight: bold;
+	margin-bottom: 5px;
 }
 footer p {
 	margin-bottom: 0;
 }
+footer p a:hover {
+	color: #dd4814;
+	text-decoration: underline;
+}
+footer .legal {
+	background: url(../img/logo-ubuntu-grey.png) 100% 0 no-repeat;
+	padding-bottom: 20px;	
+}
 #content {
 	padding-top: 35px;
 }
@@ -253,6 +376,12 @@
 	height: 3px;
 }
 
+.home-new #content,
+.community #content {
+	width: 100%;
+	padding-top: 0;
+}
+
 /**
 * @section Site-wide
 */
@@ -318,6 +447,35 @@
 	height:48px;
 }
 
+.link-cta-ubuntu{
+  	-moz-border-radius: 4px;
+  	-webkit-border-radius: 4px;
+  background-color: #dd4814;
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#dd4814), to(#c03f11));
+  background-image: -webkit-linear-gradient(#dd4814, #c03f11);
+  background-image: 	-moz-linear-gradient(#dd4814, #c03f11);
+  background-image: 		-o-linear-gradient(#dd4814, #c03f11);
+  border-radius: 4px;
+	color: #fff;
+	display: inline-block;
+	font-size: 18px;
+	font-weight: 300;
+	margin: 0;
+	padding: 6px 10px;
+	text-decoration:none;
+  font-family: Ubuntu, Arial, "libra sans", sans-serif;
+}
+
+.link-cta-ubuntu:hover {
+  background: #dd4814;
+  text-decoration: none;
+}
+
+a.cta-large {
+	font-size: 20px;
+	padding: 10px 20px;
+}
+
 .link-action-small {
 	float: left;
 	display: block;
@@ -468,7 +626,7 @@
 	border-top: 1px dotted #aea79f;
 	position: relative;
 	font-size: 13px;
-	font-weight: bold;
+	font-weight: normal;
 }
 .ui-accordion h3 a {
 	padding: 10px 0;
@@ -500,26 +658,24 @@
 	color: #333;
 }
 .container-tweet {
-		-moz-border-radius: 4px 4px 4px 4px;
-		-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	padding: 10px 10px 10px;
-	background-color: #f7f7f7;
+	padding: 5px 0 10px;
 }
 .container-tweet .tweet-follow {
-	margin-top: 10px;
-	margin-bottom: -10px;
 	padding-left: 55px;
 	padding-bottom: 6px;
 	background: url("../img/tweet-follow.png") 0 5px no-repeat;
 	display: block;
+	font-size: 13px;
 }
 .container-tweet .tweet-follow span {
 	font-size: 16px;
-	font-weight: bold;
+	font-weight: normal;
 	line-height: 1.2;
 	display: block;
 }
+.tweet {
+	margin-bottom: -30px;
+}
 .tweet a {
 	display: inline;
 }
@@ -537,7 +693,7 @@
 .tweet.tweet-small .tweet_text {
 	font-size: inherit;
 }
-.tweet .tweet_text a {
+.tweet .tweet_text, .tweet .tweet_time a {
 	color: #333;
 }
 .tweet .tweet_time,
@@ -644,11 +800,18 @@
   box-shadow: 0 0 0;
   border-radius: 0px;
   border: 0;
-  font-size: 13px;
+  font-size: 16px;
+  line-height: 1.5;
   padding: 0;
   margin: 0;
 }
 
+.stacktack.stacktack-container .heading {
+	color: #333;
+	font-size: 24px;
+	font-weight: 300;
+}
+
 .stacktack.stacktack-container a, .stacktack.stacktack-container a:hover{
   color: #DD4814;
 }
@@ -677,3 +840,43 @@
 .stacktack.stacktack-container img {
   max-width: 940px;
 }
+
+hr {
+	background: #dd4814;
+	height: 14px;
+	margin: 0;
+	border: 0;
+		-moz-	box-shadow: inset 0 2px 2px -2px #333;
+		-webkit	box-shadow: inset 0 2px 2px -2px #333;
+	box-shadow: inset 0 2px 2px -2px #333; 
+	clear: both;
+}
+
+/* contextual-footer */
+#content #contextual-footer {
+	margin-bottom: 10px;
+}
+#content #contextual-footer, #content #contextual-footer h2 {
+	font-size: 13px;
+}
+#content #contextual-footer h2 {
+	font-weight: normal;
+}
+
+#content #contextual-footer ul {
+	margin-bottom: 20px;
+}
+
+#content #contextual-footer ul li {
+	padding: 3px 0;
+}
+
+#content #contextual-footer ul.list li {
+  padding: 10px 0;
+}
+
+#content #contextual-footer .list li:first-of-type,
+#content #contextual-footer .list li.first-item,
+#content #contextual-footer .list li.first-child { 
+	padding-top: 0;
+}
 
=== modified file 'css/blog-community.css'
--- css/blog-community.css	2012-12-04 16:42:26 +0000
+++ css/blog-community.css	2013-06-27 15:13:40 +0000
@@ -18,6 +18,10 @@
 	padding-top: 15px;
 	margin-bottom: 60px;
 }
+article:first-of-type {
+	border: 0;
+	padding-top: 0;
+}
 article.no-results {
 	border-top: none;
 }
 
=== modified file 'css/community.css'
--- css/community.css	2012-12-04 16:42:26 +0000
+++ css/community.css	2013-06-27 15:13:40 +0000
@@ -23,11 +23,11 @@
 	background: #fff;
 }
 .community .header-image {
-	background: url("../img/dotted-logo.png") no-repeat scroll 122px -24px transparent;
+	/*background: url("../img/dotted-logo.png") no-repeat scroll 122px -24px transparent;*/
 	float: right;
     height: 329px;
     margin-bottom: -35px;
-    margin-right: -183px;
+    margin-right: -163px;
     margin-top: -88px;
     width: 591px;
 	position: relative;
@@ -62,6 +62,7 @@
 	padding-bottom: 10px;
 }
 .box h2 {
+	font-size: 18px;
 	margin-bottom: 30px;
 }
 .box .link-action {
@@ -80,27 +81,30 @@
 	border-right: 0;
 	padding: 0px;
 	padding-right:5px;
+	font-size: 14px;
 }
 .box-padded li a{
+	background-position: 0 4px;
+	background-repeat: no-repeat;
 	display:block;
 	padding: 0 0 10px 26px;
 	border-bottom: 1px dotted #aea79f;
 	margin: 10px 10px 0 0;
 }
 .box-padded li .irc {
-	background: url("../img/icon-irc.png") no-repeat;
+	background-image: url("../img/icon-irc.png");
 }
 .box-padded li .mail {
-	background: url("../img/icon-mail.png") no-repeat;
+	background-image: url("../img/icon-mail.png");
 }
 .box-padded li .rss {
-	background: url("../img/icon-rss.png") no-repeat;	
+	background-image: url("../img/icon-rss.png");	
 }
 .box-padded li .twitter {
-	background: url("../img/icon-twitter.png") no-repeat;
+	background-image: url("../img/icon-twitter.png");
 }
 .box-padded li .forum {
-	background: url("../img/icon-forum.png") no-repeat;
+	background-image: url("../img/icon-forum.png");
 }
 .box-padded li.last {
 	border: 0;
 
=== added file 'css/home-new.css'
--- css/home-new.css	1970-01-01 00:00:00 +0000
+++ css/home-new.css	2013-06-27 15:13:40 +0000
@@ -0,0 +1,104 @@
+/**
+* Ubuntu Developer page stylesheet
+*
+* A stylesheet for the 'home' page
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards and Ant Dillon
+* @copyright 2011 Canonical Ltd.
+*/
+.home-new #content h2 {
+	font-size:32px;
+}
+
+.home-new header {
+	background: #fff;
+}
+.home-new .header-content {
+	background: url("../img/background-header-home.png") 0 0 repeat #fff;
+}
+.home-new .header-content .intro {
+	background: #fff;
+}
+.home-new .header-content a.link-cta-ubuntu{
+	margin-top: 20px;
+	font-size: 21px;
+}
+.home-new .header-content p {
+	font-size: 20px;
+}
+.home-new .header-content p:last-child {
+	font-size: 16px;
+}
+.home-new .header-image {
+	float: right;
+	text-align: right;
+}
+.home-new .header-image img {
+		-moz-box-shadow: 0 9px 4px 4px #e0e0e0;
+		-webkit-box-shadow: 0 9px 4px 4px #e0e0e0;
+	box-shadow: 0 9px 4px 4px #e0e0e0;
+	margin-bottom: -74px;
+    margin-left: -52px;
+    margin-top: 77px;
+}
+
+/* Play with juju */
+.home-new .juju-play {
+	height: 313px;
+}
+
+.home-new .juju-play img {
+	float: left;	
+	margin-right: 40px;
+	margin-left: -7px;
+}
+
+.home-new .juju-play p {
+	font-size: 20px;
+	padding-right: 20px;
+}
+
+.home-new .container-tweet {
+	background: none;
+}
+
+/* charm-list */
+.home-new .charm-list {
+	border-bottom: 1px dotted #aea79f;
+	margin-left: 0;
+	margin-bottom: 30px;
+	padding-bottom: 30px;
+	margin-top: 20px;
+}
+
+.home-new .last-list {
+	border: 0;
+	margin: 0;
+	padding-bottom: 0;
+}
+
+.home-new .charm-list li {
+	width: 285px;
+	float: left;
+	min-height: 200px;
+	display: inline-block;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+.home-new .charm-list li h4 a {
+	color: #333;
+	font-size: 20px;
+}	
+
+.home-new .charm-list li h4 a:hover {
+	color: #dd4814;
+}
+
+.home-new .charm-list img {
+	vertical-align: middle;
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
 \ No newline at end of file
 
=== modified file 'css/home.css'
--- css/home.css	2013-01-04 20:49:34 +0000
+++ css/home.css	2013-06-27 15:13:40 +0000
@@ -69,7 +69,7 @@
 	width: 203px;
 	border-right: 1px solid #dd4814;
 	text-align: center;
-	min-height: 237px;
+	min-height: 294px;
 }
 .box-steps li.last {
 	border: 0;
 
=== modified file 'footer.php'
--- footer.php	2013-05-16 14:53:57 +0000
+++ footer.php	2013-06-27 15:13:40 +0000
@@ -1,35 +1,51 @@
 </div><!-- /#content -->
 
 <div class="shadow"></div>
-<footer>
-	<div>
-		<nav role="navigation" class="clearfix">
-			<ul>
-				<li><a href="/get-started">Get started</a></li>
-				<?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>
-			</ul>
-			<ul>
-				<li><a href="/resources">Resources</a></li>
-				<li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
-				<li><a href="/resources/videos/">Videos</a></li>
-				<li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
-			</ul>
-			<ul>
-				<li><a href="/community">Community</a></li>
-				<?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=13'); ?>
-				<li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
-				<li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
-				<li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
-
-			</ul>
-			<ul class="last">
-				<li><a href="https://launchpad.net/juju">Code</a></li>
-				<li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
-				<li><a href="https://launchpad.net/charms">Charms</a></li>
-			</ul>
-		</nav>
-		<p>&copy; <?php echo date('Y'); ?> Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd. <a class="link-bug" href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
-	</div>
+<footer class="global clearfix" role="contentinfo">
+	<div class="row">
+		<div class="inner-wrapper">
+			<nav role="navigation" class="clearfix">
+				<ul class="footer-a">
+					<li class="grid-3 first-col">
+						<h4><a href="/get-started">Get started</a></h4>
+						<ul>
+							<?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>
+						</ul>
+					</li>
+					<li class="grid-3">
+						<h4><a href="/resources">Resources</a></h4>
+						<ul>
+							<li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
+							<li><a href="/resources/videos/">Videos</a></li>
+							<li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
+						</ul>
+					</li>
+					<li class="grid-3">
+						<h4><a href="/community">Community</a></h4>
+						<ul>
+							<?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=13'); ?>
+							<li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
+							<li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
+							<li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
+						</ul>
+					</li>
+					<li class="grid-3 last-col">
+						<h4><a href="https://launchpad.net/juju">Code</a></h4>
+						<ul>
+							<li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
+							<li><a href="https://launchpad.net/charms">Charms</a></li>
+						</ul>
+					</li>
+				</ul>
+			</nav>
+		</div><!-- /.inner-wrapper -->
+	</div><!-- /.row -->
+	<div class="row no-border">
+		<div class="legal inner-wrapper">
+			<p>&copy; <?php echo date('Y'); ?> Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+			<p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
+		</div>
+	</div><!-- /.row -->
 </footer>
 
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
 
=== modified file 'header.php'
--- header.php	2013-04-22 18:28:41 +0000
+++ header.php	2013-06-27 15:13:40 +0000
@@ -4,11 +4,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="description" content="Build entire environments in the cloud with only a few commands. Deploy services quickly anywhere. Juju is devops distilled." />
+<meta name="keywords" content="" />
 
 <title><?php wp_title('|', true, 'right'); ?><?php bloginfo('name'); ?></title>
 
-<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Ubuntu:400,400italic">
-<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Ubuntu+Mono:400">
+<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
 <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" />
 <link rel="stylesheet" type="text/css" media="screen" href="<?php echo get_template_directory_uri(); ?>/css/base.css" />
@@ -26,13 +27,7 @@
 
 <body class="<?php echo $template_id; ?>">
 
-<header>
-	<div class="header-login">
-		<ul>
-			<!-- <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li> -->
-			<li>&nbsp;</li>
-		</ul>
-	</div>
+<header class="global clearfix" role="banner">
 	<div class="header-navigation">
 		<div>
 			<nav role="navigation">
 
=== modified file 'img/apple-logo.png' (properties changed: -x to +x)
 Binary files img/apple-logo.png	2012-12-04 16:42:26 +0000 and img/apple-logo.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/arrow-nav.png' (properties changed: -x to +x)
 Binary files img/arrow-nav.png	2012-12-04 16:42:26 +0000 and img/arrow-nav.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/arrow-sliders.png'
 Binary files img/arrow-sliders.png	2012-12-04 16:42:26 +0000 and img/arrow-sliders.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/background-footer.png' (properties changed: -x to +x)
 Binary files img/background-footer.png	2012-12-04 16:42:26 +0000 and img/background-footer.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/background-header-home.png' (properties changed: -x to +x)
 Binary files img/background-header-home.png	2012-12-04 16:42:26 +0000 and img/background-header-home.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/banner-launcher.jpg' (properties changed: -x to +x)
 Binary files img/banner-launcher.jpg	2012-12-04 16:42:26 +0000 and img/banner-launcher.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/banner-uds-p.jpg' (properties changed: -x to +x)
 Binary files img/banner-uds-p.jpg	2012-12-04 16:42:26 +0000 and img/banner-uds-p.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/banner-uds.jpg' (properties changed: -x to +x)
 Binary files img/banner-uds.jpg	2012-12-04 16:42:26 +0000 and img/banner-uds.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/banner-usc.jpg' (properties changed: -x to +x)
 Binary files img/banner-usc.jpg	2012-12-04 16:42:26 +0000 and img/banner-usc.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/beginning-quote.jpg' (properties changed: -x to +x)
 Binary files img/beginning-quote.jpg	2012-12-04 16:42:26 +0000 and img/beginning-quote.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-left-small.png'
 Binary files img/button-cta-left-small.png	2012-12-04 16:42:26 +0000 and img/button-cta-left-small.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-left.png'
 Binary files img/button-cta-left.png	2012-12-04 16:42:26 +0000 and img/button-cta-left.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-right-small.png'
 Binary files img/button-cta-right-small.png	2012-12-04 16:42:26 +0000 and img/button-cta-right-small.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-right.png'
 Binary files img/button-cta-right.png	2012-12-04 16:42:26 +0000 and img/button-cta-right.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-slice-small.png'
 Binary files img/button-cta-slice-small.png	2012-12-04 16:42:26 +0000 and img/button-cta-slice-small.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/button-cta-slice.png'
 Binary files img/button-cta-slice.png	2012-12-04 16:42:26 +0000 and img/button-cta-slice.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/cassandra-80.png'
 Binary files img/cassandra-80.png	1970-01-01 00:00:00 +0000 and img/cassandra-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/cassandra.png' (properties changed: -x to +x)
 Binary files img/cassandra.png	2012-12-04 16:42:26 +0000 and img/cassandra.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/ceph-80.png'
 Binary files img/ceph-80.png	1970-01-01 00:00:00 +0000 and img/ceph-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/ceph_logo.png' (properties changed: -x to +x)
 Binary files img/ceph_logo.png	2012-12-04 16:42:26 +0000 and img/ceph_logo.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/dotted-logo.png' (properties changed: -x to +x)
 Binary files img/dotted-logo.png	2012-12-04 16:42:26 +0000 and img/dotted-logo.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/ending-quote.jpg' (properties changed: -x to +x)
 Binary files img/ending-quote.jpg	2012-12-04 16:42:26 +0000 and img/ending-quote.jpg	2013-06-27 15:13:40 +0000 differ
=== added file 'img/hadoop-80.png'
 Binary files img/hadoop-80.png	1970-01-01 00:00:00 +0000 and img/hadoop-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/hadoop.jpg' (properties changed: -x to +x)
 Binary files img/hadoop.jpg	2012-12-04 16:42:26 +0000 and img/hadoop.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-accordion-active.png' (properties changed: -x to +x)
 Binary files img/icon-accordion-active.png	2012-12-04 16:42:26 +0000 and img/icon-accordion-active.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-accordion-inactive.png' (properties changed: -x to +x)
 Binary files img/icon-accordion-inactive.png	2012-12-04 16:42:26 +0000 and img/icon-accordion-inactive.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-eclipse.png' (properties changed: -x to +x)
 Binary files img/icon-eclipse.png	2012-12-04 16:42:26 +0000 and img/icon-eclipse.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-forum.png' (properties changed: -x to +x)
 Binary files img/icon-forum.png	2012-12-04 16:42:26 +0000 and img/icon-forum.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-irc.png' (properties changed: -x to +x)
 Binary files img/icon-irc.png	2012-12-04 16:42:26 +0000 and img/icon-irc.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-mail.png' (properties changed: -x to +x)
 Binary files img/icon-mail.png	2012-12-04 16:42:26 +0000 and img/icon-mail.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-monodevelop.png' (properties changed: -x to +x)
 Binary files img/icon-monodevelop.png	2012-12-04 16:42:26 +0000 and img/icon-monodevelop.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-qt.png' (properties changed: -x to +x)
 Binary files img/icon-qt.png	2012-12-04 16:42:26 +0000 and img/icon-qt.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-rss.png' (properties changed: -x to +x)
 Binary files img/icon-rss.png	2012-12-04 16:42:26 +0000 and img/icon-rss.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/icon-twitter.png' (properties changed: -x to +x)
 Binary files img/icon-twitter.png	2012-12-04 16:42:26 +0000 and img/icon-twitter.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/juju-gui.png' (properties changed: -x to +x)
 Binary files img/juju-gui.png	2012-12-04 16:42:26 +0000 and img/juju-gui.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/juju-play.png'
 Binary files img/juju-play.png	1970-01-01 00:00:00 +0000 and img/juju-play.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/loader.gif' (properties changed: -x to +x)
 Binary files img/loader.gif	2012-12-04 16:42:26 +0000 and img/loader.gif	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-beep.png'
 Binary files img/logo-beep.png	2012-12-04 16:42:26 +0000 and img/logo-beep.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-blender.png' (properties changed: -x to +x)
 Binary files img/logo-blender.png	2012-12-04 16:42:26 +0000 and img/logo-blender.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-braid.png'
 Binary files img/logo-braid.png	2012-12-04 16:42:26 +0000 and img/logo-braid.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-chromium.png' (properties changed: -x to +x)
 Binary files img/logo-chromium.png	2012-12-04 16:42:26 +0000 and img/logo-chromium.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-fretsonfire.png'
 Binary files img/logo-fretsonfire.png	2012-12-04 16:42:26 +0000 and img/logo-fretsonfire.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-inkscape.png' (properties changed: -x to +x)
 Binary files img/logo-inkscape.png	2012-12-04 16:42:26 +0000 and img/logo-inkscape.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-oilrush.png'
 Binary files img/logo-oilrush.png	2012-12-04 16:42:26 +0000 and img/logo-oilrush.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-openshot.png'
 Binary files img/logo-openshot.png	2012-12-04 16:42:26 +0000 and img/logo-openshot.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-steelstorm.png'
 Binary files img/logo-steelstorm.png	2012-12-04 16:42:26 +0000 and img/logo-steelstorm.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-transmission.png'
 Binary files img/logo-transmission.png	2012-12-04 16:42:26 +0000 and img/logo-transmission.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/logo-ubuntu-grey.png'
 Binary files img/logo-ubuntu-grey.png	1970-01-01 00:00:00 +0000 and img/logo-ubuntu-grey.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-ubuntu.png' (properties changed: -x to +x)
 Binary files img/logo-ubuntu.png	2012-12-04 16:42:26 +0000 and img/logo-ubuntu.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-uplink.png'
 Binary files img/logo-uplink.png	2012-12-04 16:42:26 +0000 and img/logo-uplink.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logo-world-of-goo.png' (properties changed: -x to +x)
 Binary files img/logo-world-of-goo.png	2012-12-04 16:42:26 +0000 and img/logo-world-of-goo.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/logos.png' (properties changed: -x to +x)
 Binary files img/logos.png	2012-12-04 16:42:26 +0000 and img/logos.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/mongo-80.png'
 Binary files img/mongo-80.png	1970-01-01 00:00:00 +0000 and img/mongo-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/mongodb.png' (properties changed: -x to +x)
 Binary files img/mongodb.png	2012-12-04 16:42:26 +0000 and img/mongodb.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/multimedia.jpg'
 Binary files img/multimedia.jpg	2012-12-04 16:42:26 +0000 and img/multimedia.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/nav-arrow.png' (properties changed: -x to +x)
 Binary files img/nav-arrow.png	2012-12-04 16:42:26 +0000 and img/nav-arrow.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/notifications.jpg'
 Binary files img/notifications.jpg	2012-12-04 16:42:26 +0000 and img/notifications.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/pattern-featured.gif' (properties changed: -x to +x)
 Binary files img/pattern-featured.gif	2012-12-04 16:42:26 +0000 and img/pattern-featured.gif	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/pictogram-bird.png' (properties changed: -x to +x)
 Binary files img/pictogram-bird.png	2012-12-04 16:42:26 +0000 and img/pictogram-bird.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/pictogram-cog.png' (properties changed: -x to +x)
 Binary files img/pictogram-cog.png	2012-12-04 16:42:26 +0000 and img/pictogram-cog.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/pictogram-community.png' (properties changed: -x to +x)
 Binary files img/pictogram-community.png	2012-12-04 16:42:26 +0000 and img/pictogram-community.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/pictogram-star.png' (properties changed: -x to +x)
 Binary files img/pictogram-star.png	2012-12-04 16:42:26 +0000 and img/pictogram-star.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/publish-blender.png' (properties changed: -x to +x)
 Binary files img/publish-blender.png	2012-12-04 16:42:26 +0000 and img/publish-blender.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/publish-price.png' (properties changed: -x to +x)
 Binary files img/publish-price.png	2012-12-04 16:42:26 +0000 and img/publish-price.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/publish-review.png' (properties changed: -x to +x)
 Binary files img/publish-review.png	2012-12-04 16:42:26 +0000 and img/publish-review.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/publish-status.png' (properties changed: -x to +x)
 Binary files img/publish-status.png	2012-12-04 16:42:26 +0000 and img/publish-status.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/publish-yours.png' (properties changed: -x to +x)
 Binary files img/publish-yours.png	2012-12-04 16:42:26 +0000 and img/publish-yours.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/quotes.gif' (properties changed: -x to +x)
 Binary files img/quotes.gif	2012-12-04 16:42:26 +0000 and img/quotes.gif	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/quotes.jpg' (properties changed: -x to +x)
 Binary files img/quotes.jpg	2012-12-04 16:42:26 +0000 and img/quotes.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/quotes.png' (properties changed: -x to +x)
 Binary files img/quotes.png	2012-12-04 16:42:26 +0000 and img/quotes.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/rss.jpg' (properties changed: -x to +x)
 Binary files img/rss.jpg	2012-12-04 16:42:26 +0000 and img/rss.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/sec-nav-hover.gif' (properties changed: -x to +x)
 Binary files img/sec-nav-hover.gif	2012-12-04 16:42:26 +0000 and img/sec-nav-hover.gif	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/social-media.jpg'
 Binary files img/social-media.jpg	2012-12-04 16:42:26 +0000 and img/social-media.jpg	2013-06-27 15:13:40 +0000 differ
=== added file 'img/tomcat-80.png'
 Binary files img/tomcat-80.png	1970-01-01 00:00:00 +0000 and img/tomcat-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/tomcat.png' (properties changed: -x to +x)
 Binary files img/tomcat.png	2012-12-04 16:42:26 +0000 and img/tomcat.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/tweet-arrow.png' (properties changed: -x to +x)
 Binary files img/tweet-arrow.png	2012-12-04 16:42:26 +0000 and img/tweet-arrow.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/tweet-follow.png' (properties changed: -x to +x)
 Binary files img/tweet-follow.png	2012-12-04 16:42:26 +0000 and img/tweet-follow.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/unity-desktop.jpg'
 Binary files img/unity-desktop.jpg	2012-12-04 16:42:26 +0000 and img/unity-desktop.jpg	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-community.png' (properties changed: -x to +x)
 Binary files img/why-community.png	2012-12-04 16:42:26 +0000 and img/why-community.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-desktop.png' (properties changed: -x to +x)
 Binary files img/why-desktop.png	2012-12-04 16:42:26 +0000 and img/why-desktop.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-millions.png' (properties changed: -x to +x)
 Binary files img/why-millions.png	2012-12-04 16:42:26 +0000 and img/why-millions.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-myapps.png' (properties changed: -x to +x)
 Binary files img/why-myapps.png	2012-12-04 16:42:26 +0000 and img/why-myapps.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-open.png' (properties changed: -x to +x)
 Binary files img/why-open.png	2012-12-04 16:42:26 +0000 and img/why-open.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/why-usc.png' (properties changed: -x to +x)
 Binary files img/why-usc.png	2012-12-04 16:42:26 +0000 and img/why-usc.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/windows-logo.png' (properties changed: -x to +x)
 Binary files img/windows-logo.png	2012-12-04 16:42:26 +0000 and img/windows-logo.png	2013-06-27 15:13:40 +0000 differ
=== added file 'img/wp-80.png'
 Binary files img/wp-80.png	1970-01-01 00:00:00 +0000 and img/wp-80.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'img/wp.png' (properties changed: -x to +x)
 Binary files img/wp.png	2012-12-04 16:42:26 +0000 and img/wp.png	2013-06-27 15:13:40 +0000 differ
=== modified file 'js/base.js'
--- js/base.js	2012-12-04 16:42:26 +0000
+++ js/base.js	2013-06-27 15:13:40 +0000
@@ -126,24 +126,16 @@
 // Get latest tweets
 base.getTweets = function() {
 	// Latest tweet from @ubuntucloud
-	if (page_id == 'home') {
+	if (page_id == 'home','home-new','community') {
 		var args = {
 			username: 'ubuntucloud',
 			template: '{text}{time}',
+			fetch: 20,
+			filter: function(t){ return ! /^@\w+/.test(t.tweet_raw_text); },
 			count: 1
 		}
 		$('.tweet').tweet(args);
 	}
-	
-	// Latest three tweets with #juju
-	if (page_id == 'community') {
-		var args = {
-			query: '#ubuntucloud',
-			template: '{text}{user_and_time}',
-			count: 5
-		}
-		$('.tweet').tweet(args);
-	}
 }
 
 /* Non-init methods */
 
=== modified file 'part-blog-latest-articles.php'
--- part-blog-latest-articles.php	2012-12-04 16:42:26 +0000
+++ part-blog-latest-articles.php	2013-06-27 15:13:40 +0000
@@ -1,8 +1,7 @@
 <?php
-$args = array('numberposts' => 3);
-$posts = get_posts($args);
-foreach ($posts as $post): ?>
-	<a href="<?php the_permalink(); ?>"><?php the_title(); ?> &rsaquo;</a>
-	<time datetime="<?php echo get_the_date('Y-m-d') ?>"><?php echo get_the_date('d F Y'); ?></time>
-<?php endforeach; ?>
-<a href="/?&amp;feed=rss2"><div class="rss">Juju blog &rsaquo;</div></a>
+	$args = array('numberposts' => 3);
+	$posts = get_posts($args);
+	foreach ($posts as $post): 
+?>
+	<li><a href="<?php the_permalink(); ?>"><?php the_title(); ?>&nbsp;&rsaquo;</a></li>
+<?php endforeach; ?>
 \ No newline at end of file
 
=== modified file 'part-blog-latest-events.php'
--- part-blog-latest-events.php	2012-12-04 16:42:26 +0000
+++ part-blog-latest-events.php	2013-06-27 15:13:40 +0000
@@ -2,8 +2,10 @@
 $args = array('numberposts' => 3, 'category' => 4);
 $posts = get_posts($args);
 foreach ($posts as $post): ?>
-	<a href="<?php the_permalink(); ?>"><?php the_title(); ?> &rsaquo;</a>
-	<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>
+	<li>
+		<a href="<?php the_permalink(); ?>"><?php the_title(); ?> &rsaquo;</a>
+		<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>
+	</li>
 <?php endforeach; ?>
-<a href="/?cat=4&amp;feed=rss2"><div class="rss">All upcoming events &rsaquo;</div></a>
 \ No newline at end of file
+<li><a href="/?cat=4&amp;feed=rss2"><div class="rss">All upcoming events&nbsp;&rsaquo;</div></a></li>
 \ No newline at end of file
 
=== added file 'part-header-home-new.php'
--- part-header-home-new.php	1970-01-01 00:00:00 +0000
+++ part-header-home-new.php	2013-06-27 15:13:40 +0000
@@ -0,0 +1,11 @@
+<div class="container-12">
+	<div class="intro grid-5 alpha">
+		<h1>DevOps distilled</h1>
+		<p>With over 100 services ready to deploy, Juju enables you to build entire environments in the cloud with only a few commands on <a href="http://www.ubuntu.com/cloud/public-cloud">public clouds</a> like Amazon Web Services and HP Cloud, to private clouds built on <a href="http://www.ubuntu.com/cloud/private-cloud/openstack">OpenStack</a>, or raw bare metal via <a href="http://www.ubuntu.com/cloud/orchestration/deployment">MAAS</a>.</p>
+		<p>Access our Juju demo to experience how easy it is to manage services in the cloud.</p>
+	</div>
+	<div class="header-image grid-7 omega">
+		<iframe width="540" height="304" src="http://www.youtube.com/embed/1yoIdgdqzLk" frameborder="0" allowfullscreen></iframe>
+	</div>
+	<p class="grid-12 alpha"><a class="link-cta-ubuntu cta-large" href="/get-started">Experience Juju</a></p>
+</div>
 \ No newline at end of file
 
=== modified file 'single.php'
--- single.php	2012-12-04 16:42:26 +0000
+++ single.php	2013-06-27 15:13:40 +0000
@@ -26,7 +26,9 @@
 			<aside class="grid-3">
 				<a href="/community/app-developer-blog/">&lsaquo; Back to Blog</a>
 				<h3>Archive</h3>
+				<ul class="list">
 				 <?php wp_get_archives('type=monthly&limit=12'); ?>
+				</ul>
 				 <?php $the_query = new WP_Query( 'cat=4' ); ?>
 				<?php  if ( $the_query->have_posts() ) : ?>
 					<h3 class="events">Events</h3>
 
=== modified file 'template-blog-community.php'
--- template-blog-community.php	2012-12-04 16:42:26 +0000
+++ template-blog-community.php	2013-06-27 15:13:40 +0000
@@ -31,11 +31,13 @@
 			</div>
 			<aside class="grid-3" >
 				<h3>Archive</h3>
+				<ul class="list">
 				 <?php wp_get_archives('type=monthly&limit=12'); ?>
+				</ul>
 				 <?php $the_query = new WP_Query( 'cat=4' ); ?>
 			<?php  if ( $the_query->have_posts() ) : ?>
 				<h3 class="events">Events</h3>
-				<?php while ( $the_query->have_posts() ) : $the_query->the_post(); ?>
+					<?php while ( $the_query->have_posts() ) : $the_query->the_post(); ?>
 					<?php get_template_part( 'event', get_post_format() ); ?>
 				<?php endwhile; ?>
 			<?php endif; ?>
 
=== modified file 'template-community.php'
--- template-community.php	2012-12-04 20:56:05 +0000
+++ template-community.php	2013-06-27 15:13:40 +0000
@@ -7,81 +7,83 @@
 
 <?php get_header(); ?>
 
-	<div class="grid-12">
-			<div class="box clearfix">
-				<h2>Contribute</h2>
-				<ul>
-					<li>
-						<a href="/docs/write-charm.html">
-							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-cog.png" width="47" height="49" alt="" />
-							<h4>Write a charm &rsaquo;</h4>
-						</a>
-						<p>The best way to contribute to Juju is by writing Charms!</p>
-					</li>
-					<li>
-						<a href="/docs">
-							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-bird.png" width="61" height="49" alt="" />
-							<h4>Help with documentation &rsaquo;</h4>
-						</a>
-						<p>Help others get started using Juju and writing Charms.</p>
-					</li>
-					<li class="last">
-						<a href="/community/charmers">
-							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
-							<h4>Become a Juju Charmer &rsaquo;</h4>
-						</a>
-						<p>Mentor new charm authors, review incoming charms, and maintain the charm store.</p>
-					</li>
-				</ul>
-			</div>
-	</div>
-		
-	<div class="grid-4">
-		<div class="box-orange">
-			<h3><a href="http://www.askubuntu.com">Participate on Ask Ubuntu &rsaquo;</a></h3>
-			<p>A collaboratively-edited question and answer site for Juju users and developers.</p>
-			<p><a href="http://www.askubuntu.com/questions/ask?tags=juju">Ask a question now &rsaquo;</a></p>
-			<p>And check out our list of <a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">Frequently Asked Questions</a>.</p>
-		</div>
-	</div>
-
-	<div class="grid-8">
-		<div class="box-padded">
-			<h3>Other ways to get involved</h3>
-			<div>
-				<ul class="clearfix">
-					<li><a href="http://webchat.freenode.net/?channels=juju"  class="irc">IRC channel (web version available) &rsaquo;</a></li>
-					<li><a href="https://lists.ubuntu.com/mailman/listinfo/juju"  class="mail">Join the Juju mailing list &rsaquo;</a></li>
-					<li class="last"><a href="/?&amp;feed=rss2"class="rss">Subscribe to the Juju Blog &rsaquo;</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-<div style="clear:both;"></div>
-
-	<div class="grid-4">
-		<div class="box-clear">
-			<h3>#juju on Twitter</h3>
+<div class="row no-border">
+	<div class="inner-wrapper">
+		<div class="box clearfix">
+			<h2>Contribute</h2>
+			<ul>
+				<li>
+					<a href="/docs/write-charm.html">
+						<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-cog.png" width="47" height="49" alt="" />
+						<h4>Write a charm &rsaquo;</h4>
+					</a>
+					<p>The best way to contribute to Juju is by writing Charms!</p>
+				</li>
+				<li>
+					<a href="/docs">
+						<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-bird.png" width="61" height="49" alt="" />
+						<h4>Help with documentation &rsaquo;</h4>
+					</a>
+					<p>Help others get started using Juju and writing Charms.</p>
+				</li>
+				<li class="last">
+					<a href="/community/charmers">
+						<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
+						<h4>Become a Juju Charmer &rsaquo;</h4>
+					</a>
+					<p>Mentor new charm authors, review incoming charms, and maintain the charm store.</p>
+				</li>
+			</ul>
+		</div>
+		<div class="grid-4 alpha">
+			<div class="box-orange">
+				<h3><a href="http://www.askubuntu.com">Participate on Ask Ubuntu &rsaquo;</a></h3>
+				<p>A collaboratively-edited question and answer site for Juju users and developers.</p>
+				<p><a href="http://www.askubuntu.com/questions/ask?tags=juju">Ask a question now &rsaquo;</a></p>
+				<p>And check out our list of <a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">Frequently Asked Questions</a>.</p>
+			</div>
+		</div>
+		<div class="grid-8 omega">
+			<div class="box-padded">
+				<h3>Other ways to get involved</h3>
+				<div>
+					<ul class="clearfix">
+						<li class="no-border"><a href="http://webchat.freenode.net/?channels=juju"  class="irc">IRC channel (web version available)&nbsp;&rsaquo;</a></li>
+						<li><a href="https://lists.ubuntu.com/mailman/listinfo/juju"  class="mail">Join the Juju mailing list&nbsp;&rsaquo;</a></li>
+						<li class="last"><a href="/?&amp;feed=rss2"class="rss">Subscribe to the Juju Blog&nbsp;&rsaquo;</a></li>
+					</ul>
+				</div>
+			</div>
+		</div>	
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
+	
+<hr />
+<div id="contextual-footer" class="row no-border no-padding-bottom">
+	<div class="inner-wrapper vertical-divider">
+		<div class="grid-4 alpha">
+			<h2>Explore further</h2>
+			<ul class="list">
+				<li><a href="<?php echo site_url(); ?>/charm-store">Visit the Charm Store &rsaquo;</a></li>
+				<li><a href="<?php echo site_url(); ?>/docs/write-charm.html">Write your own Charms &rsaquo;</a></li>
+				<li><a href="<?php echo site_url(); ?>/docs/">Juju documentation &rsaquo;</a></li>
+			</ul>
+		</div>
+		<div class="grid-4">
 			<div class="container-tweet">
-				<div class="tweet tweet-small clearfix"></div>
+				<div class="tweet clearfix"></div>
 				<a class="tweet-follow" href="http://twitter.com/ubuntucloud">Follow <span>@ubuntucloud</span> on Twitter</a>
 			</div>
 		</div>
-	</div>
-
-	<div class="grid-4">
-		<div class="box-clear border">
-			<h3>News and announcements</h3>
-			<?php get_template_part('part', 'blog-latest-articles'); ?>
-		</div>
-	</div>
-
-	<div class="grid-4">
-		<div class="box-clear">
-			<h3>Events</h3>
-			<?php get_template_part('part', 'blog-latest-events'); ?>
-		</div>
-	</div>
-
+		<div class="grid-4 omega">
+			<h2>Further reading from the Juju blog</h2>
+				<ul>
+					<?php get_template_part('part', 'blog-latest-articles'); ?>
+				</ul>
+				<h2>Events</h2>
+				<?php get_template_part('part', 'blog-latest-events'); ?>
+		</div>
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
 
 <?php get_footer(); ?>
 
=== modified file 'template-get-started.php'
--- template-get-started.php	2013-06-26 18:46:07 +0000
+++ template-get-started.php	2013-06-27 15:13:40 +0000
@@ -11,17 +11,28 @@
 		<h2>Step-by-step guide to getting started</h2>
 		<div class="container-step clearfix">
 			<div class="box grid-3">
-				<a href="http://www.ubuntu.com/download/ubuntu/download">Do you need a copy of Ubuntu?</a>
+				<a href="http://www.ubuntu.com/download">Do you need a copy of Ubuntu?</a>
 			</div>
 			<div class="step grid-9">
 				<span class="number">1</span>
 				<div>
 					<h2>Install Juju</h2>
+<<<<<<< TREE
 					<p><code>sudo apt-get install juju-core</code></p>
 					<p>If you are using 12.04 you need to use the PPA:</p>
 
 							<p><code>sudo add-apt-repository ppa:juju/devel<br/>sudo apt-get update && sudo apt-get install juju-core</code></p>
 					</a>
+=======
+					<p>sudo apt-get install juju-core</code></p>
+					<p>Juju is provided automatically as a backport in Ubuntu Server. Backports are usually enabled by default, but if you've turned them off here's how you can <a href="http://askubuntu.com/a/285474/235">enable them</a>. If apt complains that it cannot find the packages you might need to use the PPA:</p>
+					<p><code>sudo add-apt-repository ppa:juju/devel<br/>sudo apt-get update && sudo apt-get install juju-core</code></p>
+					<p>Regular updates will be made to the backported packages, unless you want to follow along with Juju development we recommend users to not use the PPA.</p>
+					<p>You can switch between the default (0.7) version and 1.10 versions by using the following:</p>
+					<p><code>sudo update-alternatives --set juju /usr/lib/juju-0.7/bin/juju</code></p>
+					<p>or to the new 1.10.0 release using:</p>
+					<p><code>sudo update-alternatives --set juju /usr/lib/juju-1.10.0/bin/juju</code></p>
+>>>>>>> MERGE-SOURCE
 				</div>
 			</div>
 			<div class="step grid-9">
@@ -30,13 +41,18 @@
 					<h2>Take 5 minutes to get to know Juju</h2>
 					<p>With Juju installed, press <strong>Ctrl</strong>+<strong>Alt</strong>+<strong>T</strong> to open the Terminal and create a new ssh keypair if you don't already have one:</p>
 					<code>ssh-keygen -t rsa -b 2048</code>
-					
 					<p>To generate an initial config file, you simply need to run:</p>
+<<<<<<< TREE
                     <code>juju generate-config -w</code>
 
 					<p>The -w switch causes the file to be written to your ~/.juju directory if an environments.yaml file does not already exist. It will also create the ~/.juju directory if that does not exist. Open <code>~/.juju/environments.yaml</code> in your text editor and uncomment out the sections you need for your cloud provider.</p>
 
+=======
+					<p><code>juju generate-config -w</code></p>
+					<p>The -w switch causes the file to be written to your ~/.juju directory if an environments.yaml file does not already exist. It will also create the ~./juju directory if that does not exist. Open `~/.juju/environments/yaml` in your text editor and uncomment out the sections you need for your cloud provider.</p>
+>>>>>>> MERGE-SOURCE
 					<p>And then create a new environment by typing:</p>
+<<<<<<< TREE
 					<code>juju bootstrap</code>
 					<p>
 					<p>Now start browsing the <a href="http://jujucharms.com/charms">Charm Store</a> for the things you want to deploy. The bootstrap process takes a few minutes, you can keep an eye out on progress by issuing a <code>juju status</code> command.</p>
@@ -48,6 +64,11 @@
 					<code>juju deploy juju-gui<br>
 					juju expose juju-gui</code></p>
 					<p>This installs the GUI and then exposes it so you can check it out in the web browser. Then simply check <code>juju status</code> to get the public address to the GUI and hit it with your web browser. For more information on the GUI check out <a href="http://jujucharms.com/charms/precise/juju-gui">the instructions</a>.</p>
+=======
+					<p><code>juju bootstrap</code></p>
+					<p>Now start browsing the <a href="http://jujucharms.com/charms">Charm Store</a> for the things you want to deploy.</p>
+					<p><a href="https://juju.ubuntu.com/docs/getting-started.html">Learn more about setting up Juju in the documentation;</a></p>
+>>>>>>> MERGE-SOURCE
 					<p>Note: Looking for older versions of Juju? Check out <a href="https://launchpad.net/~juju/+archive/pkgs">this PPA</a>.</p>
 				</div>
 			</div>
@@ -56,18 +77,20 @@
 				<div>
 					<h2>Deploy and Manage Services</h2>
 					<p>Now you're ready to deploy things into your cloud. Let's deploy a WordPress blog, at scale.</p>
+<<<<<<< TREE
 					juju deploy wordpress<br>
 					juju deploy mysql<br>
+=======
+					<p><code>juju bootstrap<br />
+					juju deploy wordpress<br />
+					juju deploy mysql<br />
+>>>>>>> MERGE-SOURCE
 					juju add-relation wordpress mysql</code></p>
-
 					<p>Now get a cup of coffee while Juju not only provisions the instances, but installs and configures them to talk to each other. No more wading around looking for AMIs, you get the latest 64 bit Ubuntu Server image and the service you deploy on the instance, that's it! After your cloud provider has finished deploying, you can check out your environment, and then expose it to the world.</p>
-
-					<p><code>juju expose wordpress<br>
+					<p><code>juju expose wordpress<br />
 					juju status</code></p>
-
-</p>The status shows you the public IP your provider has given you, paste that into a browser and you're done! This is a simple example, check out how we do <a href="http://jujucharms.com/charms/precise/hadoop">Hadoop</a>, any <a href="http://jujucharms.com/charms/precise/node-app">Node.js application</a>, and even <a href="http://jujucharms.com/charms/precise/cassandra">Cassandra</a>.</p>
-
-					<a href="/resources/technologies/ubuntu-developer-stack">Find out more about the Ubuntu Developer Stack &rsaquo;</a>
+					</p>The status shows you the public IP your provider has given you, paste that into a browser and you're done! This is a simple example, check out how we do <a href="http://jujucharms.com/charms/precise/hadoop">Hadoop</a>, any <a href="http://jujucharms.com/charms/precise/node-app">Node.js application</a>, and even <a href="http://jujucharms.com/charms/precise/cassandra">Cassandra</a>.</p>
+					<p><a href="/resources/technologies/ubuntu-developer-stack">Find out more about the Ubuntu Developer Stack &rsaquo;</a></p>
 				</div>
 			</div>
 			<div class="step grid-9">
@@ -76,8 +99,9 @@
 					<h2>Scale like a champ</h2>
 					<p>Lots of tools help automate your deployments, but Juju isn't just about launching instances, it's about managing your deployment's entire lifecycle. The traffic really starting to come in? Let's scale out WordPress with just a simple command:</p>
 					<p><code>juju add-unit wordpress</code></p>
-<p>Since you've already defined the relationship between MySQL and WordPress at the <i>service level</i> rather than the machine level, there's nothing else for you to do. This new instance will automatically connect to MySQL and start load balancing. Let's add a few more nodes for a 6 node auto-loadbalancing WordPress environment:</p>
+					<p>Since you've already defined the relationship between MySQL and WordPress at the <i>service level</i> rather than the machine level, there's nothing else for you to do. This new instance will automatically connect to MySQL and start load balancing. Let's add a few more nodes for a 6 node auto-loadbalancing WordPress environment:</p>
 					<p><code>juju add-unit -n5 wordpress</code></p>
+<<<<<<< TREE
 
 <p>Still not enough? let's drop in Memcached:</p>
 
@@ -86,6 +110,11 @@
 
 <p>And just like before, since you're at the service level and not the machine level, every single WordPress instance will just use that memcached. In the cloud we're talking about dozens, hundreds, even thousands of servers. We believe that to meet these hyperscale needs that managing things at a higher, service oriented level is the way to go, and we built Juju to get you there.</p> 
 
+=======
+					<p>Still not enough? let's drop in Memcached:</p>
+					<p><code>juju deploy memcached<br /> juju add-relation wordpress memcached</code></p>
+   				<p>And just like before, since you're at the service level and not the machine level, every single WordPress instance will just use that memcached. In the cloud we're talking about dozens, hundreds, even thousands of servers. We believe that to meet thes hyperscale needs that managing things at a higher, service oriented level is the way to go, and we built Juju to get you there.</p> 
+>>>>>>> MERGE-SOURCE
 				</div>
 			</div>
 		</div>
 
=== added file 'template-home-new.php'
--- template-home-new.php	1970-01-01 00:00:00 +0000
+++ template-home-new.php	2013-06-27 15:13:40 +0000
@@ -0,0 +1,107 @@
+<?php
+/*
+Template Name: Home new
+*/
+$template_id = 'home-new';
+?>
+
+<?php get_header(); ?>
+
+<div class="row no-padding-bottom">
+	<div class="juju-play inner-wrapper">
+		<img src="<?php echo get_template_directory_uri(); ?>/img/juju-play.png" alt="juju-play" width="473" height="313" />
+		<h2>Play with Juju</h2>
+		<p>Check out the Juju sandbox to see how you can start building your deployments quickly and easily.</p>
+		<p><a href="/get-started">Experience juju &rsaquo;</a></p>
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
+
+<div class="row row-grey">
+	<div class="inner-wrapper">
+		<h2>Charms are the power behind Juju</h2>
+		<div class="grid-9 alpha">
+			<p>With 100 charms and growing, the Juju charm store is your future destination for cloud-based enterprise applications. From back-end services such as Hadoop or MongoDB to enterprise applications such as OpenERP, whatever you need, there&rsquo;s a charm for that!</p>
+		</div>
+		<div class="grid-3 omega">
+			<p><a class="link-cta-ubuntu" href="http://jujucharms.com">Browse the Charm Store</a></p>
+		</div>
+		<ul class="charm-list grid-12 vertical-divider">
+			<li class="alpha">
+				<h4><a href="http://jujucharms.com/charms/precise/wordpress" title="WordPress"><img src="<?php echo get_template_directory_uri(); ?>/img/wp-80.png" width="80" alt="WordPress" />WordPress</a></h4>
+				<p>WordPress is web software you can use to create a beautiful website or blog.</p>
+			</li>
+			<li>
+				<h4><a href="http://jujucharms.com/charms/precise/hadoop" title="Hadoop"><img src="<?php echo get_template_directory_uri(); ?>/img/hadoop-80.png" width="80" alt="Hadoop" /> Hadoop</a></h4>
+				<p>The Apache Hadoop software library is a framework that allows for the distributed processing of large data sets across clusters of computers using simple programming models.</p>
+			</li>
+			<li class="omega">
+				<h4><a href="http://jujucharms.com/charms/precise/cassandra" title="Cassandra"><img src="<?php echo get_template_directory_uri(); ?>/img/cassandra-80.png" width="80" alt="Cassandra" /> Cassandra</a></h4>
+				<p>The Apache Cassandra database is the right choice when you need scalability and high availability without compromising performance.</p>
+			</li>
+		</ul>
+		<ul class="charm-list last-list grid-12 vertical-divider">
+			<li class="alpha">
+				<h4><a href="http://jujucharms.com/charms/precise/ceph" title="Ceph"><img src="<?php echo get_template_directory_uri(); ?>/img/ceph-80.png" width="80" alt="Ceph" /> Ceph</a></h4>
+				<p>Ceph is a distributed object store and file system designed to provide excellent performance, reliability and scalability.</p>
+			</li>
+			<li>
+				<h4><a href="http://jujucharms.com/charms/precise/mongodb" title="MongoDB"><img src="<?php echo get_template_directory_uri(); ?>/img/mongo-80.png" width="80" alt="MongoDB" /> MongoDB</a></h4>
+				<p>MongoDB (from "humongous") is a scalable, high-performance, open source NoSQL database.</p>
+			</li>
+			<li class="omega">
+				<h4><a href="http://jujucharms.com/charms/precise/tomcat7" title="Tomcat"><img src="<?php echo get_template_directory_uri(); ?>/img/tomcat-80.png" width="80" alt="Tomcat" /> Tomcat</a></h4>
+				<p>Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies.</p>
+			</li>
+		</ul>
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
+
+<div class="row no-border">
+	<div class="inner-wrapper vertical-divider">
+		<div class="grid-6 alpha">
+			<h2>Get up and running</h2>
+			<p>Get started deploying Juju by installing it and configuring it for your cloud providers.</p>
+			<ul>
+				<li><a href="">Get Juju &rsaquo;</a></li>
+				<li><a href="">Juju command line &rsaquo;</a></li>
+				<li><a href="">Juju GUI &rsaquo;</a></li>
+			</ul>
+		</div>
+		<div class="grid-6 omega">
+			<h2>Help and support</h2>
+			<p>A growing collection of the best documentation and tutorials for Juju. Contribute your own resources to help make it even better.</p>
+			<ul>
+				<li><a href="">Get help and support &rsaquo;</a></li>
+				<li><a href="">Resources &rsaquo;</a></li>
+			</ul>
+		</div>
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
+<hr />
+<div id="contextual-footer" class="row no-border no-padding-bottom">
+	<div class="inner-wrapper vertical-divider">
+		<div class="grid-4 alpha">
+			<h2>Explore further</h2>
+			<ul class="list">
+				<li><a href="<?php echo site_url(); ?>/charm-store">Visit the Charm Store &rsaquo;</a></li>
+				<li><a href="<?php echo site_url(); ?>/docs/write-charm.html">Write your own Charms &rsaquo;</a></li>
+				<li><a href="<?php echo site_url(); ?>/community/">Juju Community &rsaquo;</a></li>
+				<li><a href="<?php echo site_url(); ?>/docs/">Juju documentation &rsaquo;</a></li>
+			</ul>
+		</div>
+		<div class="grid-4">
+			<div class="container-tweet">
+				<div class="tweet clearfix"></div>
+				<a class="tweet-follow" href="http://twitter.com/ubuntucloud">Follow <span>@ubuntucloud</span> on Twitter</a>
+			</div>
+		</div>
+		<div class="grid-4 omega">
+			<h2>Further reading from the Juju blog</h2>
+				<ul>
+					<?php get_template_part('part', 'blog-latest-articles'); ?>
+				</ul>
+		</div>
+	</div><!-- /.inner-wrapper -->
+</div><!-- /.row -->
+
+<?php get_footer(); ?>
 \ No newline at end of file