Преглед на файлове

Minor text improvements

tags/last-sinatra-version
Adrian Short преди 14 години
родител
ревизия
45aac13717
променени са 5 файла, в които са добавени 33 реда и са изтрити 32 реда
  1. +0
    -15
      app.rb
  2. +4
    -9
      views/about.haml
  3. +6
    -2
      views/election.haml
  4. +17
    -2
      views/parliament.haml
  5. +6
    -4
      views/wards.haml

+ 0
- 15
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

+ 4
- 9
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.

+ 6
- 2
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 “no overall control”.
%p Elections for Sutton Council take place every four years.
= haml_partial('register-to-vote')

+ 17
- 2
views/parliament.haml Целия файл

@@ -1,6 +1,21 @@
.grid_9

%h1 How the parliament election works
%p Text to follow…
%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')
%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 “hung parliament”.

%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')

+ 6
- 4
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


Зареждане…
Отказ
Запис