Merge lp:~rvb/maas-website/mw-content-updates into lp:maas-website

[Raphaël Badin]

Remove Juju-related widgets. Fix bogus widgets.

=== modified file 'template-community.php'
--- template-community.php	2013-09-17 23:41:08 +0000
+++ template-community.php	2013-12-10 09:45:02 +0000
@@ -9,7 +9,7 @@
 
 	<div class="grid-12">
 			<div class="box clearfix">
-				<h2>Contribute</h2>
+				<h2>Participate</h2>
 				<ul>
 					<li>
 						<a href="/docs/orientation.html">
@@ -26,11 +26,11 @@
 						<p>We're always looking for feedback on how we can improve our documentation</p>
 					</li>
 					<li class="last">
-						<a href="/community/charmers">
+						<a href="/docs/index.html#developing-maas">
 							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
-							<h4>What should go here?</h4>
+							<h4>Contribute to MAAS</h4>
 						</a>
-						<p>Mentor new charm authors, review incoming charms, and maintain the charm store.</p>
+						<p>Access MAAS codebase documentation. Participate to MAAS' development.</p>
 					</li>
 				</ul>
 			</div>
@@ -39,7 +39,7 @@
 	<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 collaboratively-edited question and answer site for MAAS users and developers.</p>
 			<p><a href="http://www.askubuntu.com/questions/ask?tags=maas">Ask a question now &rsaquo;</a></p>
 			<p>And check out our list of <a href="http://askubuntu.com/questions/tagged/maas?sort=faq&pagesize=50">Frequently Asked Questions</a>.</p>
 		</div>
@@ -52,36 +52,10 @@
 				<ul class="clearfix">
 					<li><a href="http://webchat.freenode.net/?channels=maas"  class="irc">IRC channel (web version available) &rsaquo;</a></li>
 					<li><a href="https://lists.launchpad.net/maas-devel/"  class="mail">Join the MAAS mailing list &rsaquo;</a></li>
-					<li class="last"><a href="/?&amp;feed=rss2"class="rss">Subscribe to the MAAS 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="container-tweet">
-				<div class="tweet tweet-small 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>
-
-
 <?php get_footer(); ?>