Merge lp:~marco-gallotta/umonya-website/content into lp:~grmanuell/umonya-website/content

[marcog]

Outline of remaining pages.

Outline of remaining pages.

[Graham Manuell (grmanuell)]

review: Approve

=== added file 'contact_us'
--- contact_us	1970-01-01 00:00:00 +0000
+++ contact_us	2011-02-13 21:53:58 +0000
@@ -0,0 +1,9 @@
+If you have any questions about Umonya or would like to [get involved], you can send us a message using this form and we will get back to you shortly:
+
+Name:
+Email:
+Message:
+
+Recaptcha
+
+[Send]
 
=== added file 'media'
--- media	1970-01-01 00:00:00 +0000
+++ media	2011-02-13 21:53:58 +0000
@@ -0,0 +1,2 @@
+News feed aggregator
+Youtube, flikr, etc.
 
=== added file 'resources'
--- resources	1970-01-01 00:00:00 +0000
+++ resources	2011-02-13 21:53:58 +0000
@@ -0,0 +1,5 @@
+The course notes we are using are available [here|http://umonya.co.za/pb/]. We are rewriting a new textbook from scratch, written specifically with Umonya in mind. Here's how to get involved in helping us write the book. It will be posted here when it reaches a publishable state.
+
+We will also be posting resources for clubs here.
+
+IRC, forums, etc.
 
=== added file 'workshops'
--- workshops	1970-01-01 00:00:00 +0000
+++ workshops	2011-02-13 21:53:58 +0000
@@ -0,0 +1,15 @@
+Workshops are run over a full weekend, blah blah.
+
+Upcoming workshops:
+
+<to be generated>
+
+Cape Town
+April 2011
+[Apply] -> takes you to a page with more info on the venue and capacity and deadline etc. (perhaps link to volunteer?), followed by the application form
+
+Stellenbosch
+2011 (Date TBD)
+[Apply]
+
+etc.