diff options
| -rw-r--r-- | app/views/body/show.rhtml | 11 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 115 | ||||
| -rw-r--r-- | todo.txt | 22 |
3 files changed, 82 insertions, 66 deletions
diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml index c7196be85..6eb63d8c1 100644 --- a/app/views/body/show.rhtml +++ b/app/views/body/show.rhtml @@ -23,6 +23,17 @@ <p>You can only request information about the environment from this authority.</p> <% end %> +<!-- +<% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> + <p> + <strong>Search the authority's <%= link_to "web site", @public_body.calculated_home_page %>:</strong> + <%= text_field_tag 'q', params[:q], { :size => 20 } %> + <%= hidden_field_tag 'as_sitesearch', @public_body.calculated_home_page %> + <%= submit_tag "Search" %> + </p> +<% end %> +--> + <p> <% if @public_body.eir_only? %> <%= link_to "Make a new EIR request to " + h(@public_body.name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 6ec205ce9..ce95312dc 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -13,64 +13,73 @@ <%= foi_error_messages_for :info_request, :outgoing_message %> -<% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %> - - <div id="request_advice"> - <h1>Read this before writing your <%=h(@info_request.law_used_full)%> request</h1> - <ul> - <li>Use a <strong>search engine first</strong> to check that the information isn't already published. - </li> - <li>Write your request in <strong>simple, precise language</strong>. - <% if @info_request.public_body.info_requests.size > 0 %> - <li>Browse <%= link_to "other requests", public_body_url(@info_request.public_body) %> - to '<%= h(@info_request.public_body.name) %>' - for examples of how to word your request. - </li> - <% else %> - <li>Browse <%= link_to "other requests", request_list_url %> for examples of how to word your request. - </li> - <% end %> - <li>Keep it <strong>focussed</strong>, if you ask for everything it might cost too much - and you might get nothing. - </li> - <li>Ask for <strong>particular documents</strong>, rather than general questions. - </li> - <li>This site is <strong>public</strong>, everything you type (except your email address) and any response will be published. - </li> - </ul> - - <% if @info_request.public_body.notes != "" %> - <h1>Special note for this authority!</h1> - <ul> - <li><%=MySociety::Format.make_clickable(@info_request.public_body.notes) %></li> - </ul> +<div id="request_advice"> + <h1>Read this before writing your <%=h(@info_request.law_used_full)%> request</h1> + <ul> + <li> + <% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> + <strong>First, search</strong> the authority's web site ... + <br> + <%= text_field_tag 'q', params[:q], { :size => 20 } %> + <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> + <%= submit_tag "Search" %> + <br> + ... to check that the info isn't already published. <% end %> + </li> + <li>Write your request in <strong>simple, precise language</strong>. + <% if @info_request.public_body.info_requests.size > 0 %> + <li>Browse <%= link_to "other requests", public_body_url(@info_request.public_body) %> + to '<%= h(@info_request.public_body.name) %>' + for examples of how to word your request. + </li> + <% else %> + <li>Browse <%= link_to "other requests", request_list_url %> for examples of how to word your request. + </li> + <% end %> + <li>Keep it <strong>focussed</strong>, if you ask for everything it might cost too much + and you might get nothing. + </li> + <li>Ask for <strong>particular documents</strong>, rather than general questions. + </li> + <li>This site is <strong>public</strong>, everything you type (except your email address) and any response will be published. + </li> + </ul> - <% if @info_request.public_body.eir_only? %> - <h1>Please ask for environmental information only</h1> - - <p>The Freedom of Information Act <strong>does not apply</strong> to <%=h(@info_request.public_body.name)%>. - However, you have the right to request environmental - information under a different law (<a href="/help/about#eir">explanation</a>). - This covers a very wide spectrum of information about the state of - the <strong>natural and built environment</strong>, such as: + <% if @info_request.public_body.notes != "" %> + <h1>Special note for this authority!</h1> + <ul> + <li><%=MySociety::Format.make_clickable(@info_request.public_body.notes) %></li> + </ul> + <% end %> - <ul> - <li>Air, water, soil, land, flora and fauna (including how these effect - human beings)</li> - <li>Information on emissions and discharges (e.g. noise, energy, - radiation, waste materials)</li> - <li>Human health and safety</li> - <li>Cultural sites and built structures (as they may be affected by the - environmental factors listed above)</li> - <li>Plans and administrative measures that affect these matters</li> - </ul> + <% if @info_request.public_body.eir_only? %> + <h1>Please ask for environmental information only</h1> + + <p>The Freedom of Information Act <strong>does not apply</strong> to <%=h(@info_request.public_body.name)%>. + However, you have the right to request environmental + information under a different law (<a href="/help/about#eir">explanation</a>). + This covers a very wide spectrum of information about the state of + the <strong>natural and built environment</strong>, such as: - <p>Please only request information that comes under those categories, <strong>do not waste your - time</strong> or the time of the public authority by requesting unrelated information.</p> - <% end %> - </div> + <ul> + <li>Air, water, soil, land, flora and fauna (including how these effect + human beings)</li> + <li>Information on emissions and discharges (e.g. noise, energy, + radiation, waste materials)</li> + <li>Human health and safety</li> + <li>Cultural sites and built structures (as they may be affected by the + environmental factors listed above)</li> + <li>Plans and administrative measures that affect these matters</li> + </ul> + + <p>Please only request information that comes under those categories, <strong>do not waste your + time</strong> or the time of the public authority by requesting unrelated information.</p> + <% end %> +</div> +<% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %> + <div id="request_form"> <h1> <label class="form_label" for="info_request_public_body_id">To:</label> @@ -13,7 +13,12 @@ Write code to make sure the Return-Path is never foi@sandwich grrr Maybe move "send followup" into actions? -This page very slow: +Display current page (when not on first page), or perhaps range on both the +/list pages, and on the /..../similar pages (maybe I missed it elsewhere too). +Should make a general will_paginate like function to do this part, and call +that from /search (which has this already) too. +Paginate request listing (and other things!) on user page, and on public +authority page. http://www.whatdotheyknow.com/user/stuart_hardwicke_carruthers Internal review status/marker? @@ -67,7 +72,7 @@ CSS things - CSS error on "all councils" page on some browsers - Spacing on error boxes round form elements - icons for "Things to do with this request" ? - - forms are tiny on firefox e.g. http://www.whatdotheyknow.com/new/50 + - favicon.ico would be nice Wrapping of lines like this - are we taking few enough chars per line when wrapping annotations? http://www.whatdotheyknow.com/request/contract_with_thales_for_nationa#comment-95 @@ -89,6 +94,8 @@ Add "Postal replies stuff" and link to from FOI officer upload page Add "I'm not sure which authority to make my request to" - make flow better after first section, to abrupt now Simple initial bulk request prevention (see Tony's mail on this) +This doesn't work: +http://www.whatdotheyknow.com/search/status:waiting_classification/ Don't let somebody file a new request if they haven't classified all existing ones? - nobody will logout and reconfirm email for each one, so can just make it "can't file while already logged in"? @@ -123,9 +130,6 @@ From an email, isn't stripping spaces right. Also should group by the request id for search queries (so all appear together when request and response mention same term) -This doesn't work: -http://www.whatdotheyknow.com/search/status:waiting_classification/ - Link the overdue date to an explanation of what bank holidays it skipped etc. :) @@ -170,14 +174,6 @@ Renaming public authorities will break alerts on them. Compress the emails in the database Don't store the cached text in backups -Display current page (when not on first page), or perhaps range on both the -/list pages, and on the /..../similar pages (maybe I missed it elsewhere too). -Should make a general will_paginate like function to do this part, and call -that from /search (which has this already) too. -Paginate request listing (and other things!) on user page, and on public -authority page. -http://www.whatdotheyknow.com/user/stuart_hardwicke_carruthers - Check this again after a while, for dodgy states of events: s = InfoRequest.find(:all).select { |i| (not i.awaiting_description) and i.get_last_response_event_id and InfoRequestEvent.find(i.get_last_response_event_id).calculated_state != i.described_state }; s.size - XXXX so when somebody changes waiting description without changing described state doesn't log in event. |