diff options
| author | francis <francis> | 2009-01-10 13:51:04 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-01-10 13:51:04 +0000 |
| commit | 4c28f30e4547a5a8d54a949d0dd0c08dac9519ed (patch) | |
| tree | f95d5397e0e35992b0688b50e784ed016ed5b7c4 | |
| parent | 31392a9cc9ff26f51ad86e0ca798d71a0a288d95 (diff) | |
Change wording of front page (due to Karl).
Make view requests link go to successful ones by default, rather than sent ones, so is more encouraging.
| -rw-r--r-- | app/controllers/request_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 10 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/list.rhtml | 5 |
4 files changed, 19 insertions, 5 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index b98db6622..9177e371a 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_controller.rb,v 1.143 2008-12-04 20:03:46 francis Exp $ +# $Id: request_controller.rb,v 1.144 2009-01-10 13:51:04 francis Exp $ class RequestController < ApplicationController @@ -72,6 +72,11 @@ class RequestController < ApplicationController @view = params[:view] if @view.nil? + redirect_to request_list_url(:view => 'successful') + return + end + + if @view == 'recent' @title = "Recently sent Freedom of Information requests" query = "variety:sent"; sortby = "newest" diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 2717d3037..f0181b50c 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -3,14 +3,20 @@ <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> <p> - <strong>First, type in the name of the UK public authority - <br>you'd like information from OR anything to search for</strong> + First, type in the <strong>name of the UK public authority</strong> you'd + <br>like information from. <strong>By law, they have to send it to you.</strong> + <br> + <br> <%= text_field_tag 'query', params[:query], { :size => 30 } %> <%= hidden_field_tag 'bodies', 1 %> <%= submit_tag "Search" %> <br> e.g. <%=link_to 'Liverpool', search_url('liverpool', 'bodies')%>, <%=link_to 'MRSA', search_url('mrsa', 'bodies')%>, <%=link_to 'Treasury', search_url('treasury', 'bodies')%> + + <br> + <br> + OR, <strong>search</strong> for information others have requested. </p> <% end %> </div> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index c3aed2e74..1cb18626b 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -50,7 +50,7 @@ <div id="topnav"> <ul id="navigation"> <li><a href="/">Make request</a></li> - <li><%= link_to "View requests", request_list_url(:view => nil) %></li> + <li><%= link_to "View requests", request_list_url(:view => 'successful') %></li> <li><%= link_to "View authorities", list_public_bodies_default %></li> <% if @user %> <li><%=link_to "My requests", user_url(@user) %></li> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 3b732e0de..102627e59 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -1,7 +1,10 @@ <div id="list_sidebar"> <h1>Show only...</h1> <ul> -<% for view, description in [ [nil, "Recently sent requests"], ['successful', "Successful responses"] ] %> +<% for view, description in [ + ['successful', "Successful responses"], + ['recent', "Recently sent requests"] +] %> <li> <%= link_to_unless (@view == view), description, request_list_url(:view => view) %> </li> |