refactored menu into partial, removed inline javascript

dominic · dominic · commit 5820aa1dcf8c · 2011-09-03T14:16:29.000-04:00
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -8,5 +8,10 @@
     = csrf_meta_tags
   %body
     = render "shared/menu/user"
-    .flash #{flash[:notice]}
+    = render "shared/menu/main"
+    
+    - if flash[:notice]
+      .flash #{flash[:notice]}
+
+    = yield :links
     = yield
diff --git a/app/views/questions/index.html.haml b/app/views/questions/index.html.haml
@@ -1,11 +1,3 @@
-:javascript
-  $(document).ready(function(){
-    $('#ask_button').click(
-      function(){
-        $('#the_form').show();
-        $('#ask_button').remove();
-      });
-  });
 - content_for :title do
   Questions
   
@@ -23,7 +15,3 @@
     %th
   
   = render :partial => "list", :collection => collection
-%div#the_form{:style=>'display:none'}
-  = render "form"
-- if current_user
-  %h3#ask_button Ask a question
diff --git a/app/views/shared/menu/_main.html.haml b/app/views/shared/menu/_main.html.haml
@@ -0,0 +1,3 @@
+= semantic_menu 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,2 +1 @@
 %h1 Home!
-%a(href="/questions") Q&A

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