Merge pull request #39 from rails-school/about_page

Adds some information about Charlottesville in the about page (Ben's pic)
rails-school · Sep 6, 2014 · 123dc13 · 123dc13
2 parents e7fabfb + 01a0874
commit 123dc13
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/app/assets/images/ben.png b/app/assets/images/ben.png
diff --git a/app/assets/images/lucas.png b/app/assets/images/lucas.png
diff --git a/app/views/home/about.html.haml b/app/views/home/about.html.haml
@@ -5,6 +5,8 @@
 %p
   Rails School is a weekly seminar and workshop for learning everything about Ruby, Rails, and web application development.
 
+%h2 San Francisco, CA
+
 %p
   We operate in San Francisco with the generous support of
   = link_to 'Noisebridge', 'https://www.noisebridge.net/wiki/Noisebridge'
@@ -42,9 +44,26 @@
   %h1 Brad Johnson
   %p Teacher
 
-.member.you
+%h2 Charlottesville, VA
+
+%p
+  We're supported in central Virginia by
+  = link_to 'Coshx Labs', 'http://www.coshx.com'
+  and
+  = succeed '.' do
+    = link_to 'Hack Cville', 'http://hackcville.com/'
+  If you enjoy the classes, consider
+  = link_to 'contributing to our codebase', 'https://github.com/rails-school/school'
+  to make RailsSchool even awesomer.
+
+.member
+  .pic-wrap
+    =image_tag('ben.png')
+  %h1 Ben Taitelbaum
+  %p Teacher and Organizer
+
+.member
   .pic-wrap
-    %h1
-      Try it!
-  %h1 You
-  %p We want your help!
+    =image_tag('lucas.png')
+  %h1 Lucas Cioffi
+  %p Teacher