aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/views/general/_frontpage_intro_sentence.rhtml4
-rw-r--r--app/views/general/frontpage.rhtml55
-rw-r--r--app/views/layouts/default.rhtml2
3 files changed, 32 insertions, 29 deletions
diff --git a/app/views/general/_frontpage_intro_sentence.rhtml b/app/views/general/_frontpage_intro_sentence.rhtml
index 4e6dbecb3..8ef69897c 100644
--- a/app/views/general/_frontpage_intro_sentence.rhtml
+++ b/app/views/general/_frontpage_intro_sentence.rhtml
@@ -1,3 +1 @@
-<h3>Use your Right to Know</h3>
-
-Every citizen has the right to access information held by public authorities. <strong>By law, they have to respond</strong>. <a href="<%= help_about_url %>">Find out more about freedom of information.</a>
+Every citizen has the right to access information held by public authorities. <strong>By law, they have to respond</strong>. <a href="<%= help_about_url %>">Find out more about freedom of information.</a>
diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml
index ee88d23a1..60bed18a4 100644
--- a/app/views/general/frontpage.rhtml
+++ b/app/views/general/frontpage.rhtml
@@ -1,32 +1,37 @@
<% view_cache :ttl => 5.minutes, :tag => I18n.locale do %>
-
-
- <div class="frontpage-box" id="frontpage-box-1">
- <%= render :partial => 'frontpage_intro_sentence' %>
- </div>
-
- <div class="frontpage-box" id="frontpage-box-2">
- <div id="bighand">
- Make a new <strong>Freedom of Information</strong> request
- <br />
- <a href="/en/new/tgq"><%= image_tag('start-button.png') %></a>
- </div>
- </div>
-
- <div class="frontpage-box" id="frontpage-box-3">
- <div id="littlehand">
- Search over <strong><%= InfoRequest.count %> requests</strong> and <strong><%= PublicBody.count %> authorities</strong>:
- <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %>
- <%= text_field_tag 'query', params[:query], { :size => 30 } %>
- <%= hidden_field_tag 'bodies', 1 %>
- <%= image_submit_tag 'button-search.png', :title => 'Search' %>
- <br>
- <%= render :partial => 'frontpage_search_examples' %>
- <% end %>
+ <div id="frontpage_splash">
+ <div id="left_column">
+ <h1>
+ Make a new<br/>
+ <strong>Freedom <span>of</span><br/>
+ Information<br/>
+ request</strong>
+ </h1>
+ <a class="link_button_green_large" href="/en/new/tgq">Start now &raquo;</a>
</div>
+ <div id="right_column">
+ <div id="frontpage_search_box">
+ <h2>
+ Search over</br>
+ <strong><%= InfoRequest.count %> requests</strong> <span>and</span><br/>
+ <strong><%= PublicBody.count %> authorities</strong>
+ </h2>
+ <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %>
+ <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+ <%= hidden_field_tag 'bodies', 1 %>
+ <%= submit_tag 'Search' %>
+ <% end %>
+ </div>
+ <div id="frontpage_right_to_know">
+ <h2>
+ Your <strong>Right to Know</strong>
+ </h2>
+ <p><%= render :partial => 'frontpage_intro_sentence' %></p>
+ </div>
+ </div>
+ <div style="clear:both"></div>
</div>
-
<div id="frontpage_examples">
<% if @popular_bodies.size > 0 %>
<div id="examples_0">
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index f5fed2a8f..f365134e5 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -51,7 +51,7 @@
<%= render :partial => 'general/before_head_end' %>
</head>
- <body>
+ <body <%= "class='front'" if params[:action] == 'frontpage' %>>
<% # code for popup advert for a campaign etc.
=begin