diff options
Diffstat (limited to 'app')
23 files changed, 1114 insertions, 1112 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index dadbb0cbd..b7c8767cc 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -429,7 +429,7 @@ class RequestController < ApplicationController elsif @info_request.calculate_status == 'gone_postal' redirect_to respond_to_last_url(@info_request) + "?gone_postal=1" elsif @info_request.calculate_status == 'internal_review' - flash[:notice] = _("<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a response within 20 days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>", :review_url => unhappy_url(@info_request) + "#internal_review") + flash[:notice] = _("<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a response within {{late_number_of_days}} days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>",:late_number_of_days => MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20), :review_url => unhappy_url(@info_request) + "#internal_review") redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'error_message' flash[:notice] = _("<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below.</p>") @@ -608,23 +608,29 @@ class RequestController < ApplicationController # special caching code so mime types are handled right around_filter :cache_attachments, :only => [ :get_attachment, :get_attachment_as_html ] def cache_attachments - key = params.merge(:only_path => true) - key_path = foi_fragment_cache_path(key) + if !params[:skip_cache].nil? + yield + else + key = params.merge(:only_path => true) + key_path = foi_fragment_cache_path(key) - if foi_fragment_cache_exists?(key_path) - cached = foi_fragment_cache_read(key_path) - response.content_type = AlaveteliFileTypes.filename_to_mimetype(params[:file_name].join("/")) || 'application/octet-stream' - render_for_text(cached) - return - end + if foi_fragment_cache_exists?(key_path) + cached = foi_fragment_cache_read(key_path) + response.content_type = AlaveteliFileTypes.filename_to_mimetype(params[:file_name].join("/")) || 'application/octet-stream' + render_for_text(cached) + return + end - yield + yield - # write it to the fileystem ourselves, so is just a plain file. (The - # various fragment cache functions using Ruby Marshall to write the file - # which adds a header, so isnt compatible with images that have been - # extracted elsewhere from PDFs) - foi_fragment_cache_write(key_path, response.body) + if params[:skip_cache].nil? + # write it to the fileystem ourselves, so is just a plain file. (The + # various fragment cache functions using Ruby Marshall to write the file + # which adds a header, so isnt compatible with images that have been + # extracted elsewhere from PDFs) + foi_fragment_cache_write(key_path, response.body) + end + end end def get_attachment @@ -653,7 +659,7 @@ class RequestController < ApplicationController view_html_stylesheet = render_to_string :partial => "request/view_html_stylesheet" html.sub!(/<head>/i, "<head>" + view_html_stylesheet) - html.sub!(/<body[^>]*>/i, '<body><prefix-here><div id="' + wrapper_id + '"><div id="view_html_content">') + html.sub!(/<body[^>]*>/i, '<body><prefix-here><div id="' + wrapper_id + '"><div id="view-html-content">') html.sub!(/<\/body[^>]*>/i, '</div></div></body>') view_html_prefix = render_to_string :partial => "request/view_html_prefix" @@ -661,7 +667,6 @@ class RequestController < ApplicationController html.sub!("<attachment-url-here>", CGI.escape(@attachment_url)) @incoming_message.html_mask_stuff!(html) - response.content_type = 'text/html' render :text => html end diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index b0b02fdda..16ae38b92 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -255,7 +255,8 @@ class FOIAttachment text = CGI.escapeHTML(text) text = MySociety::Format.make_clickable(text) html = text.gsub(/\n/, '<br>') - return "<html><head></head><body>" + html + "</body></html>", wrapper_id + return '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"><html><head><title></title></head><body>' + html + "</body></html>", wrapper_id end # the extractions will also produce image files, which go in the @@ -987,7 +988,6 @@ class IncomingMessage < ActiveRecord::Base attachment.filename = _get_censored_part_file_name(leaf) if leaf.within_rfc822_attachment attachment.within_rfc822_subject = leaf.within_rfc822_attachment.subject - # Test to see if we are in the first part of the attached # RFC822 message and it is text, if so add headers. # XXX should probably use hunting algorithm to find main text part, rather than diff --git a/app/views/general/_frontpage_intro_sentence.rhtml b/app/views/general/_frontpage_intro_sentence.rhtml index 2c3bcaf83..4e6dbecb3 100644 --- a/app/views/general/_frontpage_intro_sentence.rhtml +++ b/app/views/general/_frontpage_intro_sentence.rhtml @@ -1,3 +1,3 @@ -First, type in the <strong>name of the UK public authority</strong> you'd -<br>like information from. <strong>By law, they have to respond</strong> -(<a href="<%= help_about_url %>">why?</a>). +<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> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index abed0294e..6294e4353 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -1,33 +1,40 @@ <% view_cache :ttl => 5.minutes, :tag => I18n.locale do %> -<div id="frontpage_search"> - <h1><%= _('Make or explore Freedom of Information requests') %></h1> + <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="http://127.0.0.1:3000/en/new/tgq"><img alt="Start-button" src="http://127.0.0.1:3000/images/start-button.png?1314013338"></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 %> - <p> - <%= render :partial => 'frontpage_intro_sentence' %> - <br> - - <br> <%= text_field_tag 'query', params[:query], { :size => 30 } %> <%= hidden_field_tag 'bodies', 1 %> - <%= submit_tag _('Search') %> + <%= image_submit_tag 'button-search.png', :title => 'Search' %> <br> <%= _('e.g.') %> <% @search_examples.each_with_index do |name, i| %> <%=link_to name, search_url(name, 'bodies')%><% if i < 2 %>, <% else %>. <% break %><% end %> <% end %> - - <br> - <br> - <%= _('OR, <strong>search</strong> for information others have requested using {{site_name}}', :site_name => site_name) %> - </p> <% end %> -</div> + </div> + </div> + <div id="frontpage_examples"> <% if @popular_bodies.size > 0 %> <div id="examples_0"> + <h3>Who has the information?</h3> + <%= site_name %> covers requests to <%= PublicBody.count %> authorities, including: <ul> <% for popular_body in @popular_bodies %> <li><%=public_body_link(popular_body)%> @@ -36,23 +43,27 @@ <% end%> </ul> <p><strong> - <%= link_to _('More authorities...'), list_public_bodies_default %> + <%= link_to _('Browse all authorities...'), list_public_bodies_default %> </strong></p> </div> <% end %> - <% if @successful_request_events.size > 0 %> <div id="examples_1"> + <h3>What are people asking?</h3> + <%= site_name %> users have asked <%= InfoRequest.count %> questions. <ul> - <% for event in @successful_request_events %> - <li><%=link_to h(excerpt(event.info_request.title, "", 30)), request_url(event.info_request)%> - <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %> + + <% for event in @successful_request_events %> + <li> + <%= public_body_link(event.info_request.public_body) %> answered a question about + <%=link_to h(event.info_request.title), request_url(event.info_request)%> + <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %> + <p class="excerpt" onclick="document.location.href='<%=request_url(event.info_request)%>'"><%= excerpt(event.info_request.title, "", 200) %></p> </li> <% end %> </ul> <p><strong><%=link_to _('More successful requests...'), request_list_successful_url %></strong></p> </div> - <% end %> </div> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index ec12b2bf3..cc522b367 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -1,120 +1,113 @@ <% @show_tips = @xapian_requests.nil? || (@total_hits == 0) %> -<% if @query.nil? %> - <% @title = _("Search Freedom of Information requests, public authorities and users") %> - <h1><%=@title%></h1> -<% elsif @total_hits == 0 %> - <%= _("Nothing found for ‘{{search_terms}}’", :search_terms => h(@query)) %> -<% else %> - <% @title = _("Results page {{page_number}}", :page_number => @page.to_s) %> -<% end%> - <% @include_request_link_in_authority_listing = true %> -<% if @bodies && (@page == 1 || @xapian_bodies.results.size > 0) %> - <div id="stepwise_instructions"> - <p><strong><%=_("Next, select the public authority you'd like to make the request from.") %></strong></p> - <p><% _('Can\'t find it? <a href="%s">Browse all</a> or <a href="%s">ask us to add it</a>.') % [list_public_bodies_default, "#{help_requesting_path}#missing_body"] %></p> - <p> - </div> -<% end %> - -<% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> - <p> - <%= text_field_tag 'query', @query, { :size => 40 } %> - <%= hidden_field_tag 'sortby', @inputted_sortby %> - <% if @bodies %> - <%= hidden_field_tag 'bodies', 1 %> - <% end %> - <%= submit_tag _("Search") %> - <% if not @show_tips %> - <%= link_to _('Advanced search tips'), search_redirect_path %> - <% end %> - </p> -<% end %> - -<% if !@query.nil? %> - <p> - <%=link_to_unless @sortby == 'relevant', _("Show most relevant results first"), search_url(@query, 'relevant') %> - | - <%=link_to_unless @sortby == 'newest', _("Newest results first"), search_url(@query, 'newest') %> - <% if @sortby == 'described' %> - | <%= _('Recently described results first') %> - <% end %> - </p> +<div id="header_left"> + <% if @query.nil? %> + <h1>Search</h1> + <% else %> + <h1>Search results</h1> + <% end%> + + <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> + <p> + <%= text_field_tag 'query', @query, { :size => 40 } %> + <%= hidden_field_tag 'sortby', @inputted_sortby %> + <% if @bodies %> + <%= hidden_field_tag 'bodies', 1 %> + <% end %> + <%= image_submit_tag 'button-search.png', :title=>"Search" %> + <% if not @show_tips %> + <%= link_to _('Advanced search tips'), search_redirect_path %> + <% end %> + </p> + <% end %> + + <% if !@query.nil? %> + <p id="search_controls"> + <%=link_to_unless @sortby == 'relevant', _("Show most relevant results first"), search_url(@query, 'relevant') %> + | + <%=link_to_unless @sortby == 'newest', _("Newest results first"), search_url(@query, 'newest') %> + <% if @sortby == 'described' %> + | <%= _('Recently described results first') %> + <% end %> + </p> + <% end %> +</div> + +<% if @track_thing %> + <div id="header_right"> + <h2>Track this search</h2> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> + </div> <% end %> -<% if @bodies && !@query.nil? && @xapian_bodies.results.size == 0 && @page == 1 %> - <h1><%= _('No public authorities found') %></h1> - <% if @spelling_correction %> - <p id="did_you_mean"><%= _('Did you mean: {{correction}}', - :correction => search_link(@spelling_correction, @postfix)) %></p> - <% end %> - <p><%= _('<a href="%s">Browse all</a> or <a href="%s">ask us to add one</a>.') % [list_public_bodies_default, help_requesting_path + '#missing_body'] %></p> -<% end %> +<div style="clear:both;"></div> <% if @total_hits == 0 %> - <h1><%=@title %></h1> + <h2><%=@title %></h2> <% end %> <% if not @query.nil? %> - <% if @spelling_correction %> - <p id="did_you_mean"><%= _('Did you mean: {{correction}}', :correction => search_link(@spelling_correction, @postfix)) %></p> - <% end %> - - <% if (!@bodies || @xapian_requests.results.size == 0) && @track_thing && (@xapian_bodies.results.size > 0 || @xapian_users.results.size > 0 || @total_hits == 0)%> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> - <% end %> - - <% if @xapian_bodies.results.size > 0 %> - <% if @xapian_bodies.results.size == 1 && @page == 1 %> - <h1><%= _('One public authority matching ‘{{user_search_query}}’', :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> - <% end %> - - <% for result in @xapian_bodies.results %> - <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> - <% end %> - - <%= will_paginate WillPaginate::Collection.new(@page, @bodies_per_page, @xapian_bodies.matches_estimated) %> - <% end %> - - <% if @xapian_users.results.size > 0 %> - <% if @xapian_users.results.size == 1 && @page == 1 %> - <h1><%= _("One person matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> - <% end %> - - <% for result in @xapian_users.results %> - <%= render :partial => 'user/user_listing_single', :locals => { :display_user => result[:model] } %> - <% end %> - - <%= will_paginate WillPaginate::Collection.new(@page, @users_per_page, @xapian_users.matches_estimated) %> - <% end %> - - <% if @xapian_requests.results.size > 0 %> - <% if @xapian_requests.results.size == 1 && @page == 1 %> - <h1><%= _("One FOI request matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> - <% end %> - - <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> + <div class="results_section"> + <% if @xapian_bodies.results.size > 0 %> + <% if @xapian_bodies.results.size == 1 && @page == 1 %> + <h2 class="publicbody_results"><%= _('One public authority found') %></h2> + <% else %> + <h2 class="publicbody_results"><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s, :user_search_query => h(@query)) %></h2> + <% end %> + + <div class="results_block"> + <% for result in @xapian_bodies.results %> + <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> + <% end %> + </div> + + <%= will_paginate WillPaginate::Collection.new(@page, @bodies_per_page, @xapian_bodies.matches_estimated) %> + <% elsif @bodies && !@query.nil? && @xapian_bodies.results.size == 0 && @page == 1 %> + <h2 class="publicbody_results"><%= _('No public authorities found') %></h2> + <% if @spelling_correction %> + <p id="did_you_mean"><%= _('Did you mean: {{correction}}', :correction => search_link(@spelling_correction, @postfix)) %></p> <% end %> + <p><%= _('<a href="%s">Browse all</a> or <a href="%s">ask us to add one</a>.') % [list_public_bodies_default, help_requesting_path + '#missing_body'] %></p> + <% end %> + </div> - <% for result in @xapian_requests.results %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> - <% end %> + <div class="results_section"> + <% if @xapian_users.results.size > 0 %> + <% if @xapian_users.results.size == 1 && @page == 1 %> + <h2 class="person_results"><%= _("One person found") %></h2> + <% else %> + <h2 class="person_results"><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h2> + <% end %> + + <div class="results_block"> + <% for result in @xapian_users.results %> + <%= render :partial => 'user/user_listing_single', :locals => { :display_user => result[:model] } %> + <% end %> + </div> + + <%= will_paginate WillPaginate::Collection.new(@page, @users_per_page, @xapian_users.matches_estimated) %> + <% end %> + </div> - <%= will_paginate WillPaginate::Collection.new(@page, @requests_per_page, @xapian_requests.matches_estimated) %> - <% if @track_thing %> - <p></p> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> - <% end %> - <% end %> + <div class="results_section"> + <% if @xapian_requests.results.size > 0 %> + <% if @xapian_requests.results.size == 1 && @page == 1 %> + <h2 class="foi_results"><%= _("One FOI request found") %></h2> + <% else %> + <h2 class="foi_results"><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h2> + <% end %> + + <div class="results_block"> + <% for result in @xapian_requests.results %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> + <% end %> + </div> + + <%= will_paginate WillPaginate::Collection.new(@page, @requests_per_page, @xapian_requests.matches_estimated) %> + <% end %> + </div> <% end %> <% if @show_tips %> @@ -152,7 +145,7 @@ <tr><td><strong><%=search_link('status:user_withdrawn')%></strong></td><td><%= _('The requester has abandoned this request for some reason') %></td></tr> </table> - <h2 id="varieties">Table of varieties</h2> + <h2 id="varieties"><%= _('Table of varieties') %></h2> <table class="status_table"> <tr><td><strong><%=search_link('variety:sent')%></strong></td><td><%= _('Original request sent') %></td></tr> diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.rhtml index 99298e9c6..b6d26271e 100644 --- a/app/views/help/_sidebar.rhtml +++ b/app/views/help/_sidebar.rhtml @@ -1,6 +1,6 @@ -<div id="about_sidebar"> - <h1>Help pages</h1> - <ul> +<div id="right_column"> + <h2>Help pages</h2> + <ul class="no_bullets"> <li><%= link_to_unless_current "Introduction", "/help/about" %></li> <li><%= link_to_unless_current "Making requests", "/help/requesting" %></li> <li><%= link_to_unless_current "Your privacy", "/help/privacy" %></li> @@ -10,7 +10,7 @@ <li><%= link_to_unless_current "Advanced search", "/search" %></li> </ul> - <h1 id="contact">Contact us</h1> + <h2 id="contact">Contact us</h2> <p>If your question isn't answered here, or you just wanted to let us know something about the site, <a href="/help/contact">contact us</a>. </p> diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index d22cc5b30..648ca1fb2 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -2,50 +2,52 @@ <%= render :partial => 'sidebar' %> -<h1 id="introduction">Introduction to <%= site_name %><a href="#introduction">#</a> </h1> -<dl> - -<dt id="purpose">What is <%= site_name %> for? <a href="#purpose">#</a> </dt> -<dd>To help you find out inside information about what the UK government -is doing. -</dd> - -<dt id="premise">How does the site work? <a href="#premise">#</a> </dt> -<dd>You choose the public authority that you would like information from, then -write a brief note describing what you want to know. We then send your request -to the public authority. Any response they make is automatically published on the -website for you and anyone else to find and read. -</dd> - -<dt id="whybother_me">Why would I bother to do this? <a href="#whybother_me">#</a> </dt> -<dd>You pay taxes, and then government does things with the money. All sorts of -things that affect your life, from healthcare through to national defence. Some -it does badly, some it does well. The more we find out about how government -works, the better able we are to make suggestions to improve the things that -are done badly, and to celebrate the things that are done well. -</dd> - -<dt id="whybother_them">Why would the public authority bother to reply? <a href="#whybother_them">#</a> </dt> -<dd>Under Freedom of Information (FOI) law, they have to respond. The response -will either contain the information you want, or give a valid legal reason why -it must be kept confidential. -</dd> - -<dt id="who">Who makes <%= site_name %>? <a href="#who">#</a> </dt> -<dd><%= site_name %> is created and run by <a href="http://www.mysociety.org">mySociety</a>, -and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the -registered charity <a href="http://www.ukcod.org.uk/UK_Citizens_Online_Democracy">UK Citizens Online Democracy</a>. -If you like what we're doing, then you can -<a href="https://secure.mysociety.org/donate/">make a donation</a>. -</dd> - -<dt id="updates">How can I keep up with news about <%= site_name %>?<a href="#updates">#</a> </dt> -<dd>We have a <a href="/blog">blog</a> and a <a href="http://www.twitter.com/whatdotheyknow">twitter feed</a>. -</dd> - - -</dl> - -<p><strong>Next</strong>, read about <a href="/help/requesting">making requests</a> --> - -<div id="hash_link_padding"></div> +<div id="left_column"> + <h1 id="introduction">Introduction</h1> + <dl> + + <dt id="purpose">What is WhatDoTheyKnow for? <a href="#purpose">#</a> </dt> + <dd>To help you find out inside information about what the UK government + is doing. + </dd> + + <dt id="premise">How does the site work? <a href="#premise">#</a> </dt> + <dd>You choose the public authority that you would like information from, then + write a brief note describing what you want to know. We then send your request + to the public authority. Any response they make is automatically published on the + website for you and anyone else to find and read. + </dd> + + <dt id="whybother_me">Why would I bother to do this? <a href="#whybother_me">#</a> </dt> + <dd>You pay taxes, and then government does things with the money. All sorts of + things that affect your life, from healthcare through to national defence. Some + it does badly, some it does well. The more we find out about how government + works, the better able we are to make suggestions to improve the things that + are done badly, and to celebrate the things that are done well. + </dd> + + <dt id="whybother_them">Why would the public authority bother to reply? <a href="#whybother_them">#</a> </dt> + <dd>Under Freedom of Information (FOI) law, they have to respond. The response + will either contain the information you want, or give a valid legal reason why + it must be kept confidential. + </dd> + + <dt id="who">Who makes WhatDoTheyKnow? <a href="#who">#</a> </dt> + <dd>WhatDoTheyKnow is created and run by <a href="http://www.mysociety.org">mySociety</a>, + and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the + registered charity <a href="http://www.ukcod.org.uk/UK_Citizens_Online_Democracy">UK Citizens Online Democracy</a>. + If you like what we're doing, then you can + <a href="https://secure.mysociety.org/donate/">make a donation</a>. + </dd> + + <dt id="updates">How can I keep up with news about WhatDoTheyKnow?<a href="#updates">#</a> </dt> + <dd>We have a <a href="/blog">blog</a> and a <a href="http://www.twitter.com/whatdotheyknow">twitter feed</a>. + </dd> + + + </dl> + + <p><strong>Next</strong>, read about <a href="/help/requesting">making requests</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml index 3cafbb665..297aa1e8b 100644 --- a/app/views/help/api.rhtml +++ b/app/views/help/api.rhtml @@ -1,82 +1,81 @@ -<% @title = "Application Programming Interface - API" %> +<% @title = "About our API" %> <%= render :partial => 'sidebar' %> -<h1><%=@title %></h1> - -<h2> Introduction </h2> - -<p>This page explains how programmers can make other websites and software -interact with <%= site_name %> via an "API". -</p> - -<p><%= site_name %> does not have a full API yet, but we are gradually adding -lots of things that are similar in use to an API as they are requested. -</p> - -<hr> - -<h2> 1. Linking to new requests </h2> - -<p>To encourage your users to make links to a particular public authority, use URLs of the form -<%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. -These are the parameters you can add to those URLs, either in the URL or from a form. - -<ul> - <li> <strong>title</strong> - default summary of the new request.</li> - <li> <strong>default_letter</strong> - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this. </li> - <li> <strong>body</strong> - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff. </li> - <li> <strong>tags</strong> - space separated list of tags, so you can find and link up any requests made later, e.g. <em>openlylocal spending_id:12345</em>. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. -</ul> - -<hr> - -<h2> 2. RSS (actually, Atom) feeds </h2> - -<p>There are Atom feeds on most pages which list FOI requests, which you can -use to get updates and links in XML format. Find the URL of the Atom feed in -one of these ways: -<ul> - <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li> - <li>Examine the <tt><link rel="alternate" type="application/atom+xml"></tt> tag in the head of the HTML. </li> - <li>Add <tt>/feed</tt> to the start of another URL. -</ul> - -<p>In particular, even complicated search queries have Atom feeds. -You can do all sorts of things with them, such as query by authority, by file -type, by date range, or by status. See the <a href="/search">advanced search -tips</a> for details. - -<hr> - -<h2> 3. JSON structured data </h2> - -<p>Quite a few pages have JSON versions, which let you download information about -objects in a structured form. Find them by: -<ul> - <li>Adding <tt>.json</tt> to the end of the URL. </li> - <li>Look for the <tt><link rel="alternate" type="application/json"></tt> tag in the head of the HTML. </li> -</ul> -</p> - -<p>Requests, users and authorities all have JSON versions containing basic -information about them. Every Atom feed has a JSON equivalent, containing -information about the list of events in the feed. -</p> - -<hr> -<h2> 4. Spreadsheet of all authorities </h2> - -<p> -A spreadsheet file listing every body in <%= site_name %> is available: -<%= link_to "all-authorities.csv", all_public_bodies_csv_url() %> -</p> - -<hr> - -<p>Please <a href="/help/contact">contact us</a> if you need an API feature that isn't there yet. It's -very much a work in progress, and we do add things when people ask us to.</p> - -<div id="hash_link_padding"></div> - +<div id="left_column"> + <h1><%=@title %></h1> + <dl> + <dt>Introduction</dt> + <dd> + <p>This page explains how programmers can make other websites and software + interact with WhatDoTheyKnow via an "API". + </p> + + <p>WhatDoTheyKnow does not have a full API yet, but we are gradually adding + lots of things that are similar in use to an API as they are requested. + </p> + </dd> + + <dt>Linking to new requests</dt> + <dd> + <p>To encourage your users to make links to a particular public authority, use URLs of the form + <%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. + These are the parameters you can add to those URLs, either in the URL or from a form. + + <ul> + <li> <strong>title</strong> - default summary of the new request.</li> + <li> <strong>default_letter</strong> - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this. </li> + <li> <strong>body</strong> - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff. </li> + <li> <strong>tags</strong> - space separated list of tags, so you can find and link up any requests made later, e.g. <em>openlylocal spending_id:12345</em>. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. + </ul> + </dd> + + <dt>RSS (actually, Atom) feeds</h2> + <dd> + <p>There are Atom feeds on most pages which list FOI requests, which you can + use to get updates and links in XML format. Find the URL of the Atom feed in + one of these ways: + <ul> + <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li> + <li>Examine the <tt><link rel="alternate" type="application/atom+xml"></tt> tag in the head of the HTML. </li> + <li>Add <tt>/feed</tt> to the start of another URL. + </ul> + + <p>In particular, even complicated search queries have Atom feeds. + You can do all sorts of things with them, such as query by authority, by file + type, by date range, or by status. See the <a href="/search">advanced search + tips</a> for details. + </dd> + + <dt>JSON structured data</dt> + <dd> + <p>Quite a few pages have JSON versions, which let you download information about + objects in a structured form. Find them by: + <ul> + <li>Adding <tt>.json</tt> to the end of the URL. </li> + <li>Look for the <tt><link rel="alternate" type="application/json"></tt> tag in the head of the HTML. </li> + </ul> + </p> + + <p>Requests, users and authorities all have JSON versions containing basic + information about them. Every Atom feed has a JSON equivalent, containing + information about the list of events in the feed. + </p> + </dd> + + <dt>Spreadsheet of all authorities</dt> + <dd> + <p> + A spreadsheet file listing every body in WhatDoTheyKnow is available: + <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %> + </p> + + </dd> + </dl> + + <p>Please <a href="/help/contact">contact us</a> if you need an API feature that isn't there yet. It's + very much a work in progress, and we do add things when people ask us to.</p> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index 6c65fb1c9..dd49f7951 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -2,10 +2,12 @@ <%= foi_error_messages_for :contact %> +<h1><%= @title %></h1> + <div id="contact_preamble"> <% if !flash[:notice] %> - <h1>Contact an authority to get official information</h1> + <h2>Contact an authority to get official information</h2> <ul> <li><a href="/new">Go here</a> to make a request, in public, for information from UK public authorities.</li> @@ -17,7 +19,7 @@ </li> </ul> - <h1>Take up an issue with Government</h1> + <h2>Take up an issue with Government</h2> <ul> <li><a href="http://www.writetothem.com">Write to your MP, @@ -28,7 +30,7 @@ <% end %> - <h1>Contact the <%= site_name %> team</h1> + <h2>Contact the WhatDoTheyKnow team</h2> <% if !flash[:notice] %> <ul> <li> diff --git a/app/views/help/credits.rhtml b/app/views/help/credits.rhtml index 02cd55c90..fd753336b 100644 --- a/app/views/help/credits.rhtml +++ b/app/views/help/credits.rhtml @@ -1,90 +1,91 @@ -<% @title = "Credit where credit is due" %> +<% @title = "Credit where credit's due" %> <%= render :partial => 'sidebar' %> -<h1 id="credits"><%= @title%> <a href="#credits">#</a> </h1> +<div id="left_column"> + <h1 id="credits"><%= @title%></h1> -<dl> - -<dt id="thanks">Which people made <%= site_name %>? <a href="#thanks">#</a> </dt> -<dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/helpus">maybe you too</a>)! -<ul> -<li> - <a href="http://www.yrtk.org">Heather Brooke</a> - (<a href="http://www.guardian.co.uk/politics/2008/mar/29/houseofcommons.michaelmartin?gusrc=rss&feed=worldnews">vampy!</a>) has - been pushing the idea of a UK FOI archive for years now. -</li> -<li> - Both Phil Rodgers and <a href="http://www.flourish.org/blog/">Francis Irving</a> - entered it in a mySociety competition for ideas for public interest websites to build. -</li> -<li> - <a href="http://www.mysociety.org/2006/09/27/the-mysociety-call-for-proposals-the-winner-and-runners-up/">It won</a>, - and then Chris Lightfoot (<a href="http://mk.ucant.org/archives/000129.html">RIP :(</a>) - thought up the wheeze of intercepting email responses to requests and - automatically publishing them. -</li> -<li> - Tom Steinberg got the cash to pay for the site from - <a href="http://www.jrrt.org.uk/">a dead chocolate mogul</a> (<em>thank you!</em>) ... -</li> -<li> - ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville - and Tom Steinberg could do the complex mixture of design and coding to build - what you see today. -</li> -<li> - Thanks particularly to Julian Todd (<a href="http://www.freesteel.co.uk/wpblog/">great blog!</a>), - Francis Davey, and Etienne Pollard for using the site early on and giving - feedback (and/or legal advice!), and also to all our other users and - testers. -</li> -<li> - The amazing team of volunteers who run the site, answer your support - emails, maintain the database of public authorities and - <a href="http://www.mysociety.org/2009/10/13/behind-whatdotheyknow/">so much more</a>. - Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, - Richard Taylor. -</li> -<li> - Volunteers who have provided patches to the code - thanks Peter Collingbourne - and Tony Bowden. -</li> -<li> - Everyone who has helped look up FOI email addresses. -</li> -<li> - We couldn't do any of this without those - <a href="http://www.ukcod.org.uk/UKCOD_Trustees">crazy people</a> who volunteer, - amongst many other things, to do the accounts and fill in our VAT return. -</li> -<li> - Finally, all the officers and servants who have answered the many requests - made through the site. Their diligence, patience and professionalism is - what has actually made the information that you see here. Thank them for - helping make Government more transparent. -</li> -</ul> -You're all stars. -</dd> - -<dt id="helpus">Can I help out? <a href="#helpus">#</a> </dt> -<dd> - <p>Yes please! We're built out of our supporters and volunteers.</p> + <dl> + <dt id="thanks">Who made WhatDoTheyKnow? <a href="#thanks">#</a> </dt> + <dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/helpus">maybe you too</a>)! <ul> - <li>You can <a href="https://secure.mysociety.org/donate/">make a donation</a>. We're a registered charity.</li> - <li>Help people find successful requests, and monitor performance of authorities, by - <a href="/categorise/play">playing the categorisation game</a>. </li> - <li>Find out FOI email addresses of <a href="/help/requesting#missing_body">authorities that we're missing</a>.</li> - <li>Write a blog post about either <%= site_name %> or an interesting request that you've - found. Post about it on a forum that you frequent. Tell friends about it.</li> <li>If you're - a programmer, get the source code for our parent project, <a href="http://alaveteli.org">Alaveteli</a> - and tell us about patches we can pull. It's made in Ruby on Rails. - <li>Read more about <a href="http://www.mysociety.org/helpus/">volunteering with mySociety</a>. + <li> + <a href="http://www.yrtk.org">Heather Brooke</a> + (<a href="http://www.guardian.co.uk/politics/2008/mar/29/houseofcommons.michaelmartin?gusrc=rss&feed=worldnews">vampy!</a>) has + been pushing the idea of a UK FOI archive for years now. + </li> + <li> + Both Phil Rodgers and <a href="http://www.flourish.org/blog/">Francis Irving</a> + entered it in a mySociety competition for ideas for public interest websites to build. + </li> + <li> + <a href="http://www.mysociety.org/2006/09/27/the-mysociety-call-for-proposals-the-winner-and-runners-up/">It won</a>, + and then Chris Lightfoot (<a href="http://mk.ucant.org/archives/000129.html">RIP :(</a>) + thought up the wheeze of intercepting email responses to requests and + automatically publishing them. + </li> + <li> + Tom Steinberg got the cash to pay for the site from + <a href="http://www.jrrt.org.uk/">a dead chocolate mogul</a> (<em>thank you!</em>) ... + </li> + <li> + ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville + and Tom Steinberg could do the complex mixture of design and coding to build + what you see today. + </li> + <li> + Thanks particularly to Julian Todd (<a href="http://www.freesteel.co.uk/wpblog/">great blog!</a>), + Francis Davey, and Etienne Pollard for using the site early on and giving + feedback (and/or legal advice!), and also to all our other users and + testers. + </li> + <li> + The amazing team of volunteers who run the site, answer your support + emails, maintain the database of public authorities and + <a href="http://www.mysociety.org/2009/10/13/behind-whatdotheyknow/">so much more</a>. + Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, + Richard Taylor. + </li> + <li> + Volunteers who have provided patches to the code - thanks Peter Collingbourne + and Tony Bowden. + </li> + <li> + Everyone who has helped look up FOI email addresses. + </li> + <li> + We couldn't do any of this without those + <a href="http://www.ukcod.org.uk/UKCOD_Trustees">crazy people</a> who volunteer, + amongst many other things, to do the accounts and fill in our VAT return. + </li> + <li> + Finally, all the officers and servants who have answered the many requests + made through the site. Their diligence, patience and professionalism is + what has actually made the information that you see here. Thank them for + helping make Government more transparent. + </li> </ul> -</dd> + You're all stars. + </dd> + <dt id="helpus">Can I help out? <a href="#helpus">#</a> </dt> + <dd> + <p>Yes please! We're built out of our supporters and volunteers.</p> + <ul> + <li>You can <a href="https://secure.mysociety.org/donate/">make a donation</a>. We're a registered charity.</li> + <li>Help people find successful requests, and monitor performance of authorities, by + <a href="/categorise/play">playing the categorisation game</a>. </li> + <li>Find out FOI email addresses of <a href="/help/requesting#missing_body">authorities that we're missing</a>.</li> + <li>Write a blog post about either WhatDoTheyKnow or an interesting request that you've + found. Post about it on a forum that you frequent. Tell friends about it.</li> <li>If you're + a programmer, get the source code for our parent project, <a href="http://alaveteli.org">Alaveteli</a> + and tell us about patches we can pull. It's made in Ruby on Rails. + <li>Read more about <a href="http://www.mysociety.org/helpus/">volunteering with mySociety</a>. + </ul> + </dd> + </dl> -<div id="hash_link_padding"></div> + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.rhtml index d9656186a..b26138db6 100644 --- a/app/views/help/officers.rhtml +++ b/app/views/help/officers.rhtml @@ -2,246 +2,246 @@ <%= render :partial => 'sidebar' %> -<h1 id="officers"><%= @title %> <a href="#officers">#</a> </h1> - -<dl> - -<dt id="top">I just got here from bottom of an FOI request, what is going on? <a href="#top">#</a> </dt> - -<dd><p><%= site_name %> is a service run by a charity. It helps ordinary members -of the public make FOI requests, and easily track and share the responses.</p> - -<p>The FOI request you received was made by someone using <%= site_name %>. You can -simply reply to the request as you would any other request from an individual. -The only difference is that your response will be automatically published on -the Internet. -</p> -<p>If you have privacy or other concerns, please read the answers below. -You might also like to read the <a -href="/help/about">introduction to <%= site_name %></a> to find out more about what -the site does from the point of view of a user. You can also search the -site to find the authority that you work for, and view the status of -any requests made using the site. - -<p>Finally, we welcome comments and -thoughts from FOI officers, please <a href="/help/contact">get in touch</a>. -</p> -</dd> - -<dt id="responses">Why are you publishing responses to FOI requests? <a href="#responses">#</a> </dt> - -<dd>We think there are lots of benefits. Most importantly it will encourage the -public to be more interested and involved in the work of government. We -also hope that it will reduce the number of duplicate requests on any -subject that a public body will receive. Given that Freedom of Information -responses contain public information, which anybody could easily request -again from the public authority, we think there should be no reason not to -publish it widely. -</dd> - -<dt id="realpeople">Are the people making requests real people? <a href="#realpeople">#</a> </dt> - -<dd>Yes. For the purposes of keeping track of responses we use -computer-generated email addresses for each request. However, before -they can send a request, each user must register on the site with a -unique email address that we then verify. You can search this site and -find a page listing all requests that each person has made. -</dd> - -<dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt> - -<dd>Yes it is. This -<a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically -in the context of requests made via <%= site_name %>. -</dd> - -<dt id="vexatious">Aren't you making lots of vexatious requests? <a href="#vexatious">#</a> </dt> - -<dd><p><%= site_name %> is not making any requests. We are sending requests on -behalf of our users, who are real people making the requests. </p> -<p>Look at it like this - if lots of different people made requests from -different Hotmail email addresses, then you would not think that Microsoft were -making vexatious requests. It is exactly the same if lots of requests are made -via <%= site_name %>. Moreover, since all requests are public it is much easier -for you to see if one of our users is making vexatious requests. </p> -<p>If that isn't enough for you, the -<a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> -</dd> - -<dt id="spam_problems">I can see a request on <%= site_name %>, but we never got it by email!<a href="#spam_problems">#</a> </dt> - -<dd><p>If a request appears on the site, then we have attempted to send it to -the authority by email. Any delivery failure messages will automatically -appear on the site. You can check the address we're using with the "View FOI -email address" link which appears on the page for the authority. <a -href="/help/contact">Contact us</a> if there is a better address we can -use.</p> -<p>Requests are sometimes not delivered because they are quietly removed by -"spam filters" in the IT department of the authority. Authorities can make -sure this doesn't happen by asking their IT departments to "whitelist" -any email from <strong>@whatdotheyknow.com</strong>. -If you <a href="/help/contact">ask us</a> we will resend any request, -and/or give technical details of delivery so an IT department can chase -up what happened to the message. -</p> -<p>Finally, you can respond to any request from your web browser, without -needing any email, using the "respond to request" link at the bottom of -each request page. -</dd> - -<dt id="days">How do you calculate the deadline shown on request pages?<a href="#days">#</a> </dt> - -<dd> -<p>The Freedom of Information Act says:</p> - -<blockquote><p>A public authority must comply with section 1(1) <strong>promptly</strong> and -in any event not later than the twentieth working day following the date of -receipt.</p></blockquote> - -<p>The nerdy detail of exactly how weekends are counted, and what happens if -the request arrives out of office hours, is just that - detail. What matters -here is that the law says authorities must respond <strong>promptly</strong>.</p> - -<p>If you've got a good reason why the request is going to take a while to -process, requesters find it really helpful if you can send a quick email with a -sentence or two saying what is happening. </p> - -<p>FOI officers often have to do a lot of <strong>hard work</strong> to answer -requests, and this is hidden from the public. We think it would help everyone -to have more of that complexity visible.</p> - -</dd> - -<dt id="days2">But really, how do you calculate the deadline?<a href="#days2">#</a> </dt> - -<dd> - -<p>Please read the answer to the previous question first. Legally, authorities -must respond <strong>promptly</strong> to FOI requests. If they fail to do that, -it is best if they show the hard work they are doing by explaining what is -taking the extra time to do. -</p> - -<p>That said, <%= site_name %> does show the maximum legal deadline -for response on each request. Here's how we calculate it.</p> - -<ul> - -<li>If the day we deliver the request by email is a working day, we count that -as "day zero", even if it was delivered late in the evening. Days end at -midnight. We then count the next working day as "day one", and so on up to -<strong>20 working days</strong>.</li> - -<li>If the day the request email was delivered was a non-working day, we count -the next working day as "day one". Delivery is delivery, even if it happened on -the weekend. Some authorities -<a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, -our lawyer disagrees with them. </li> - -<li>Requesters are encouraged to mark when they have <strong>clarified</strong> -their request so the clock resets, but sometimes they get this wrong. If you -see a problem with a particular request, let us know and we'll fix it.</li> -</ul> - -<p>The date thus calculated is shown on requests with the text "By law, -Liverpool City Council should normally have responded by...". There is only -one case which is not normal, see the next question about -<a href="#public_interest_test">public interest test time extensions</a>. -</p> - -<p>Schools are also a special case, which <%= site_name %> displays differently. -</p> - -<ul> -<li>Since June 2009, <strong>schools</strong> have "20 working days -disregarding any working day which is not a school day, or 60 working days, -whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). <%= site_name %> indicates on requests to schools that the 20 day deadline is only -during term time, and shows them as definitely overdue after 60 working days -</li> -</ul> - -<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. -Meanwhile, remember that the law says authorities must respond -<strong>promptly</strong>. That's really what matters.</p> - -</dd> - -<dt id="public_interest_test">How do you reflect time extensions for public interest tests?<a href="#public_interest_test">#</a> </dt> - -<dd> - -<p>The Freedom of Information Act lets authorities claim an indefinite time -extension when applying a <strong>public interest test</strong>. Information -Commissioner guidance says that it should only be used in "exceptionally -complex" cases -(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). -<%= site_name %> doesn't specifically handle this case, which is why we use the -phrase "should normally have responded by" when the 20 working day time is -exceeded. -</p> - -<p>The same guidance says that, even in exceptionally complex cases, no -Freedom of Information request should take more than <strong>40 working days</strong> -to answer. <%= site_name %> displays requests which are overdue by that much -with stronger wording to indicate they are definitely late. -</p> +<div id="left_column"> + <h1 id="officers"><%= @title %> <a href="#officers">#</a> </h1> + + <dl> + + <dt id="top">I just got here from bottom of an FOI request, what is going on? <a href="#top">#</a> </dt> + + <dd><p>WhatDoTheyKnow is a service run by a charity. It helps ordinary members + of the public make FOI requests, and easily track and share the responses.</p> + + <p>The FOI request you received was made by someone using WhatDoTheyKnow. You can + simply reply to the request as you would any other request from an individual. + The only difference is that your response will be automatically published on + the Internet. + </p> + <p>If you have privacy or other concerns, please read the answers below. + You might also like to read the <a + href="/help/about">introduction to WhatDoTheyKnow</a> to find out more about what + the site does from the point of view of a user. You can also search the + site to find the authority that you work for, and view the status of + any requests made using the site. + + <p>Finally, we welcome comments and + thoughts from FOI officers, please <a href="/help/contact">get in touch</a>. + </p> + </dd> + + <dt id="responses">Why are you publishing responses to FOI requests? <a href="#responses">#</a> </dt> + + <dd>We think there are lots of benefits. Most importantly it will encourage the + public to be more interested and involved in the work of government. We + also hope that it will reduce the number of duplicate requests on any + subject that a public body will receive. Given that Freedom of Information + responses contain public information, which anybody could easily request + again from the public authority, we think there should be no reason not to + publish it widely. + </dd> + + <dt id="realpeople">Are the people making requests real people? <a href="#realpeople">#</a> </dt> + + <dd>Yes. For the purposes of keeping track of responses we use + computer-generated email addresses for each request. However, before + they can send a request, each user must register on the site with a + unique email address that we then verify. You can search this site and + find a page listing all requests that each person has made. + </dd> + + <dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt> + + <dd>Yes it is. This + <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically + in the context of requests made via WhatDoTheyKnow. + </dd> + + <dt id="vexatious">Aren't you making lots of vexatious requests? <a href="#vexatious">#</a> </dt> + + <dd><p>WhatDoTheyKnow is not making any requests. We are sending requests on + behalf of our users, who are real people making the requests. </p> + <p>Look at it like this - if lots of different people made requests from + different Hotmail email addresses, then you would not think that Microsoft were + making vexatious requests. It is exactly the same if lots of requests are made + via WhatDoTheyKnow. Moreover, since all requests are public it is much easier + for you to see if one of our users is making vexatious requests. </p> + <p>If that isn't enough for you, the + <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> + </dd> + + <dt id="spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!<a href="#spam_problems">#</a> </dt> + + <dd><p>If a request appears on the site, then we have attempted to send it to + the authority by email. Any delivery failure messages will automatically + appear on the site. You can check the address we're using with the "View FOI + email address" link which appears on the page for the authority. <a + href="/help/contact">Contact us</a> if there is a better address we can + use.</p> + <p>Requests are sometimes not delivered because they are quietly removed by + "spam filters" in the IT department of the authority. Authorities can make + sure this doesn't happen by asking their IT departments to "whitelist" + any email from <strong>@whatdotheyknow.com</strong>. + If you <a href="/help/contact">ask us</a> we will resend any request, + and/or give technical details of delivery so an IT department can chase + up what happened to the message. + </p> + <p>Finally, you can respond to any request from your web browser, without + needing any email, using the "respond to request" link at the bottom of + each request page. + </dd> + + <dt id="days">How do you calculate the deadline shown on request pages?<a href="#days">#</a> </dt> + + <dd> + <p>The Freedom of Information Act says:</p> + + <blockquote><p>A public authority must comply with section 1(1) <strong>promptly</strong> and + in any event not later than the twentieth working day following the date of + receipt.</p></blockquote> + + <p>The nerdy detail of exactly how weekends are counted, and what happens if + the request arrives out of office hours, is just that - detail. What matters + here is that the law says authorities must respond <strong>promptly</strong>.</p> + + <p>If you've got a good reason why the request is going to take a while to + process, requesters find it really helpful if you can send a quick email with a + sentence or two saying what is happening. </p> + + <p>FOI officers often have to do a lot of <strong>hard work</strong> to answer + requests, and this is hidden from the public. We think it would help everyone + to have more of that complexity visible.</p> + + </dd> + + <dt id="days2">But really, how do you calculate the deadline?<a href="#days2">#</a> </dt> + + <dd> + + <p>Please read the answer to the previous question first. Legally, authorities + must respond <strong>promptly</strong> to FOI requests. If they fail to do that, + it is best if they show the hard work they are doing by explaining what is + taking the extra time to do. + </p> + + <p>That said, WhatDoTheyKnow does show the maximum legal deadline + for response on each request. Here's how we calculate it.</p> + + <ul> + + <li>If the day we deliver the request by email is a working day, we count that + as "day zero", even if it was delivered late in the evening. Days end at + midnight. We then count the next working day as "day one", and so on up to + <strong>20 working days</strong>.</li> + + <li>If the day the request email was delivered was a non-working day, we count + the next working day as "day one". Delivery is delivery, even if it happened on + the weekend. Some authorities <a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li> + + <li>Requesters are encouraged to mark when they have <strong>clarified</strong> + their request so the clock resets, but sometimes they get this wrong. If you + see a problem with a particular request, let us know and we'll fix it.</li> + </ul> + + <p>The date thus calculated is shown on requests with the text "By law, + Liverpool City Council should normally have responded by...". There is only + one case which is not normal, see the next question about + <a href="#public_interest_test">public interest test time extensions</a>. + </p> + + <p>Schools are also a special case, which WhatDoTheyKnow displays differently. + </p> + + <ul> + <li>Since June 2009, <strong>schools</strong> have "20 working days + disregarding any working day which is not a school day, or 60 working days, + whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). WhatDoTheyKnow indicates on requests to schools that the 20 day deadline is only + during term time, and shows them as definitely overdue after 60 working days + </li> + </ul> + + <p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. + Meanwhile, remember that the law says authorities must respond + <strong>promptly</strong>. That's really what matters.</p> + + </dd> + + <dt id="public_interest_test">How do you reflect time extensions for public interest tests?<a href="#public_interest_test">#</a> </dt> + + <dd> + + <p>The Freedom of Information Act lets authorities claim an indefinite time + extension when applying a <strong>public interest test</strong>. Information + Commissioner guidance says that it should only be used in "exceptionally + complex" cases + (<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). + WhatDoTheyKnow doesn't specifically handle this case, which is why we use the + phrase "should normally have responded by" when the 20 working day time is + exceeded. + </p> + + <p>The same guidance says that, even in exceptionally complex cases, no + Freedom of Information request should take more than <strong>40 working days</strong> + to answer. WhatDoTheyKnow displays requests which are overdue by that much + with stronger wording to indicate they are definitely late. + </p> -<p>The Freedom of Information (Scotland) Act does not allow such a public -interest extension. <%= site_name %> would like to see the law changed to either -remove the extension from the UK Act, or to reintroduce an absolute time limit -of 40 working days even with the extension (the House of Lords <a -href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&number=1&house=lords">voted -to remove</a> provision for such a time limit during the initial passage -of the UK Act through Parliament). -</p> -</dd> - -<dt id="large_file">How can I send a large file, which won't go by email?<a href="#large_file">#</a> </dt> + <p>The Freedom of Information (Scotland) Act does not allow such a public + interest extension. WhatDoTheyKnow would like to see the law changed to either + remove the extension from the UK Act, or to reintroduce an absolute time limit + of 40 working days even with the extension (the House of Lords <a + href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&number=1&house=lords">voted + to remove</a> provision for such a time limit during the initial passage + of the UK Act through Parliament). + </p> + </dd> -<dd>Instead of email, you can respond to a request directly from your web -browser, including uploading a file. To do this, choose "respond to request" at -the bottom of the request's page. <a href="/help/contact">Contact us</a> if it -is too big for even that (more than, say, 50Mb). -</dd> - -<dt id="names">Why do you publish the names of civil servants and the text of emails? <a href="#names">#</a> </dt> + <dt id="large_file">How can I send a large file, which won't go by email?<a href="#large_file">#</a> </dt> -<dd>We consider what officers or servants do in the course of their employment -to be public information. We will only remove content in exceptional -circumstances, see our <a href="/help/privacy#takedown">take down policy</a>. -</dd> - -<dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt> - -<dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from -responses to requests. Please <a href="/help/contact">contact us</a> if we've -missed one. -For technical reasons we don't always remove them from attachments, such as certain PDFs.</p> -<p>If you need to know what an address was that we've removed, please <a - href="/help/contact">get in touch with us</a>. Occasionally, an email address -forms an important part of a response and we will post it up in an obscured -form in an annotation. -</dd> - -<dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> - -<dd>Our Freedom of Information law is "applicant blind", so anyone in the -world can request the same document and get a copy of it. - -If you think our making a document available on the internet infringes your -copyright, you may <a href="/help/contact">contact us</a> and ask us -to take it down. However, to save tax payers' money by preventing duplicate -requests, and for good public relations, we'd advise you not to do that. -</dd> - -</dl> - - -</dl> - -<p><strong>If you haven't already</strong>, read <a href="/help/about">the introduction</a> --> -<br><strong>Otherwise</strong>, the <a href="/help/credits">credits</a> or the <a href="/help/api">programmers API</a> --> - -<div id="hash_link_padding"></div> + <dd>Instead of email, you can respond to a request directly from your web + browser, including uploading a file. To do this, choose "respond to request" at + the bottom of the request's page. <a href="/help/contact">Contact us</a> if it + is too big for even that (more than, say, 50Mb). + </dd> + + <dt id="names">Why do you publish the names of civil servants and the text of emails? <a href="#names">#</a> </dt> + + <dd>We consider what officers or servants do in the course of their employment + to be public information. We will only remove content in exceptional + circumstances, see our <a href="/help/privacy#takedown">take down policy</a>. + </dd> + + <dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt> + + <dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from + responses to requests. Please <a href="/help/contact">contact us</a> if we've + missed one. + For technical reasons we don't always remove them from attachments, such as certain PDFs.</p> + <p>If you need to know what an address was that we've removed, please <a + href="/help/contact">get in touch with us</a>. Occasionally, an email address + forms an important part of a response and we will post it up in an obscured + form in an annotation. + </dd> + + <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> + + <dd>Our Freedom of Information law is "applicant blind", so anyone in the + world can request the same document and get a copy of it. + + If you think our making a document available on the internet infringes your + copyright, you may <a href="/help/contact">contact us</a> and ask us + to take it down. However, to save tax payers' money by preventing duplicate + requests, and for good public relations, we'd advise you not to do that. + </dd> + + </dl> + + + </dl> + + <p><strong>If you haven't already</strong>, read <a href="/help/about">the introduction</a> --> + <br><strong>Otherwise</strong>, the <a href="/help/credits">credits</a> or the <a href="/help/api">programmers API</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/privacy.rhtml b/app/views/help/privacy.rhtml index fc8c54885..d62afa45b 100644 --- a/app/views/help/privacy.rhtml +++ b/app/views/help/privacy.rhtml @@ -2,54 +2,54 @@ <%= render :partial => 'sidebar' %> -<h1 id="privacy"><%= @title %> <a href="#privacy">#</a> </h1> - -<dl> - -<dt id="email_address">Who gets to see my email address? <a href="#email_address">#</a> </dt> - -<dd><p>We will not disclose your email address to anyone unless we are obliged to by law, -or you ask us to. This includes the public authority that you are sending a -request to. They only get to see an email address -@whatdotheyknow.com which is specific to that request. </p> -<p>If you send a message to another user on the site, then it will reveal your -email address to them. You will be told that this is going to happen.</p> -</dd> - -<dt id="nasty_spam">Will you send nasty, brutish spam to my email address? <a href="#nasty_spam">#</a> </dt> -<dd>Nope. After you sign up to <%= site_name %> we will only send you emails -relating to a request you made, an email alert that you have signed up for, -or for other reasons that you specifically authorise. We will never give or -sell your email addresses to anyone else, unless we are obliged to by law, or -you ask us to. -</dd> - -<dt id="public_request">Why will my name and my request appear publicly on the site? <a href="#public_request">#</a> </dt> - -<dd> -<p>We publish your request on the Internet so that anybody can read it and -make use of the information that you have found. We do not normally delete -requests (<a href="#delete_requests">more details</a>). -</p> -<p> -Your name is tangled up with your request, so has to be published as well. -It is only fair, as we're going to publish the name of the civil servant who -writes the response to your request. Using your real name also helps people -get in touch with you to assist you with your research or to campaign with you. -</p> -<p>By law, you must use your real name for the request to be a valid Freedom of -Information request. See the next question for alternatives if you do not want -to publish your full name. -</p> -</dd> - -<dt id="real_name">Can I make an FOI request using a pseudonym? <a href="#real_name">#</a> </dt> - - -<dd> -<p>Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this -<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/name_of_applicant_fop083_v1.pdf">guidance from the Information Commissioner</a> (January 2009). -</p> +<div id="left_column"> + <h1 id="privacy"><%= @title %></h1> + <dl> + + <dt id="email_address">Who gets to see my email address? <a href="#email_address">#</a> </dt> + + <dd><p>We will not disclose your email address to anyone unless we are obliged to by law, + or you ask us to. This includes the public authority that you are sending a + request to. They only get to see an email address + @whatdotheyknow.com which is specific to that request. </p> + <p>If you send a message to another user on the site, then it will reveal your + email address to them. You will be told that this is going to happen.</p> + </dd> + + <dt id="nasty_spam">Will you send nasty, brutish spam to my email address? <a href="#nasty_spam">#</a> </dt> + <dd>Nope. After you sign up to WhatDoTheyKnow we will only send you emails + relating to a request you made, an email alert that you have signed up for, + or for other reasons that you specifically authorise. We will never give or + sell your email addresses to anyone else, unless we are obliged to by law, or + you ask us to. + </dd> + + <dt id="public_request">Why will my name and my request appear publicly on the site? <a href="#public_request">#</a> </dt> + + <dd> + <p>We publish your request on the Internet so that anybody can read it and + make use of the information that you have found. We do not normally delete + requests (<a href="#delete_requests">more details</a>). + </p> + <p> + Your name is tangled up with your request, so has to be published as well. + It is only fair, as we're going to publish the name of the civil servant who + writes the response to your request. Using your real name also helps people + get in touch with you to assist you with your research or to campaign with you. + </p> + <p>By law, you must use your real name for the request to be a valid Freedom of + Information request. See the next question for alternatives if you do not want + to publish your full name. + </p> + </dd> + + <dt id="real_name">Can I make an FOI request using a pseudonym? <a href="#real_name">#</a> </dt> + + + <dd> + <p>Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this + <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/name_of_applicant_fop083_v1.pdf">guidance from the Information Commissioner</a> (January 2009). + </p> <p>However, the same guidance also says it is good practice for the public authority to still consider a request made using an obvious pseudonym. @@ -179,6 +179,6 @@ that authorities resend these with the personal information removed.</p> <p><strong>Learn more</strong> from the help for <a href="/help/officers">FOI officers</a> --> -<div id="hash_link_padding"></div> - + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/requesting.rhtml b/app/views/help/requesting.rhtml index eec887950..bd3ce46f3 100644 --- a/app/views/help/requesting.rhtml +++ b/app/views/help/requesting.rhtml @@ -1,293 +1,293 @@ <% @title = "Making requests" %> <%= render :partial => 'sidebar' %> - -<h1 id="making_requests"><%= @title %> <a href="#making_requests">#</a> </h1> -<dl> - -<dt id="which_authority">I'm not sure which authority to make my request to, how can I find out? <a href="#which_authority">#</a> </dt> - -<dd> -<p>It can be hard to untangle government's complicated structured, and work out -who knows the information that you want. Here are a few tips: -<ul> -<li>Browse or search <%= site_name %> looking for similar requests to yours.</li> -<li>When you've found an authority you think might have the information, use -the "home page" link on the right hand side of their page to check what they do -on their website.</li> -<li>Contact the authority by phone or email to ask if they hold the kind of -information you're after.</li> -<li>Don't worry excessively about getting the right authority. If you get it -wrong, they ought to advise you who to make the request to instead. -</li> -<li>If you've got a thorny case, please <a href="/help/contact">contact us</a> for help.</li> -</ul> - -</dd> - - - -<dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt> - -<dd> -<p>Please <a href="/help/contact">contact us</a> with the name of the public authority and, -if you can find it, their contact email address for Freedom of Information requests. -</p> -<p>If you'd like to help add a whole category of public authority to the site, we'd love -to hear from you too. -</p> - -</dd> - -<dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt> - -<dd> -<p><%= site_name %> lets you make requests for information to a range of -organisations:</p> - -<ul> - <li> Those formally subject to the FOI Act</li> - <li> Those formally subject to the Environmental Regulations (a less well - defined group)</li> - <li> Those which voluntarily comply with the FOI Act</li> - <li> Those which aren't subject to the Act but we think should be, on grounds - such as them having significant public responsibilities. +<div id="left_column"> + <h1 id="making_requests"><%= @title %></h1> + <dl> + + <dt id="which_authority">I'm not sure which authority to make my request to, how can I find out? <a href="#which_authority">#</a> </dt> + + <dd> + <p>It can be hard to untangle government's complicated structured, and work out + who knows the information that you want. Here are a few tips: + <ul> + <li>Browse or search WhatDoTheyKnow looking for similar requests to yours.</li> + <li>When you've found an authority you think might have the information, use + the "home page" link on the right hand side of their page to check what they do + on their website.</li> + <li>Contact the authority by phone or email to ask if they hold the kind of + information you're after.</li> + <li>Don't worry excessively about getting the right authority. If you get it + wrong, they ought to advise you who to make the request to instead. </li> -</ul> - -<p>In the last case, we're using the site to lobby for expansion of the -scope of the FOI Act. Even if an organisation is not legally obliged to respond -to an FOI request, they can still do so voluntarily. -</p> - -</dd> - -<dt id="focused">Why must I keep my request focused?<a href="#focused">#</a> </dt> - -<dd> + <li>If you've got a thorny case, please <a href="/help/contact">contact us</a> for help.</li> + </ul> -<p> -Please put in your request only what is needed so that someone can -easily identify what information you are asking for. Please do -<i>not</i> include any of the following: -</p> + </dd> -<ul> -<li>arguments about your cause</li> -<li>statements that could defame or insult others</li> -</ul> -<p> -If you do, we may have to remove your request to avoid problems with -libel law, which is a pain for both you and us. Short, succinct messages -make it easier for authorities to be clear what information you are -requesting, which means you will get a reply more quickly. -</p> -<p> -If you want information to support an argument or campaign, Freedom of -Information is a powerful tool. Although you may not use this site to -run your campaign, we encourage you to use it to get the information you -need. We also encourage to run your campaign elsewhere - one effective -and very easy way is to <%= link_to 'start your own blog', -"http://wordpress.com/"%>. You are welcome to link to your campaign -from this site in an annotation to your request (you can make -annotations after submitting the request). -</p> + <dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt> -</dd> + <dd> + <p>Please <a href="/help/contact">contact us</a> with the name of the public authority and, + if you can find it, their contact email address for Freedom of Information requests. + </p> + <p>If you'd like to help add a whole category of public authority to the site, we'd love + to hear from you too. + </p> -<dt id="fees">Does it cost me anything to make a request?<a href="#fees">#</a> </dt> + </dd> -<dd> + <dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt> -<p>Making an FOI request is nearly always free.</p> + <dd> + <p>WhatDoTheyKnow lets you make requests for information to a range of + organisations:</p> -<p>Authorities often include unnecessary, scary, boilerplate in -acknowledgement messages saying they "may" charge a fee. Ignore such notices. -They hardly ever will actually charge a fee. If they do, they can only charge you if -you have specifically agreed in advance to pay. <a - href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/chargingafee.pdf">More - details</a> from the Information Commissioner. -</p> - -<p>Sometimes an authority will refuse your request, saying that the cost -of handling it exceeds £600 (for central government) or £450 (for all other -public authorities). At this point you can refine your -request. e.g. it would be much cheaper for an authority to tell you the amount -spent on marshmallows in the past year than in the past ten years. -</p> - -</dd> - - - -<dt id="quickly_response">How quickly will I get a response? <a href="#quickly_response">#</a> </dt> - -<dd> -<p>By law, public authorities must respond <strong>promptly</strong> to -requests. -</p> - -<p>Even if they are not prompt, in nearly all cases they must respond within -20 working days. If you had to clarify your request, or they are a school, -or one or two other cases, then they may have more time -(<a href="/help/officers#days">full details</a>). - -<p><%= site_name %> will email you if you don't get a timely response. You can -then send the public authority a message to remind them, and tell them if they -are breaking the law.</p> - -</dd> - -<dt id="deadline_extended">Deadline extended <a href="#deadline_extended">#</a> </dt> - -<dd> -<p>By law, public authorities must needs <strong>more time</strong> for request ... (TO DO) -</p> - - -</dd> -<dt id="no_response">What if I never get a response?<a href="#no_response">#</a> </dt> - -<dd> -<p>There are several things you can do if you never get a response.</p> -<ul> - <li>Sometimes there has been a genuine problem and the authority never - received the request. It is worth telephoning the authority and politely - checking that they received the request. It was sent to them by email. - </li> - <li>If they have not received it, the problem is most likely due to - "spam filters". Refer the authority to the measures in the answer - '<a href="/help/officers#spam_problems">I can see a request on <%= site_name %>, but we never got it by email!</a>' - in the FOI officers section of this help. + <ul> + <li> Those formally subject to the FOI Act</li> + <li> Those formally subject to the Environmental Regulations (a less well + defined group)</li> + <li> Those which voluntarily comply with the FOI Act</li> + <li> Those which aren't subject to the Act but we think should be, on grounds + such as them having significant public responsibilities. </li> - <li>If you're still having no luck, then you can ask for an internal review, - and then complain to the Information Commissioner about the authority. - Read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. -</ul> -</dd> - -<dt id="not_satifised">What if I'm not satisfied with the response? <a href="#not_satifised">#</a> </dt> -<dd>If you didn't get the information you asked for, or you didn't get it in time, -then read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. -</dd> - -<dt id="reuse">It says I can't re-use the information I got!<a href="#reuse">#</a> </dt> -<dd> -<p>Authorities often add legal boilerplate about the -"<a href="http://www.opsi.gov.uk/si/si2005/20051515">Re-Use of Public Sector -Information Regulations 2005</a>", which at first glance implies you may not -be able do anything with the information. -</p> - -<p>You can, of course, write articles about the information or summarise it, or -quote parts of it. We also think you should feel free to republish the -information in full, just as we do, even though in theory you might not be -allowed to do so. See <a href="/help/officers#copyright">our policy on copyright</a>.</p> - -</dd> - -<dt id="ico_help">Can you tell me more of the nitty gritty about the process of making requests? <a href="#ico_help">#</a> </dt> - -<dd> -<p>Have a look at the -<a href="http://www.ico.gov.uk/for_the_public/access_to_official_information.aspx">access to official information</a> -pages on the Information Commissioner's website.</p> - -<p>If you're requesting information from a Scottish public authority, -the process is very similar. There are differences around time -limits for compliance. -See the <a href="http://www.itspublicknowledge.info/nmsruntime/saveasdialog.asp?lID=1858&sID=321">Scottish -Information Commissioner's guidance</a> for details.</p> -</dd> - -<dt id="data_protection">Can I request information about myself? <a href="#data_protection">#</a> </dt> - -<dd> -<p>No. Requests made using <%= site_name %> are public, made under the Freedom of -Information Act, and cannot help you find information about a private -individual.</p> - -<p>If you would like to know what information a public -authority holds about yourself, you should make a "Subject Access Request" in -private using Data Protection law. The leaflet "<a -href="http://www.ico.gov.uk/upload/documents/library/data_protection/introductory/subject_access_rights.pdf">How to access your information</a>" (on the Information Commissioner's -website) explains how to do this.</p> - -<p>If you see that somebody has included personal information, perhaps -unwittingly, in a request, please <a href="/help/contact">contact us</a> -immediately so we can remove it.</p> -</dd> - - -<dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt> - -<dd><p><%= site_name %> is currently only designed for public requests. All -responses that we receive are automatically published on the website for anyone -to read. </p> -<p>You should contact the public authority directly if you would like to -make a request in private. If you're interested in buying a system which helps -you manage FOI requests in secret, then <a href="/help/contact">contact us</a>. -</p> -</dd> - -<dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt> - -<dd> -<p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, -don't come under the Freedom of Information Act, but do come under another law called -the Environmental Information Regulations (EIR). -</p> - -<p>It's a very similar law, so you make a request -to them using <%= site_name %> in just the same way as an FOI request. The only -difference is that on the page where your write you request, it reminds you -that you can only request "environmental information" and tells you what that -means. It is quite broad. -</p> - -<p>You can, of course, request environmental information from other -authorities. Just make a Freedom of Information (FOI) request as normal. The -authority has a duty to work out if the Environmental Information Regulations -(EIR) is the more appropriate legislation to reply under. -</p> -</dd> - -<dt id="multiple">Can I make the same to request to lots of authorities, e.g. all councils? <a href="#multiple">#</a> </dt> - -<dd>We ask you to first send a test version of your request to a few -authorities. Their responses will help you improve the wording of your request, -so that you get the best information when you send the request to all of -the authorities. There is currently no automated system for sending the request -to the other authorities, you must copy and paste it by hand. - -</dd> - -<dt id="offsite">I made a request off the site, how do I upload it to the archive?<a href="#offsite">#</a> </dt> - -<dd><%= site_name %> is an archive of requests made through the site, -and does not try to be an archive of all FOI requests. We'll never support uploading -other requests. For one thing, we wouldn't be able to verify that other -responses actually came from the authority. If this really matters to you, -you can always make the same request again via <%= site_name %>. -</dd> - -<dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> - -<dd> -<p>Annotations on <%= site_name %> are to help -people get the information they want, or to give them pointers to places they -can go to help them act on it. We reserve the right to remove anything else. -</p> -<p>Endless, political discussions are not allowed. -Post a link to a suitable forum or campaign site elsewhere.</p> -<dd> + </ul> -</dl> + <p>In the last case, we're using the site to lobby for expansion of the + scope of the FOI Act. Even if an organisation is not legally obliged to respond + to an FOI request, they can still do so voluntarily. + </p> -<p><strong>Next</strong>, read about <a href="/help/privacy">your privacy</a> --> + </dd> -<div id="hash_link_padding"></div> + <dt id="focused">Why must I keep my request focused?<a href="#focused">#</a> </dt> + <dd> + + <p> + Please put in your request only what is needed so that someone can + easily identify what information you are asking for. Please do + <i>not</i> include any of the following: + </p> + + <ul> + <li>arguments about your cause</li> + <li>statements that could defame or insult others</li> + </ul> + + <p> + If you do, we may have to remove your request to avoid problems with + libel law, which is a pain for both you and us. Short, succinct messages + make it easier for authorities to be clear what information you are + requesting, which means you will get a reply more quickly. + </p> + + <p> + If you want information to support an argument or campaign, Freedom of + Information is a powerful tool. Although you may not use this site to + run your campaign, we encourage you to use it to get the information you + need. We also encourage to run your campaign elsewhere - one effective + and very easy way is to <%= link_to 'start your own blog', + "http://wordpress.com/"%>. You are welcome to link to your campaign + from this site in an annotation to your request (you can make + annotations after submitting the request). + </p> + + </dd> + + <dt id="fees">Does it cost me anything to make a request?<a href="#fees">#</a> </dt> + + <dd> + + <p>Making an FOI request is nearly always free.</p> + + <p>Authorities often include unnecessary, scary, boilerplate in + acknowledgement messages saying they "may" charge a fee. Ignore such notices. + They hardly ever will actually charge a fee. If they do, they can only charge you if + you have specifically agreed in advance to pay. <a + href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/chargingafee.pdf">More + details</a> from the Information Commissioner. + </p> + + <p>Sometimes an authority will refuse your request, saying that the cost + of handling it exceeds £600 (for central government) or £450 (for all other + public authorities). At this point you can refine your + request. e.g. it would be much cheaper for an authority to tell you the amount + spent on marshmallows in the past year than in the past ten years. + </p> + + </dd> + + + + <dt id="quickly_response">How quickly will I get a response? <a href="#quickly_response">#</a> </dt> + + <dd> + <p>By law, public authorities must respond <strong>promptly</strong> to + requests. + </p> + + <p>Even if they are not prompt, in nearly all cases they must respond within + 20 working days. If you had to clarify your request, or they are a school, + or one or two other cases, then they may have more time + (<a href="/help/officers#days">full details</a>). + + <p>WhatDoTheyKnow will email you if you don't get a timely response. You can + then send the public authority a message to remind them, and tell them if they + are breaking the law.</p> + + </dd> + + <dt id="deadline_extended">Deadline extended <a href="#deadline_extended">#</a> </dt> + + <dd> + <p>By law, public authorities must needs <strong>more time</strong> for request ... (TO DO) + </p> + + + </dd> + <dt id="no_response">What if I never get a response?<a href="#no_response">#</a> </dt> + + <dd> + <p>There are several things you can do if you never get a response.</p> + <ul> + <li>Sometimes there has been a genuine problem and the authority never + received the request. It is worth telephoning the authority and politely + checking that they received the request. It was sent to them by email. + </li> + <li>If they have not received it, the problem is most likely due to + "spam filters". Refer the authority to the measures in the answer + '<a href="/help/officers#spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!</a>' + in the FOI officers section of this help. + </li> + <li>If you're still having no luck, then you can ask for an internal review, + and then complain to the Information Commissioner about the authority. + Read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. + </ul> + </dd> + + <dt id="not_satifised">What if I'm not satisfied with the response? <a href="#not_satifised">#</a> </dt> + <dd>If you didn't get the information you asked for, or you didn't get it in time, + then read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. + </dd> + + <dt id="reuse">It says I can't re-use the information I got!<a href="#reuse">#</a> </dt> + <dd> + <p>Authorities often add legal boilerplate about the + "<a href="http://www.opsi.gov.uk/si/si2005/20051515">Re-Use of Public Sector + Information Regulations 2005</a>", which at first glance implies you may not + be able do anything with the information. + </p> + + <p>You can, of course, write articles about the information or summarise it, or + quote parts of it. We also think you should feel free to republish the + information in full, just as we do, even though in theory you might not be + allowed to do so. See <a href="/help/officers#copyright">our policy on copyright</a>.</p> + + </dd> + + <dt id="ico_help">Can you tell me more of the nitty gritty about the process of making requests? <a href="#ico_help">#</a> </dt> + + <dd> + <p>Have a look at the + <a href="http://www.ico.gov.uk/for_the_public/access_to_official_information.aspx">access to official information</a> + pages on the Information Commissioner's website.</p> + + <p>If you're requesting information from a Scottish public authority, + the process is very similar. There are differences around time + limits for compliance. + See the <a href="http://www.itspublicknowledge.info/nmsruntime/saveasdialog.asp?lID=1858&sID=321">Scottish + Information Commissioner's guidance</a> for details.</p> + </dd> + + <dt id="data_protection">Can I request information about myself? <a href="#data_protection">#</a> </dt> + + <dd> + <p>No. Requests made using WhatDoTheyKnow are public, made under the Freedom of + Information Act, and cannot help you find information about a private + individual.</p> + + <p>If you would like to know what information a public + authority holds about yourself, you should make a "Subject Access Request" in + private using Data Protection law. The leaflet "<a + href="http://www.ico.gov.uk/upload/documents/library/data_protection/introductory/subject_access_rights.pdf">How to access your information</a>" (on the Information Commissioner's + website) explains how to do this.</p> + + <p>If you see that somebody has included personal information, perhaps + unwittingly, in a request, please <a href="/help/contact">contact us</a> + immediately so we can remove it.</p> + </dd> + + + <dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt> + + <dd><p>WhatDoTheyKnow is currently only designed for public requests. All + responses that we receive are automatically published on the website for anyone + to read. </p> + <p>You should contact the public authority directly if you would like to + make a request in private. If you're interested in buying a system which helps + you manage FOI requests in secret, then <a href="/help/contact">contact us</a>. + </p> + </dd> + + <dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt> + + <dd> + <p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, + don't come under the Freedom of Information Act, but do come under another law called + the Environmental Information Regulations (EIR). + </p> + + <p>It's a very similar law, so you make a request + to them using WhatDoTheyKnow in just the same way as an FOI request. The only + difference is that on the page where your write you request, it reminds you + that you can only request "environmental information" and tells you what that + means. It is quite broad. + </p> + + <p>You can, of course, request environmental information from other + authorities. Just make a Freedom of Information (FOI) request as normal. The + authority has a duty to work out if the Environmental Information Regulations + (EIR) is the more appropriate legislation to reply under. + </p> + </dd> + + <dt id="multiple">Can I make the same to request to lots of authorities, e.g. all councils? <a href="#multiple">#</a> </dt> + + <dd>We ask you to first send a test version of your request to a few + authorities. Their responses will help you improve the wording of your request, + so that you get the best information when you send the request to all of + the authorities. There is currently no automated system for sending the request + to the other authorities, you must copy and paste it by hand. + + </dd> + + <dt id="offsite">I made a request off the site, how do I upload it to the archive?<a href="#offsite">#</a> </dt> + + <dd>WhatDoTheyKnow is an archive of requests made through the site, + and does not try to be an archive of all FOI requests. We'll never support uploading + other requests. For one thing, we wouldn't be able to verify that other + responses actually came from the authority. If this really matters to you, + you can always make the same request again via WhatDoTheyKnow. + </dd> + + <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> + + <dd> + <p>Annotations on WhatDoTheyKnow are to help + people get the information they want, or to give them pointers to places they + can go to help them act on it. We reserve the right to remove anything else. + </p> + <p>Endless, political discussions are not allowed. + Post a link to a suitable forum or campaign site elsewhere.</p> + <dd> + + </dl> + + <p><strong>Next</strong>, read about <a href="/help/privacy">your privacy</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 391f2df15..b754a70bd 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -18,7 +18,9 @@ <link rel="shortcut icon" href="/favicon.ico"> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6.css");</style> <![endif]--> @@ -59,56 +61,49 @@ =end %> <div class="entirebody"> - <div id="banner"></div> - <div id="header"> - <h1> - <%= link_to site_name, frontpage_url %> - </h1> - - <div id="tagline"> - <%= _('Make and explore Freedom of Information requests') %> - </div> - - </div> - <div id="orglogo"> - <%= render :partial => 'general/orglink' %> - </div> - <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> - - <div id="navigation_search"> - <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> - <p> - <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> - <%= submit_tag _("Search") %> - </p> - <% end %> - </div> - - <div id="topnav"> - <ul id="navigation"> - <li><%= link_to _("Home"), frontpage_url %></li> - <li><%= link_to _("Make request"), select_authority_url %></li> - <li><%= link_to _("View requests"), request_list_successful_url %></li> - <li><%= link_to _("View authorities"), list_public_bodies_default %></li> - <% if @user %> - <li><%=link_to _("My requests"), user_url(@user) %></li> - <% end %> - <li><%= link_to _("Read blog"), blog_url %></li> - <li><%= link_to _("Help"), help_about_url %></li> - </ul> + <div id="banner"> + <div id="banner_inner"> + <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> - <div id="logged_in_bar"> - <% if @user %> - <%= _('Hello, {{username}}!', :username => h(@user.name))%> - (<%= link_to _("Sign out"), signout_url(:r => request.request_uri) %>) - <% else %> - <%= _('Hello!') %> - (<%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %>) + <div id="logged_in_bar"> + <% if @user %> + <%= _('Hello, {{username}}!', :username => h(@user.name))%> + + <% if @user %> + <%=link_to _("My profile"), user_url(@user) %> + <% end %> + + + <%= link_to _("Sign out"), signout_url(:r => request.request_uri) %> + <% else %> + <%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %> + <% end %> + </div> + <% end %> + + <div id="navigation_search"> + <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> + <%= image_submit_tag('search-button.png') %> + </p> <% end %> - </div> - <% end %> + </div> + + <%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> + + <div id="topnav"> + <ul id="navigation"> + <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_url %></li> + <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_url %></li> + <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default %></li> + <li class="<%= 'selected' if params[:controller] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> + <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_url %></li> + </ul> + </div> + </div> </div> - <div id="wrapper"> <div id="content"> diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 5d88b1501..912f2696a 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -36,19 +36,9 @@ <% @title = _("Public authorities - {{description}}", :description => @description) %> -<h1><%=@title%></h1> - -<p class="subtitle"> - <%= @public_bodies.size %> <%= _('in total') %> - (<%= _('<a href="%s">can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %>) -</p> - -<% if @tag.size == 1 %> - <p><%= render :partial => 'alphabet' %></p> -<% end %> +<h1>Public authorities</h1> +<h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.size, :description=>@description) %></h2> <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> -<% if @tag.size == 1 && @public_bodies.size > 0 %> - <p><%= render :partial => 'alphabet' %></p> -<% end %> -<%= will_paginate(@public_bodies) %> +<%= will_paginate(@public_bodies) %><br/> +<%= _('<a href="%s">Can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 406c1479e..5e6c52984 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -1,69 +1,72 @@ <% @title = h(@public_body.name) + " - view and make Freedom of Information requests" %> -<div id="request_sidebar"> - <h2><%= _('Track this authority')%></h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> - <h2><%= _('More about this authority')%></h2> - <% if !@public_body.calculated_home_page.nil? %> - <%= link_to _('Home page of authority'), @public_body.calculated_home_page %><br> - <% end %> - <% if !@public_body.publication_scheme.empty? %> - <%= link_to _('Publication scheme'), @public_body.publication_scheme %><br> - <% end %> - <% if @public_body.has_tag?("charity") %> - <% for tag_value in @public_body.get_tag_values("charity") %> - <% if tag_value.match(/^SC/) %> - <%= link_to _('Charity registration'), "http://www.oscr.org.uk/CharityIndexDetails.aspx?id=" + tag_value %><br> - <% else %> - <%= link_to _('Charity registration'), "http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=" + tag_value %><br> - <% end %> - <% end %> - <% end %> - <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> -</div> - <div id="main_content"> -<h1><%=h(@public_body.name)%></h1> - -<p class="subtitle"> -<%=@public_body.type_of_authority(true)%> -<% if not @public_body.short_name.empty? %>, -<%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> -<% if !@user.nil? && @user.admin_page_links? %> -(<%= link_to _("admin"), public_body_admin_url(@public_body) %>) +<div> +<% unless params[:narrow_layout] # XXX: not ideal %> + <div id="header_right"> + <h2><%= _('Track this authority')%></h2> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> + <h2><%= _('More about this authority')%></h2> + <% if !@public_body.calculated_home_page.nil? %> + <%= link_to _('Home page of authority'), @public_body.calculated_home_page %><br> + <% end %> + <% if !@public_body.publication_scheme.empty? %> + <%= link_to _('Publication scheme'), @public_body.publication_scheme %><br> + <% end %> + <% if @public_body.has_tag?("charity") %> + <% for tag_value in @public_body.get_tag_values("charity") %> + <% if tag_value.match(/^SC/) %> + <%= link_to _('Charity registration'), "http://www.oscr.org.uk/CharityIndexDetails.aspx?id=" + tag_value %><br> + <% else %> + <%= link_to _('Charity registration'), "http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=" + tag_value %><br> + <% end %> + <% end %> + <% end %> + <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> + </div> <% end %> -</p> -<% if @public_body.has_notes? && (@public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact') %> - <p><%= @public_body.notes_as_html %></p> -<% end %> + <div id="header_left"> + <h1><%=h(@public_body.name)%></h1> -<% if @public_body.eir_only? %> - <p><%= _('You can only request information about the environment from this authority.')%></p> -<% end %> + <p class="subtitle"> + <%=@public_body.type_of_authority(true)%> + <% if not @public_body.short_name.empty? %>, + <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> + <% if !@user.nil? && @user.admin_page_links? %> + (<%= link_to _("admin"), public_body_admin_url(@public_body) %>) + <% end %> + </p> -<div id="stepwise_make_request"> - <strong> - <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> - <% if @public_body.eir_only? %> - <%= link_to _("Make a new Environmental Information request"), new_request_to_body_url(:url_name => @public_body.url_name)%> to <%= h(@public_body.name) %> + <% if @public_body.has_notes? && (@public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact') %> + <p><%= @public_body.notes_as_html %></p> + <% end %> + + <% if @public_body.eir_only? %> + <p><%= _('You can only request information about the environment from this authority.')%></p> + <% end %> + <div id="stepwise_make_request"> + <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> + <% if @public_body.eir_only? %> + Make a new <strong>Environmental Information</strong> request + <% else %> + Make a new <strong>Freedom of Information</strong> request + <% end %> + <%= _('<a href="{{url}}">{{image_tag}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :image_tag=>image_tag('start-button.png'))%> + <% elsif @public_body.has_notes? %> + <%= @public_body.notes_as_html %> + <% elsif @public_body.not_requestable_reason == 'not_apply' %> + <%= _('Freedom of Information law does not apply to this authority, so you cannot make + a request to it.')%> + <% elsif @public_body.not_requestable_reason == 'defunct' %> + <%= _('This authority no longer exists, so you cannot make a request to it.')%> <% else %> - <%= _('<a href="{{url}}">Make a new Freedom of Information request</a> to {{public_body_name}}', - :public_body_name => h(@public_body.name), :url=>new_request_to_body_url(:url_name => @public_body.url_name))%> + <%= _('For an unknown reason, it is not possible to make a request to this authority.')%> <% end %> - <% elsif @public_body.has_notes? %> - <%= @public_body.notes_as_html %> - <% elsif @public_body.not_requestable_reason == 'not_apply' %> - <%= _('Freedom of Information law does not apply to this authority, so you cannot make - a request to it.')%> - <% elsif @public_body.not_requestable_reason == 'defunct' %> - <%= _('This authority no longer exists, so you cannot make a request to it.')%> - <% else %> - <%= _('For an unknown reason, it is not possible to make a request to this authority.')%> - <% end %> - </strong> + </div> + </div> </div> - +<div style="clear:both"> </div> <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @public_body.eir_only? %> @@ -74,7 +77,7 @@ <p><%= _('Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet.', :public_body_name => h(@public_body.name))%></p> <% end %> <% else %> - <h2> + <h2 class="foi_results"> <% if @public_body.eir_only? %> <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %> <% else %> @@ -101,3 +104,4 @@ <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p> <% end %> </div> +</div>
\ No newline at end of file diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 052833a67..71699835c 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -4,7 +4,7 @@ <h2><%= _('What best describes the status of this request now?') %></h2> <hr> <!------------------------------------------------> - <h3>This request is still in progress:</h3> + <h3><%= _('This request is still in progress:') %></h3> <% if @info_request.described_state != 'internal_review' %> <div> <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %> @@ -41,7 +41,7 @@ <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %> <hr> <!------------------------------------------------> - <h3>This particular request is finished:</h3> + <h3><%= _('This particular request is finished:') %></h3> <% if @info_request.described_state == 'internal_review' %> <p><%= _('The <strong>review has finished</strong> and overall:') %></p> @@ -68,7 +68,7 @@ <hr> <!------------------------------------------------> - <h3>Other:</h3> + <h3><%= _('Other:') %></h3> <div> <%= radio_button "incoming_message", "described_state", "error_message", :id => 'error_message' + id_suffix %> diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml index 1c88f97f8..e274fe8c9 100644 --- a/app/views/request/_other_describe_state.rhtml +++ b/app/views/request/_other_describe_state.rhtml @@ -7,7 +7,7 @@ Thanks.') %></h2> <hr> <!------------------------------------------------> - <h3>This request is still in progress:</h3> + <h3><%= _('This request is still in progress:') %></h3> <% if @info_request.described_state != 'internal_review' %> <div> <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %> @@ -37,7 +37,7 @@ <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %> <hr> <!------------------------------------------------> - <h3>This particular request is finished:</h3> + <h3><%= _('This particular request is finished:') %></h3> <% if @info_request.described_state == 'internal_review' %> <p><%= _('The <strong>review has finished</strong> and overall:') %></p> diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml index afacabea5..e7c378cec 100644 --- a/app/views/request/_request_listing_via_event.rhtml +++ b/app/views/request/_request_listing_via_event.rhtml @@ -3,7 +3,8 @@ end %> <div class="request_listing"> - <span class="head"> + <div class="request_left"> + <span class="head"> <% if event.is_incoming_message? %> <%= link_to highlight_words(info_request.title, @highlight_words), incoming_message_url(event.incoming_message) %> <% elsif event.is_outgoing_message? and event.event_type == 'followup_sent' %> @@ -13,18 +14,9 @@ end %> <% else %> <%= link_to highlight_words(info_request.title, @highlight_words), request_url(info_request) %> <% end %> - </span> - <span class="desc"> - <%= highlight_and_excerpt(event.search_text_main(true), @highlight_words, 150) %> - </span> - - <span class="bottomline icon_<%= info_request.calculate_status %>"> - - <strong> - <%= info_request.display_status %> - </strong><br> - - <% if event.event_type == 'sent' %> + </span> + <div class="requester"> + <% if event.event_type == 'sent' %> <%= _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:date=>simple_date(event.created_at )) %> <% elsif event.event_type == 'followup_sent' %> <%=event.display_status %> @@ -37,6 +29,17 @@ end %> <% else %> <% raise _("unknown event type indexed ") + event.event_type %> <% end %> + </div> + <span class="bottomline icon_<%= info_request.calculate_status %>"> + <strong> + <%= info_request.display_status %> + </strong><br> </span> + </div> + <div class="request_right"> + <span class="desc"> + <%= highlight_and_excerpt(event.search_text_main(true), @highlight_words, 150) %> + </span> + </div> </div> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 04dc0d010..fcd4cfbf2 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -1,40 +1,39 @@ -<div id="list_sidebar"> -<h1><%= _('Show only...')%></h1> -<ul> -<% for view, description, target in [ - ['successful', _('Successful responses'), request_list_successful_url(:view => 'successful')], - ['recent', _('Recently sent requests'), request_list_recent_url(:view => 'recent')] -] %> -<li> - <%= link_to_unless (@view == view), description, target %> -</li> -<% end %> -</ul> +<div id="header_left"> + <h1><%=@title%></h1> + + <p> + <i>Showing:</i> + <%= link_to_unless (@view == 'successful'), 'Successful requests', request_list_successful_url(:view => 'successful') %> | + <%= link_to_unless (@view == 'recent'), 'Successful requests', request_list_recent_url(:view => 'recent') %> + </p> </div> -<h1><%=@title%></h1> +<div id="header_right"> + <h2>Track these requests</h2> + <% if @track_thing %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> + <% end %> +</div> -<% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> -<% end %> +<div style="clear:both"></div> -<% view_cache :ttl => 5.minutes, :tag => [@view, @page, I18n.locale] do %> - <% if @list_results.empty? %> - <p> <%= _('No requests of this sort yet.')%></p> - <% else %> - <% for result in @list_results%> - <% if result.class.to_s == 'InfoRequestEvent' %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result, :info_request => result.info_request } %> - <% else %> - <p><strong><%= _('Unexpected search result type') %> <%=result.class.to_s%></strong></p> +<div class="results_section"> + <% view_cache :ttl => 5.minutes, :tag => [@view, @page, I18n.locale] do %> + <% if @list_results.empty? %> + <p> <%= _('No requests of this sort yet.')%></p> + <% else %> + <h2 class="foi_results"><%= _('2 FOI requests found') %></h2> + <div class="results_block"> + <% for result in @list_results%> + <% if result.class.to_s == 'InfoRequestEvent' %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result, :info_request => result.info_request } %> + <% else %> + <p><strong><%= _('Unexpected search result type') %> <%=result.class.to_s%></strong></p> + <% end %> <% end %> - <% end %> - <% end %> - - <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @matches_estimated) %> -<% end %> + </div> + <% end %> -<% if @track_thing %> - <p></p> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> -<% end %> + <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @matches_estimated) %> + <% end %> +</div>
\ No newline at end of file diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml index 72660283e..68bb34a64 100644 --- a/app/views/request/select_authority.rhtml +++ b/app/views/request/select_authority.rhtml @@ -13,7 +13,7 @@ // We're using the existing body list: we intercept the clicks on the titles to // display a preview on the right hand side of the screen $("#typeahead_response a").click(function() { - $("#authority_preview").load(this.href+" #main_content", function() { + $("#authority_preview").load(this.href+"?narrow_layout=1 #main_content", function() { $("#authority_preview").show(); }); return false; diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index a08f97c08..5a8316db4 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -16,15 +16,17 @@ <%= submit_tag "unsubscribe" %> </p> <% end %> -<% else %> +<% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> <%= link_to '<img src="/images/email-16.png" alt="">', do_track_url(track_thing) %> - <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %> + <%= link_to "Track by email", do_track_url(track_thing) %> + </div> + + <div class="feed_link feed_link_<%=location%>"> + <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> + <%= link_to (location == 'sidebar' ? 'RSS feed of updates' : 'RSS feed'), do_track_url(track_thing, 'feed') %> </div> <% end %> -<div class="feed_link feed_link_<%=location%>"> - <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> - <%= link_to (location == 'sidebar' ? 'RSS feed of updates' : 'RSS feed'), do_track_url(track_thing, 'feed') %> -</div> + diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index c3a99311a..8fd6c52ad 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -110,22 +110,19 @@ <% if not @is_you %> <p id="user_not_logged_in"> - <%= link_to _('Sign in'), signin_url(:r => request.request_uri) %> <%= _('to change password, - subscriptions and more')%> (<%=h @display_user.name %> <%= _('only')%>) + <%= _('<a href="%s">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name)) % [signin_url(:r => request.request_uri)]%> </p> <% end %> <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @page == 1 %> - <h2 id="foi_requests"><%= _('Freedom of Information requests made by')%> <%= @is_you ? 'you' : 'this person' %> </h2> - <p><%= @is_you ? _('You have') : _('This person has') %> - <%= _(' made no Freedom of Information requests using this site.')%></p> + <h2 id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2> + <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> <% end %> <% else %> <h2 id="foi_requests"> - <%= @is_you ? 'Your ' : "This person's " %> - <%=pluralize(@display_user.info_requests.size, _('Freedom of Information request')) %> + <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size %> <!-- matches_estimated <%=@xapian_requests.matches_estimated%> --> <%= @page_desc %> </h2> @@ -137,21 +134,20 @@ <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %> <% end %> <% else %> - <h2 id="foi_requests"><%= _('Freedom of Information requests made by')%> <%= @is_you ? _('you') : _('this person') %> </h2> + <h2 id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2> <p><%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests this person has made.')%></p> <% end %> <% if !@xapian_comments.nil? %> <% if @xapian_comments.results.empty? %> <% if @page == 1 %> - <h2><%= @is_you ? 'Your' : 'This person\'s' %> <%= _('annotations')%> </h2> - <p>None made.</p> + <h2><%= @is_you ? _('Your annotations') : _('This person\'s annotations') %></h2> + <p><%= _('None made.')%></p> <% end %> <% else %> <h2 id="annotations"> - <%= @is_you ? _('Your ') : _('This person\'s') %> - <%=pluralize(@display_user.visible_comments.size, _('annotation')) %> - <!-- matches_estimated <%=@xapian_comments.matches_estimated%> --> + <%= @is_you ? n_('Your %d annotation', 'Your %d annotations', @display_user.visible_comments.size) % @display_user.visible_comments.size : n_('This person\'s %d annotation', 'This person\'s %d annotations', @display_user.visible_comments.size) % @display_user.visible_comments.size %> + <!-- matches_estimated <%=@xapian_comments.matches_estimated%> --> <%= @page_desc %> </h2> @@ -166,7 +162,7 @@ <% if @is_you %> <% if @track_things.empty? %> <h2 id="email_subscriptions"> <%= _('Your email subscriptions')%></h2> - <p>None made.</p> + <p><%= _('None made.')%></p> <% else %> <h2 id="email_subscriptions"> Your <%=pluralize(@track_things.size, _('email subscription')) %> </h2> <% if @track_things_grouped.size == 1 %> |