footer menu, title not output if blank, root content

dominic · dominic · commit 1c206acb4e01 · 2011-09-05T15:22:27.000-04:00
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -4,7 +4,7 @@
     %title Hackety Hack!
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css">
+    / <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css">
 
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
@@ -13,7 +13,7 @@
     %header.topbar
       .topbar-inner
         .container
-          %h3 
+          %h3#logo 
             = link_to "Hackety Hack", root_path
           = render "shared/menu/main"
           = render "shared/menu/user"
@@ -24,13 +24,16 @@
           #{flash[:notice]}
           = link_to "x", "#", :class => "close"
 
-      %h1.title
-        = yield :title
+      - title = yield :title
+      - unless title.empty?
+        %h1.title
+          = title
 
       = yield :links
       = yield
 
 
     %footer
       .container 
-        Footer
+        = render "shared/menu/footer"
+        
diff --git a/app/views/shared/menu/_footer.html.haml b/app/views/shared/menu/_footer.html.haml
@@ -0,0 +1,3 @@
+= semantic_menu :class => "pills" do |root|
+  - root.add "Home", root_path
+  - root.add "Questions", questions_path
diff --git a/app/views/static/root.html.haml b/app/views/static/root.html.haml
@@ -1,3 +1,4 @@
+%h1 Want to learn to program?
 %p Hackety Hack will teach you the absolute basics of programming from the ground up. No previous programming experience is needed!
-%p With Hackety Hack, you'll learn the Ruby programming language Ruby is used for all kinds of programs, including desktop applications and websites.
+%p With Hackety Hack, you'll learn the #{link_to "Ruby programming language", "http://www.ruby-lang.org/"}. Ruby is used for all kinds of programs, including desktop applications and websites.
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+= semantic_menu :class => "pills" do \|root\|`
	`2`	`+ - root.add "Home", root_path`
	`3`	`+ - root.add "Questions", questions_path`