From 45aac1371741002706f460a003976c70903b084e Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Thu, 15 Apr 2010 01:08:34 +0100
Subject: [PATCH] Minor text improvements

---
 app.rb                | 15 ---------------
 views/about.haml      | 13 ++++---------
 views/election.haml   |  8 ++++++--
 views/parliament.haml | 19 +++++++++++++++++--
 views/wards.haml      | 10 ++++++----
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/app.rb b/app.rb
index 316fcaa..f2f9328 100644
--- a/app.rb
+++ b/app.rb
@@ -53,20 +53,5 @@ get '/error' do
 end
 
 get '/about' do
-  @accounts = %w{
-    adrianshort
-    stef
-    pezholio
-    countculture
-    understood
-    mashthestate
-    openlylocal
-    openelection
-    lbsuttonnews
-    suttongisteam
-    stonecothill
-    sutmoblib
-    mysociety
-  }
   haml :about
 end
diff --git a/views/about.haml b/views/about.haml
index 908d058..f24af47 100644
--- a/views/about.haml
+++ b/views/about.haml
@@ -13,6 +13,8 @@
     
   %p.highlight This site is independent of Sutton Council, all political parties and candidates.
   
+  %p Every page on this website prints beautifully.
+  
   %p
     The council candidates' data comes from Sutton Council who also provided information on council wards and parliamentary constituencies. 
   
@@ -26,15 +28,8 @@
     The postcode lookup is done by UK Postcodes using open data from Ordnance Survey enhanced by MySociety. I use the Ruby Pat gem to access the postcodes API.
     
   %p
-    The HTML templates use Haml. The database is SQLite for development and PostgreSQL for production, abstracted through DataMapper.
+    The page templates use Haml and SprySoft's Variable Grid System. The database is SQLite for development and PostgreSQL for production, abstracted through DataMapper.
   %p  
     Source control and deployment is done with Git.
-  
-  -#
-    
-    %h2 #followfooter
     
-    %ul
-      - for account in @accounts
-        %li
-          %a{ :href => "http://twitter.com/#{account}" }@#{account}
+  %p The font is Museo Slab served by Typekit.
diff --git a/views/election.haml b/views/election.haml
index e3f4991..49a0a0c 100644
--- a/views/election.haml
+++ b/views/election.haml
@@ -1,7 +1,7 @@
 .grid_9
   %h1 How the council election works
   
-  %p On 6 May 2010 you get to choose your local councillors and to decide who runs Sutton Council for the next four years.
+  %p On 6 May 2010 you get to choose your local councillors and to help to decide who runs Sutton Council.
   
   %p Sutton borough is divided into 18 areas called wards.
   
@@ -11,6 +11,10 @@
   
   %p The three people with the most votes in each ward become the councillors for that ward.
   
-  %p If a political party gets 28 or more councillors they get to run Sutton Council and decide its policies and services until the next election in four years time.
+  %p If a political party gets 28 or more councillors they get to run Sutton Council and decide its policies and services.
+  
+  %p If no party gets 28 councillors the parties have to agree among themselves who will run the council. This is called &ldquo;no overall control&rdquo;.
+  
+  %p Elections for Sutton Council take place every four years.
   
   = haml_partial('register-to-vote')
diff --git a/views/parliament.haml b/views/parliament.haml
index 40ce590..1d0c792 100644
--- a/views/parliament.haml
+++ b/views/parliament.haml
@@ -1,6 +1,21 @@
 .grid_9
+
   %h1 How the parliament election works
   
-  %p Text to follow&hellip;
+  %p On 6 May 2010 you can vote for your local member of parliament and help to decide who governs the UK.
   
-  = haml_partial('register-to-vote')
\ No newline at end of file
+  %p The UK is divided into 650 areas called constituencies. Each constituency elects one MP.
+  
+  %p The London Borough of Sutton has two constituencies: Sutton and Cheam, and Carshalton and Wallington.
+    
+  %p You get one vote to help choose the MP for your area from a list of candidates.
+  
+  %p The person with the most votes becomes the MP.
+  
+  %p If a political party gets 326 or more out of 650 MPs they can form a government to run the country.
+  
+  %p If no party gets 326 MPs the parties have to agree among themselves who will run the country. This is called a &ldquo;hung parliament&rdquo;.
+
+  %p Elections for parliament must be held at least once every five years. The prime minister can choose to have an election earlier if they wish.  
+  
+  = haml_partial('register-to-vote')
diff --git a/views/wards.haml b/views/wards.haml
index afac922..5cef889 100644
--- a/views/wards.haml
+++ b/views/wards.haml
@@ -1,9 +1,11 @@
--#
-  - if @postcode
-    %h2
-      If you live in 
+- if @postcode
+  .grid_12
+    %h2.noprint
+      These are the candidates for  
       = @postcode
 
+.clear
+
 .grid_6
   %h1
     = @ward.constituency.name