From bc3dc8deda705edb2f776be3dacd1f2afac947a3 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <p.ja.v.tilburg@tue.nl>
Date: Mon, 21 Jun 2010 19:37:44 +0200
Subject: [PATCH] Added (and fixed up using CSS) the Philips logo to the
 header.

---
 anne-survey.rb | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/anne-survey.rb b/anne-survey.rb
index 503ba46..11173d5 100644
--- a/anne-survey.rb
+++ b/anne-survey.rb
@@ -175,7 +175,15 @@ module Anne::Views
       end
       body do
         div.header! do
-          h1 "Enquête ruimtelijke effecten"
+          h1 do
+            span.left "Enquête ruimtelijke effecten" 
+            img.right :src => R(ImageX, "tuelogo.gif"), 
+                :alt => "[TU/e logo]", 
+                :style => "right: 180px";
+            img.right :src => R(ImageX, "philipslogo.gif"), 
+                :alt => "[Philips logo]",
+                :style => "padding: 5px 5px; margin: 13px 0px; background: white;"
+          end
         end
         div.content! { self << yield }
         div.footer! do
@@ -242,10 +250,10 @@ module Anne::Views
     h2 "Welk beeld is ruimtelijker?"
     form.images! :action => R(Vote), :method => :post do
       input :type => "hidden", :name => "image", :value => image
-      input.image :type => "image", :src => R(ImageX, "#{image}-l.png"), 
-                  :name => "left", :id => "left"
-      input.image :type => "image", :src => R(ImageX, "#{image}-r.png"), 
-                  :name => "right", :id => "right"
+      input :type => "image", :src => R(ImageX, "#{image}-l.png"), 
+            :name => "left", :class => "left image"
+      input :type => "image", :src => R(ImageX, "#{image}-r.png"), 
+            :name => "right", :class => "right image"
     end
     div.progressbar! do
       div.done! :style => "width: #{progress}%" do end
@@ -310,17 +318,13 @@ body {
   border-radius: 12px;
 }
 
-#header {
-  background: url('image/tuelogo.gif') no-repeat right;
-  height: 73px;
-}
+#header { position: relative; height: 73px; }
+#header span { bottom: 10px; }
 
-#header h1 { padding-top: 25px; margin-top: 0px; }
-
-.image { border: thin solid #888; }
 #images { position: relative; height: 470px; }
-#left  { position: absolute; left: 0px; }
-#right { position: absolute; right: 0px; }
+.image { border: thin solid #888; }
+.left  { position: absolute; left: 0px; }
+.right { position: absolute; right: 0px; }
 
 #progressbar {
   height: 6px;