1
=== modified file 'template-community.php'
2
--- template-community.php	2013-09-17 23:41:08 +0000
3
+++ template-community.php	2013-12-10 09:45:02 +0000
4
@@ -9,7 +9,7 @@
5
9
9
6
10
	<div class="grid-12">
10
	<div class="grid-12">
7
11
			<div class="box clearfix">
11
			<div class="box clearfix">
9
12
				<h2>Contribute</h2>
12
				<h2>Participate</h2>
10
13
				<ul>
13
				<ul>
11
14
					<li>
14
					<li>
12
15
						<a href="/docs/orientation.html">
15
						<a href="/docs/orientation.html">
13
@@ -26,11 +26,11 @@
14
26
						<p>We're always looking for feedback on how we can improve our documentation</p>
26
						<p>We're always looking for feedback on how we can improve our documentation</p>
15
27
					</li>
27
					</li>
16
28
					<li class="last">
28
					<li class="last">
18
29
						<a href="/community/charmers">
29
						<a href="/docs/index.html#developing-maas">
19
30
							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
30
							<img src="<?php echo get_template_directory_uri(); ?>/img/pictogram-star.png" width="49" height="49" alt="" />
21
31
							<h4>What should go here?</h4>
31
							<h4>Contribute to MAAS</h4>
22
32
						</a>
32
						</a>
24
33
						<p>Mentor new charm authors, review incoming charms, and maintain the charm store.</p>
33
						<p>Access MAAS codebase documentation. Participate to MAAS' development.</p>
25
34
					</li>
34
					</li>
26
35
				</ul>
35
				</ul>
27
36
			</div>
36
			</div>
28
@@ -39,7 +39,7 @@
29
39
	<div class="grid-4">
39
	<div class="grid-4">
30
40
		<div class="box-orange">
40
		<div class="box-orange">
31
41
			<h3><a href="http://www.askubuntu.com">Participate on Ask Ubuntu &rsaquo;</a></h3>
41
			<h3><a href="http://www.askubuntu.com">Participate on Ask Ubuntu &rsaquo;</a></h3>
33
42
			<p>A collaboratively-edited question and answer site for Juju users and developers.</p>
42
			<p>A collaboratively-edited question and answer site for MAAS users and developers.</p>
34
43
			<p><a href="http://www.askubuntu.com/questions/ask?tags=maas">Ask a question now &rsaquo;</a></p>
43
			<p><a href="http://www.askubuntu.com/questions/ask?tags=maas">Ask a question now &rsaquo;</a></p>
35
44
			<p>And check out our list of <a href="http://askubuntu.com/questions/tagged/maas?sort=faq&pagesize=50">Frequently Asked Questions</a>.</p>
44
			<p>And check out our list of <a href="http://askubuntu.com/questions/tagged/maas?sort=faq&pagesize=50">Frequently Asked Questions</a>.</p>
36
45
		</div>
45
		</div>
37
@@ -52,36 +52,10 @@
38
52
				<ul class="clearfix">
52
				<ul class="clearfix">
39
53
					<li><a href="http://webchat.freenode.net/?channels=maas"  class="irc">IRC channel (web version available) &rsaquo;</a></li>
53
					<li><a href="http://webchat.freenode.net/?channels=maas"  class="irc">IRC channel (web version available) &rsaquo;</a></li>
40
54
					<li><a href="https://lists.launchpad.net/maas-devel/"  class="mail">Join the MAAS mailing list &rsaquo;</a></li>
54
					<li><a href="https://lists.launchpad.net/maas-devel/"  class="mail">Join the MAAS mailing list &rsaquo;</a></li>
41
55
					<li class="last"><a href="/?&amp;feed=rss2"class="rss">Subscribe to the MAAS Blog &rsaquo;</a></li>
42
56
				</ul>
55
				</ul>
43
57
			</div>
56
			</div>
44
58
		</div>
57
		</div>
45
59
	</div>
58
	</div>
46
60
<div style="clear:both;"></div>
59
<div style="clear:both;"></div>
47
61
60
48
62
	<div class="grid-4">
49
63
		<div class="box-clear">
50
64
			<h3>#juju on Twitter</h3>
51
65
			<div class="container-tweet">
52
66
				<div class="tweet tweet-small clearfix"></div>
53
67
				<a class="tweet-follow" href="http://twitter.com/ubuntucloud">Follow <span>@ubuntucloud</span> on Twitter</a>
54
68
			</div>
55
69
		</div>
56
70
	</div>
57
71
58
72
	<div class="grid-4">
59
73
		<div class="box-clear border">
60
74
			<h3>News and announcements</h3>
61
75
			<?php get_template_part('part', 'blog-latest-articles'); ?>
62
76
		</div>
63
77
	</div>
64
78
65
79
	<div class="grid-4">
66
80
		<div class="box-clear">
67
81
			<h3>Events</h3>
68
82
			<?php get_template_part('part', 'blog-latest-events'); ?>
69
83
		</div>
70
84
	</div>
71
85
72
86
73
87
<?php get_footer(); ?>
61
<?php get_footer(); ?>
Status:	Merged
Merged at revision:	14
Proposed branch:	lp:~rvb/maas-website/mw-content-updates
Merge into:	lp:maas-website
Diff against target:	73 lines (+5/-31) 1 file modified template-community.php (+5/-31)
To merge this branch:	bzr merge lp:~rvb/maas-website/mw-content-updates
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jorge Castro		2013-12-10	Pending
Review via email: mp+198358@code.launchpad.net