From 4fb5d0393cd5c9f20ef25b684d83cf0f14fb083d Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian@adrianshort.org>
Date: Mon, 1 Aug 2016 14:57:06 +0100
Subject: [PATCH] Minor layout changes; remove commented ward map

---
 views/index.haml | 89 +++++++-----------------------------------------
 1 file changed, 13 insertions(+), 76 deletions(-)

diff --git a/views/index.haml b/views/index.haml
index 4ece92c..c854c4a 100644
--- a/views/index.haml
+++ b/views/index.haml
@@ -1,99 +1,36 @@
-%h1 Sutton Elections
-
 #lookup
-  %h2
-    = @election_title
+  %h2= @election_title
   %form{ :method => 'get', :action => '/' }
-    %label{ :for => "postcode" } My postcode is 
+    %label{ :for => "postcode" } My postcode is
     %input{ :type => 'text', :name => 'postcode', :value => @default_pc, :size => 8, :maxlength => 8 }
     %input{ :type => 'submit', :value => "Find my results" }
 
 - if @future_elections.size > 0
 
-  %h2 Forthcoming elections
-  
+  %h2 Upcoming elections
+
   %table
     - @future_elections.each do |election|
       %tr
         %td
           %a{ :href => "/bodies/#{election.body.slug}/elections/#{election.d}" }
-            = election.body.name
-            \ - 
-            = election.kind
             = short_date(election.d)
+        %td
+          = election.body.name
+        %td
+          = election.kind
 
 - if @past_elections.size > 0
 
   %h2 Past elections
-  
+
   %table
     - @past_elections.each do |election|
       %tr
         %td
           %a{ :href => "/bodies/#{election.body.slug}/elections/#{election.d}" }
-            = election.body.name
-            \ - 
-            = election.kind
             = short_date(election.d)
-
--#
-  %h2 Sutton Council Results by Ward
-  
-  %p Click on the ward names to see the full results for that ward.
-
-  %table.wardmap
-    %tr
-      %td.blank
-      %td.blank
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/st-helier' } St Helier
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/wandle-valley' } Wandle Valley
-      %td.blank
-      %td.blank
-    %tr
-      %td.ld2
-        %a{ :href => 'results/sutton-council/2010-05-06/worcester-park' } Worcester Park
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/stonecot' } Stonecot
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/sutton-north' } Sutton North
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/the-wrythe' } The Wrythe
-      %td.blank
-      %td.blank
-    %tr
-      %td.ld2
-        %a{ :href => 'results/sutton-council/2010-05-06/nonsuch' } Nonsuch
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/sutton-west' } Sutton West
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/sutton-central' } Sutton Central
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/carshalton-central' } Carshalton Central
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/wallington-north' } Wallington North
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/beddington-north' } Beddington North
-    %tr
-      %td.blank
-      %td.ld1
-        %a{ :href => 'results/sutton-council/2010-05-06/cheam' } Cheam
-      %td.ld2
-        %a{ :href => 'results/sutton-council/2010-05-06/sutton-south' } Sutton South
-      %td.ld1
-        %a{ :href => 'results/sutton-council/2010-05-06/carshalton-south-and-clockhouse' } Carshalton South &amp; Clockhouse
-      %td.ld3
-        %a{ :href => 'results/sutton-council/2010-05-06/wallington-south' } Wallington South
-      %td.ld2
-        %a{ :href => 'results/sutton-council/2010-05-06/beddington-south' } Beddington South
-    %tr
-      %td.blank
-      %td.blank
-      %td.con3
-        %a{ :href => 'results/sutton-council/2010-05-06/belmont' } Belmont
-      %td.blank
-      %td.blank
-      %td.blank
-
-
+        %td
+          = election.body.name
+        %td
+          = election.kind