From 962307dd772966558cc5bc8de98511dc8c9a1ef5 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <p.ja.v.tilburg@tue.nl>
Date: Tue, 18 May 2010 15:32:30 +0200
Subject: [PATCH] Updated the template, removed the either options for the vote
 view.

---
 anne-survey.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/anne-survey.rb b/anne-survey.rb
index 6216e0f..dfae489 100644
--- a/anne-survey.rb
+++ b/anne-survey.rb
@@ -1,4 +1,7 @@
 require "pathname"
+require "markaby"
+
+Markaby::Builder.set(:indent, 2)
 
 Camping.goes :Anne
 
@@ -118,15 +121,20 @@ module Anne::Controllers
 
 end
 
+
 module Anne::Views
 
   def layout
     xhtml_strict do
       head do
-        title { "Anne's hippe enqueteshizzle" }
+        title "Anne's hippe enqueteshizzle"
       end
       body do
-        self << yield
+        div.header! do
+          h1 "Anne's hippe enqueteshizzle"
+        end
+        div.content! { self << yield }
+        div.footer! { }
       end
     end
   end
@@ -161,19 +169,18 @@ module Anne::Views
   end
 
   def vote(image, progress = 0)
-    h1 "Welk beeld is ruimtelijker?"
+    h2 "Welk beeld is ruimtelijker?"
     img :src => R(ImageX, image), :width => 640
     form :action => R(VoteN, @user_id), :method => :post do
       input :type => "hidden", :name => "image", :value => image
-      input :type => "submit", :name => "left", :value => "Links"
-      input :type => "submit", :name => "either", :value => "Geen van beide"
+      input :type => "submit", :name => "left",  :value => "Links"
       input :type => "submit", :name => "right", :value => "Rechts"
     end
     p "Woep, je bent al op #{progress}%!"
   end
 
   def finish
-    h1 "Je bent geweldig!"
+    h2 "Je bent geweldig!"
     p "Nu ga ik een stukje op m'n motor rijden. Doei!"
     p "Maar we hebben nog wat zeer persoonlijke vragen:"