Show the current poll in the sidebar

linuxfrorg · Mar 21, 2011 · 3bf3c80 · 3bf3c80
1 parent 5e1ed8f
commit 3bf3c80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -11,6 +11,7 @@ def index
     @order  = default unless VALID_ORDERS.include?(@order)
     @ppp    = News.ppp
     @banner = Banner.random
+    @poll   = Poll.current
     @nodes  = Node.public_listing(@types, @order).page(params[:page])
   end
 end
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -1,3 +1,6 @@
+- content_for :column do
+  = render 'polls/box'
+
 =h1 "Accueil"
 - feed "S'abonner au flux Atom des dépêches", "/news.atom"
 - if @ppp

diff --git a/app/views/polls/_box.html.haml b/app/views/polls/_box.html.haml
@@ -0,0 +1,4 @@
+#poll_box.box
+  %h1 Sondage
+  %h2= @poll.title
+  = render("polls/answers_#{poll_current_or_archived @poll}", :poll => @poll)