diff options
Diffstat (limited to 'app/views')
35 files changed, 559 insertions, 230 deletions
diff --git a/app/views/admin_public_body/import_csv.rhtml b/app/views/admin_public_body/import_csv.rhtml index 3ca1f4d59..75981a501 100644 --- a/app/views/admin_public_body/import_csv.rhtml +++ b/app/views/admin_public_body/import_csv.rhtml @@ -12,15 +12,7 @@ <% form_tag 'import_csv', :multipart => true do %> <p> - <label for="tag">Tag to add entries to (maybe you want: - <% for category, description in PublicBodyCategories::CATEGORIES_BY_TAG %> - <% if category != "other" %> - <strong><%= category %></strong>=<%= description %>; - <% end %> - <% end %> - ) - </label> - <br/> + <label for="tag">Tag to add entries to / alter entries for:</label> <%= text_field_tag 'tag', params[:tag] %> </p> @@ -30,10 +22,23 @@ <%= file_field_tag :csv_file, :size => 60 %> </p> - <p><strong>Note:</strong> This will report errors in the CSV file. If there are no errors, it will make updates. - Any changes since last import will be overwritten - e.g. email addresses changed back. Changes and additions - are reported on a successful import for you to check. + <p><strong>Note:</strong> Choose <strong>dry run</strong> to test, without + actually altering the database. Choose <strong>upload</strong> to actually + make the changes. In either case, you will be shown any errors, or details + of the changes. When uploading, any changes since last import will be + overwritten - e.g. email addresses changed back. + </p> - <p><%= submit_tag 'Upload' %></p> + <p><%= submit_tag 'Dry run' %> <%= submit_tag 'Upload' %></p> <% end %> +<hr> + +<p>Standard tags: + <% for category, description in PublicBodyCategories::CATEGORIES_BY_TAG %> + <% if category != "other" %> + <strong><%= category %></strong>=<%= description %>; + <% end %> + <% end %> + </p> + diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index b9115dd59..a6256478a 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -6,7 +6,15 @@ <p> <% for column in InfoRequest.content_columns %> <strong><%= column.human_name %>:</strong> <%=h @info_request.send(column.name) %> - <br/> + <% if column.name == 'described_state' %> + <strong>Calculated status:</strong> <%= @info_request.calculate_status %> + <br/><strong>Initial request last sent at:</strong> <%=@info_request.date_initial_request_last_sent_at.to_date %> + <strong>Date response required by:</strong> <%= @info_request.date_response_required_by %> + <strong>Very overdue after:</strong> <%= @info_request.date_very_overdue_after %> + <% end %> + <% if ![ 'allow_new_responses_from' ].include?(column.name) %> + <br/> + <% end %> <% end %> <strong>Created by:</strong> <%= user_both_links(@info_request.user) %> <br> <strong>Public authority:</strong> <%= public_body_both_links(@info_request.public_body) %> <br> diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml index 8aaae7048..72ee5fd95 100644 --- a/app/views/admin_track/_some_tracks.rhtml +++ b/app/views/admin_track/_some_tracks.rhtml @@ -5,7 +5,7 @@ <% for column in TrackThing.content_columns %> <th><%= column.human_name %></th> <% end %> - <th>Items sent by email</th> + <th>Items sent by email (in last month)</th> <th>Actions</th> </tr> diff --git a/app/views/admin_track/list.rhtml b/app/views/admin_track/list.rhtml index 1d076edf5..58c87ddba 100644 --- a/app/views/admin_track/list.rhtml +++ b/app/views/admin_track/list.rhtml @@ -16,7 +16,7 @@ <% for column in TrackThing.content_columns %> <th><%= column.human_name %></th> <% end %> - <th>Items sent by email</th> + <th>Items sent by email (in last month)</th> </tr> <% for track_thing in @admin_tracks %> diff --git a/app/views/comment/new.rhtml b/app/views/comment/new.rhtml index c0e7e3a22..7d7dfee6f 100644 --- a/app/views/comment/new.rhtml +++ b/app/views/comment/new.rhtml @@ -49,7 +49,7 @@ Annotations are so anyone, including you, can help the requester with their requ <li> Ideas on what <strong>other documents to request</strong> which the authority may hold. </li> <% end %> <% if [ 'rejected' ].include?(@info_request.described_state) %> - <li> Advise on whether the <strong>rejection is legal</strong>, and how to complain about it if not. </li> + <li> Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not. </li> <% end %> <% if [ 'internal_review' ].include?(@info_request.described_state) %> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 00b758e9f..b3fb3f12c 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -17,7 +17,7 @@ <br> <br> - OR, <strong>search</strong> for information others have requested. + OR, <strong>search</strong> for information others have requested using WhatDoTheyKnow.com </p> <% end %> </div> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 1fc93b099..9993e733a 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -127,7 +127,7 @@ <table class="status_table"> <tr><td><strong><%=search_link('status:waiting_response')%></strong></td><td> Waiting for the public authority to reply </td></tr> <tr><td><strong><%=search_link('status:not_held')%></strong></td><td> The public authority does not have the information requested </td></tr> - <tr><td><strong><%=search_link('status:rejected')%></strong></td><td> The request was rejected by the public authority </td></tr> + <tr><td><strong><%=search_link('status:rejected')%></strong></td><td> The request was refused by the public authority </td></tr> <tr><td><strong><%=search_link('status:partially_successful')%></strong></td><td> Some of the information requested has been received </td></tr> <tr><td><strong><%=search_link('status:successful')%></strong></td><td> All of the information requested has been received </td></tr> <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td> The public authority would like part of the request explained </td></tr> diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index a67c65009..5ff22b23f 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -58,6 +58,28 @@ If you like what we're doing, then you can <h1 id="making_requests">Making requests <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 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> +<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> @@ -70,6 +92,29 @@ to hear from you too. </dd> +<dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt> + +<dd> +<p>WhatDoTheyKnow 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. + </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> @@ -111,18 +156,20 @@ annotations after submitting the request). <p>Making an FOI request is nearly always free.</p> -<p>Sometimes an authority will reject your request, saying that the cost +<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> - -<p>There are other rare cases where an authority may say that they want to charge you, such as for postage -or photocopying. Either way, don't worry, the authority cannot make a charge unless you have -specifically agreed in advance to pay it. <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> </dd> @@ -131,21 +178,18 @@ href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/prac <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 "promptly", and in most cases not -later than 20 working days after receiving your request. That date -is shown on the page for your request. </p> - -<p>You will be emailed if this date goes by without a response, so you can send -the public authority another note to remind them if they are breaking the -law.</p> +<p>By law, public authorities must respond <strong>promptly</strong> to +requests. +</p> -<p>There are some cases where the hard deadline is allowed to go beyond the 20 -day period, such as if you had to clarify your request, or if they are a -school. They will normally say if they are invoking such a reason. -See '<a href="#days">You've calculated our deadline wrongly!</a>' for -details about what is allowed. </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="#days">full details</a>). -<p>Remember though, they should anyway have responded promptly.</p> +<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> @@ -174,6 +218,21 @@ details about what is allowed. </p> 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="#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> @@ -209,28 +268,35 @@ immediately so we can remove it.</p> <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>WhatDoTheyKnow is currently only designed for public requests. All +<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. You should contact the public authority directly if you would like to +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>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, +<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). 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 you write you request, it reminds you that you can only -request "environmental information" and tells you what that means. It is quite broad. -</dd> +the Environmental Information Regulations (EIR). +</p> -<dt id="eir_2">So can I request information using EIR from other authorities? <a href="#eir_2">#</a> </dt> +<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> -<dd>Yes, just make a Freedom of Information (FOI) request as normal. The +<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> @@ -280,7 +346,8 @@ you ask us to. <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. +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. @@ -317,7 +384,7 @@ Information Commissioner later about the handling of your request. <ul> <li>Use a different form of your name. The guidance says that "Mr Arthur Thomas Roberts" can make a valid request as "Arthur Roberts", -"A. T. Roberts", or "Mr Roberts", but not as "Arthur" or "A.T.R.". +"A. T. Roberts", or "Mr Roberts", but <strong>not</strong> as "Arthur" or "A.T.R.". </li> <li>Women may use their maiden name.</li> <li>In most cases, you may use any name by which you are "widely known and/or @@ -326,7 +393,7 @@ is regularly used". a company, or the trading name of a sole trader. <li>Ask someone else to make the request on your behalf. <li>You may, if you are really stuck, ask us to make the request on -your behalf. Please <a href="/help/about">contact us</a> with +your behalf. Please <a href="/help/contact">contact us</a> with a good reason why you cannot make the request yourself and cannot ask a friend to. We don't have the resources to do this for everyone. </ul> @@ -335,6 +402,28 @@ ask a friend to. We don't have the resources to do this for everyone. </dd> +<dt id="delete_requests">Can you delete my requests, or alter my name? <a href="#delete_requests">#</a> </dt> + +<dd> + +<p>WhatDoTheyKnow is a permanent, public archive of Freedom of +Information requests. Even though you may not find the response to +a request useful any more, it may be of interest to others. For this +reason, we will not delete requests. +</p> + +<p>Under exceptional circumstances we may remove or change your name +on the website, following similar policy as for the names of +public servants. Similarly, we may also remove other personal information. See +'<a href="#takedown">Can you take down personal information about me?</a>'. +</p> + +<p>If you're worried about this before you make your request, +see the section on <a href="#real_name">pseudonyms</a>.</p> + +</dd> + + <dt id="full_address">They've asked for my postal address! <a href="#full_address">#</a> </dt> <dd> @@ -470,7 +559,7 @@ needing any email, using the "respond to request" link at the bottom of each request page. </dd> -<dt id="days">You've calculated our deadline wrongly!<a href="#days">#</a> </dt> +<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> @@ -493,7 +582,7 @@ to have more of that complexity visible.</p> </dd> -<dt id="days2">But really, you calculated it wrong!<a href="#days2">#</a> </dt> +<dt id="days2">But really, how do you calculate the deadline?<a href="#days2">#</a> </dt> <dd> @@ -503,45 +592,78 @@ 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 attempt to show the maximum legal deadline -for response to each request. Here is the complex detail of how we calculate -it.</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 20 days.</li> +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>In theory, authorities can claim a time extension for applying a public -interest test. We don't think this should be a special reason for delay. There -are lots of other good reasons the authority might want more time, such as if -somebody is on holiday and they can't find the information. When -there's going to be any delay at all, we prefer it if authorities simply -apologise and explain what they are doing that is taking the extra time, rather -than resorting to legal minutiae. -</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> -<li>Since June 2009, schools have "20 working days disregarding any working -day which is not a school day, or 60 working days, whichever is first". Basically, -cut them some slack if it is holiday time. -</li> +<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> -<li>Requesters are encouraged to mark when they have clarified 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> +<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 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>. +<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. 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> + <dt id="large_file">How can I send a large file, which won't go by email?<a href="#large_file">#</a> </dt> <dd>Instead of email, you can respond to a request directly from your web @@ -592,9 +714,14 @@ that authorities resend these with the personal information removed.</p> <dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt> -<dd>We automatically remove some emails and 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 remove them all from attachments, such as PDFs. +<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> @@ -650,8 +777,14 @@ requests, and for good public relations, we'd advise you not to do that. </li> <li> The amazing team of volunteers who run the site, answer your support - emails, maintain the database of public authorities and so much more. - Thanks to Tony Bowden, John Cross, Adam McGreggor, Alex Skene, Richard Taylor. + 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. diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml index cd302a81a..432c00f2e 100644 --- a/app/views/help/unhappy.rhtml +++ b/app/views/help/unhappy.rhtml @@ -14,7 +14,7 @@ to your request '<%=request_link(@info_request) %>'? <ul> <li>You didn't get a reply within 20 working days</li> <li>You did not get all of the information that you requested <strong>or</strong></li> -<li>Your request was rejected, but without a reason valid under the law</li> +<li>Your request was refused, but without a reason valid under the law</li> </ul> <p>... you can</p> @@ -86,7 +86,7 @@ get the information by <strong>other means...</strong></p> <ul> <li>Make a <strong>new FOI request</strong> for summary information, or for -documentation relating indirectly to matters in your rejected request. +documentation relating indirectly to matters in your refused request. <a href="/help/contact">Ask us for ideas</a> if you're stuck.</li> <li>If any <strong>other public authorities</strong> or publicly owned companies are involved, then make FOI requests to them.</li> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index aad13dc97..0db75380f 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -3,14 +3,17 @@ <head> <!-- <%= javascript_include_tag :defaults %> --> <script type="text/javascript" src="/jslib/spell/spellChecker.js"></script> + <title> <% if @title %> <%=@title%> - WhatDoTheyKnow <% else %> - WhatDoTheyKnow - file and browse Freedom of Information (FOI) requests + WhatDoTheyKnow - make and browse Freedom of Information (FOI) requests <% end %> </title> + <link rel="shortcut icon" href="/favicon.ico"> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> <%= stylesheet_link_tag 'yucky-green', :title => "Yucky Green", :rel => "alternate stylesheet" %> <!--[if LT IE 7]> @@ -159,17 +162,14 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -<!-- -piwik_action_name = ''; -piwik_idsite = 4; -piwik_url = pkBaseURL + "piwik.php"; -piwik_log(piwik_action_name, piwik_idsite, piwik_url); -//--> -</script> -<noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""></p></noscript> -<!-- /Piwik --> +</script><script type="text/javascript"> +try { +var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4); +piwikTracker.trackPageView(); +piwikTracker.enableLinkTracking(); +} catch( err ) {} +</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=4" style="border:0" alt=""/></p></noscript> +<!-- End Piwik Tag --> <% end %> </body> diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 9b03e65d0..b1be9272a 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -1,32 +1,37 @@ <div id="body_sidebar"> -<h1>Show only...</h1> - -<h2>Alphabet</h2> -<ul><li> - <%= render :partial => 'alphabet' %> -</li></ul> - -<% first_row = true %> -<% for row in PublicBodyCategories::CATEGORIES_WITH_HEADINGS %> - <% if row.instance_of?(Array) %> - <li> - <%= link_to_unless (@tag == row[0]), row[1], list_public_bodies_url(:tag => row[0]) %> - </li> - <% else %> - <% if not first_row %> - </ul> + <h1>Show only...</h1> + + <h2>Alphabet</h2> + <ul><li> + <%= render :partial => 'alphabet' %> + </li></ul> + + <% first_row = true %> + <% for row in PublicBodyCategories::CATEGORIES_WITH_HEADINGS %> + <% if row.instance_of?(Array) %> + <li> + <%= link_to_unless (@tag == row[0]), row[1], list_public_bodies_url(:tag => row[0]) %> + </li> <% else %> - <% first_row = false %> + <% if not first_row %> + </ul> + <% else %> + <% first_row = false %> + <% end %> + <h2><%=h row%></h2> + <ul> <% end %> - <h2><%=h row%></h2> - <ul> <% end %> -<% end %> -</ul> -<p> -<a href="/help/about#missing_body">Are we missing a public authority?</a> -</p> + </ul> + + <p> + <a href="/help/about#missing_body">Are we missing a public authority?</a> + </p> + <p> + <%= link_to "List of all authorities (CSV)", all_public_bodies_csv_url() %> + </p> + </div> <% @title = "Public authorities - " + @description %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index f28581cdd..56d4cd75c 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -5,15 +5,19 @@ <%= 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", @public_body.calculated_home_page %><br> + <%= 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.charity_number.empty? %> - <%= link_to "Charity overview", 'http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=' + @public_body.charity_number %><br> + <% if @public_body.charity_number.match(/^SC/) %> + <%= link_to "Charity overview", "http://www.oscr.org.uk/CharityIndexDetails.aspx?id=" + @public_body.charity_number %><br> + <% else %> + <%= link_to "Charity overview", "http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=" + @public_body.charity_number %><br> + <% end %> <% end %> - <%= link_to "View FOI email address", view_public_body_email_url(@public_body.url_name) %> + <%= link_to "View FOI email address", view_public_body_email_url(@public_body.url_name) %><br> </div> <h1><%=h(@public_body.name)%></h1> @@ -63,18 +67,18 @@ <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @public_body.eir_only? %> - <h2>Environmental Information Regulations requests made</h2> + <h2>Environmental Information Regulations requests made using this site</h2> <p>Nobody has made any Environmental Information Regulations requests to <%=h(@public_body.name)%> using this site yet.</p> <% else %> - <h2>Freedom of Information requests made</h2> + <h2>Freedom of Information requests made using this site</h2> <p>Nobody has made any Freedom of Information requests to <%=h(@public_body.name)%> using this site yet.</p> <% end %> <% else %> <h2> <% if @public_body.eir_only? %> - <%=pluralize(@public_body.info_requests.size, "Environmental Information Regulations request") %> made + <%=pluralize(@public_body.info_requests.size, "Environmental Information Regulations request") %> made using this site <% else %> - <%=pluralize(@public_body.info_requests.size, "Freedom of Information request") %> made + <%=pluralize(@public_body.info_requests.size, "Freedom of Information request") %> made using this site <% end %> <%= @page_desc %> </h2> diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml index d51c6bfb3..9bef04ce4 100644 --- a/app/views/request/_after_actions.rhtml +++ b/app/views/request/_after_actions.rhtml @@ -24,7 +24,7 @@ <% if @last_response.nil? %> <%= link_to "Send follow up to " + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %> <% else %> - <% cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => @last_response.id, :only_path => true, :template => "_after_actions", :section => "reply_to_link") do %> + <% foi_cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => @last_response.id, :only_path => true, :template => "_after_actions", :section => "reply_to_link") do %> <%= link_to "Reply to " + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_url(:id => @info_request.id, :incoming_message_id => @last_response.id) + "#followup" %> <% end %> <% end %> diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 90beb4050..0756b0797 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -6,7 +6,7 @@ end if not incoming_message.nil? %> <div class="correspondence" id="incoming-<%=incoming_message.id.to_s%>"> - <% cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => incoming_message.id, :only_path => true, :template => "_correspondence", :section => "incoming_message_bubble", :collapse => @collapse_quotes ? nil : 'no' ) do %> + <% foi_cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => incoming_message.id, :only_path => true, :template => "_correspondence", :section => "incoming_message_bubble", :collapse => @collapse_quotes ? nil : 'no' ) do %> <h2> <% if !incoming_message.safe_mail_from.nil? && incoming_message.safe_mail_from.strip != @info_request.public_body.name.strip %> <%=h incoming_message.safe_mail_from %><br> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 4496fddb6..a91231ae8 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -58,7 +58,7 @@ </div> <div> <%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %> - <label for="rejected<%=id_suffix%>">My request has been <strong>rejected</strong></label> + <label for="rejected<%=id_suffix%>">My request has been <strong>refused</strong></label> </div> <hr> <!------------------------------------------------> diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 2429c63b2..b375befd1 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -19,46 +19,42 @@ <a href="/help/contact">contact us</a> if you are <%= user_link(@info_request.user) %> and need to send a follow up.</p> <% else %> - -<!-- <p>Please do <strong>not</strong> make new requests here. - If you are asking for information which was not in your original request, then - <%= link_to "file a new request", new_request_to_body_url(:public_body_id => @info_request.public_body.id.to_s) %> - instead. - </p> - --> - <% if @internal_review %> <p> If you are dissatisfied by the response you got from the public authority, you have the right to complain (<a href="http://foiwiki.com/foiwiki/index.php/Internal_reviews">details</a>). </p> - <% end %> - <% if @info_request.calculate_status == 'waiting_response_overdue' %> - <p> - <% if @info_request.working_days_20_overdue? %> - This request is <strong>long overdue a response</strong>. - <% else %> - This request is <strong>overdue a response</strong>. - <% end %> - You can say that, by law, the authority should have answered - <strong>promptly</strong>. If they have not given you a legal - reason why they need extra time - (<%= link_to "more details", about_url + "#quickly_response" %>), then - you can say they are breaking the law to have not replied by - <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. + <p>Please <strong>only</strong> write messages directly relating to your + request '<%= request_link(@info_request) %>'. If you would like to ask for information + that was not in your original request, then + <%= link_to "file a new request", new_request_to_body_url(:public_body_id => @info_request.public_body.id.to_s) %>. + </p> + + <% status = @info_request.calculate_status %> + <% if status == 'waiting_response_overdue' %> + <p>The response to your request has been <strong>delayed</strong>. You can say that, + by law, the authority should normally have responded + <strong>promptly</strong> and <% if @info_request.public_body.is_school? %> - This is a school, so legally they get lots of extra slack if it is - holiday time. + in term time <% end %> - </p> + by <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + (<%= link_to "details", about_url + "#quickly_response" %>). + </p> + <% elsif status == 'waiting_response_very_overdue' %> + <p> + The response to your request is <strong>long overdue</strong>. You can say that, by + law, under all circumstances, the authority should have responded + by now (<%= link_to "details", about_url + "#quickly_response" %>). + </p> <% end %> <% form_for(:outgoing_message, @outgoing_message, :html => { :id => 'followup_form' }, :url => incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => incoming_message.id)) do |o| %> <p> - <%= o.text_area :body, :rows => 10, :cols => 55 %> + <%= o.text_area :body, :rows => 15, :cols => 55 %> <br><script type="text/javascript">document.write('<input name="doSpell" type="button" value="Check spelling" onClick="openSpellChecker(document.getElementById(\'followup_form\').body);"/> (optional)')</script> </p> @@ -93,12 +89,7 @@ <% if @internal_review %> <p>Edit and add <strong>more details</strong> to the message above, - explaining why you would like a review. - <ul> - <li>Say that you are dissatisfied by their response</li> - <li>Set out your reasons why</li> - <li>Ask them to review their response</li> - </ul> + explaining why you are dissatisfied with their response. </p> <% end %> diff --git a/app/views/request/_hidden_correspondence.rhtml b/app/views/request/_hidden_correspondence.rhtml new file mode 100644 index 000000000..2c168c3fb --- /dev/null +++ b/app/views/request/_hidden_correspondence.rhtml @@ -0,0 +1,37 @@ +<% if info_request_event.prominence == 'requester_only' %> + <% + if !info_request_event.nil? && info_request_event.event_type == 'response' + incoming_message = info_request_event.incoming_message + end + if not incoming_message.nil? + %> + <div class="correspondence" id="incoming-<%=incoming_message.id.to_s%>"> + <p>This response has been hidden. See annotations to find out why. + If you are the requester, then you may + <%= link_to "sign in", signin_url(:r => request.request_uri) %> + to view the response. + </p> + </div> + <% elsif [ 'sent', 'followup_sent', 'resent', 'followup_resent' ].include?(info_request_event.event_type) %> + <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> + <p>This outgoing message has been hidden. See annotations to + find out why. If you are the requester, then you may <%= link_to + "sign in", signin_url(:r => request.request_uri) %> to view the + response. + </p> + </div> + <% elsif info_request_event.event_type == 'comment' %> + <div class="comment_in_request" id="comment-<%=comment.id.to_s%>"> + <p>This comment has been hidden. See annotations to + find out why. If you are the requester, then you may <%= link_to + "sign in", signin_url(:r => request.request_uri) %> to view the + response. + </p> + </div> + <% end %> + +<% elsif info_request_event.prominence == 'hidden' %> + <% # show nothing when hidden %> +<% else %> + <% raise "unexpected prominence on request event" %> +<% end %> diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml index 866e90142..66f64c27a 100644 --- a/app/views/request/_other_describe_state.rhtml +++ b/app/views/request/_other_describe_state.rhtml @@ -54,7 +54,7 @@ </div> <div> <%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %> - <label for="rejected<%=id_suffix%>">The request has been <strong>rejected</strong></label> + <label for="rejected<%=id_suffix%>">The request has been <strong>refused</strong></label> </div> <hr> <!------------------------------------------------> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 0cb9207d8..1509bf494 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -31,6 +31,7 @@ <!-- Important terms: <%= @xapian_similar.important_terms.join(" ") %> --> <% end %> + <p><%= link_to "Event history details", request_details_url(@info_request) %></p> <p><a href="/help/about#commercial">Are you the owner of any commercial copyright on this page?</a></p> -</div>
\ No newline at end of file +</div> diff --git a/app/views/request/details.rhtml b/app/views/request/details.rhtml new file mode 100644 index 000000000..db7e652f6 --- /dev/null +++ b/app/views/request/details.rhtml @@ -0,0 +1,54 @@ +<% @title = "Details of request '" + h(@info_request.title) + "'" %> +<h1><%="Details of request '" + request_link(@info_request) + "'" %></h1> + +<h2>Event history</h2> + +<p>This table shows the technical details of the internal events that happened +to this request on WhatDoTheyKnow. This could be used to generate information about +the speed with which authorities respond to requests, the number of requests +which require a postal response and much more. +</p> + +<p><strong>Caveat emptor!</strong> To use this data in an honourable way, you will need +a good internal knowledge of user behaviour on WhatDoTheyKnow. How, +why and by whom requests are categorised is not straightforward, and there will +be user error and ambiguity. You will also need to understand FOI law, and the +way authorities use it. Plus you'll need to be an elite statistician. Please +<a href="/help/contact">contact us</a> with questions. +</p> + +<% columns = ['id', 'event_type', 'created_at', 'described_state', 'calculated_state', 'last_described_at' ] %> + +<table> + <tr> + <% for column in @columns%> + <th><%= column %></th> + <% end %> + <th>link</th> + </tr> + +<% for info_request_event in @info_request.info_request_events.find(:all, :order => "created_at, id") %> + <tr class="<%= cycle('odd', 'even') %>"> + <% for column in @columns %> + <td> + <%=h info_request_event.send(column) %> + </td> + <% end %> + <td> + <% if info_request_event.outgoing_message %> + <%= link_to "outgoing", outgoing_message_url(info_request_event.outgoing_message) %> + <% end %> + <% if info_request_event.incoming_message %> + <%= link_to "incoming", incoming_message_url(info_request_event.incoming_message) %> + <% end %> + </td> + </tr> +<% end %> +</table> + +<p>Here <strong>described</strong> means when a user selected a status for the request, and +the most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by +WhatDoTheyKnow for intermediate events, which weren't given an explicit +description by a user. See the <a href="/search">search tips</a> for description of the states.</p> + + diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index aa9bf254d..b48966e2f 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -124,7 +124,7 @@ <p class="form_note"> Everything that you enter on this page, including <strong>your name</strong>, will be <strong>displayed publicly</strong> on - this website (<a href="/help/about/#public_request">why?</a>). + this website forever (<a href="/help/about/#public_request">why?</a>). If you are thinking of using a pseudonym, please <a href="/help/about/#real_name">read this first</a>. </p> @@ -132,7 +132,7 @@ <p class="form_note"> Everything that you enter on this page will be <strong>displayed publicly</strong> on - this website (<a href="/help/about/#public_request">why?</a>). + this website forever (<a href="/help/about/#public_request">why?</a>). </p> <% end %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 5b89a6d12..97dc32512 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -56,34 +56,34 @@ <% end %> <% elsif @status == 'waiting_response' %> Currently <strong>waiting for a response</strong> from <%= public_body_link(@info_request.public_body) %>, - they <%= link_to "must respond", about_url + "#quickly_response" %> - promptly but no later than <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. - <% elsif @status == 'waiting_response_overdue' %> - <% if @info_request.working_days_20_overdue? %> - This request is <strong>long overdue a response</strong>. - By law, <%= public_body_link(@info_request.public_body) %> - should normally have answered by - <strong><%= simple_date(@info_request.date_response_required_by) %></strong> - (<%= link_to "more details", about_url + "#quickly_response" %>). - You can <strong>complain</strong> by - <%= link_to "requesting an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %>. - <% else %> - This request is <strong>overdue a response</strong>. - By law, <%= public_body_link(@info_request.public_body) %> - should normally have answered by - <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. - If they need extra time they should have told you - why (<%= link_to "more details", about_url + "#quickly_response" %>). - <% end %> + they must respond promptly and <% if @info_request.public_body.is_school? %> - This is a school, so legally they get lots of extra slack if it is - holiday time. + in term time + <% else %> + normally <% end %> - + no later than <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + (<%= link_to "details", about_url + "#quickly_response" %>). + <% elsif @status == 'waiting_response_overdue' %> + Response to this request is <strong>delayed</strong>. + By law, <%= public_body_link(@info_request.public_body) %> should + normally have responded <strong>promptly</strong> and + <% if @info_request.public_body.is_school? %> + in term time + <% end %> + by <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + (<%= link_to "details", about_url + "#quickly_response" %>). + <% elsif @status == 'waiting_response_very_overdue' %> + Response to this request is <strong>long overdue</strong>. + By law, under all circumstances, <%= public_body_link(@info_request.public_body) %> + should have responded by now + (<%= link_to "details", about_url + "#quickly_response" %>). + You can <strong>complain</strong> by + <%= link_to "requesting an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %>. <% elsif @status == 'not_held' %> <%= public_body_link(@info_request.public_body) %> <strong>did not have</strong> the information requested. <% elsif @status == 'rejected' %> - The request was <strong>rejected</strong> by <%= public_body_link(@info_request.public_body) %>. + The request was <strong>refused</strong> by <%= public_body_link(@info_request.public_body) %>. <% elsif @status == 'successful' %> The request was <strong>successful</strong>. <% elsif @status == 'partially_successful' %> diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml index 1d841c3a8..ed32a1b67 100644 --- a/app/views/request/show_response.rhtml +++ b/app/views/request/show_response.rhtml @@ -10,7 +10,7 @@ <% if @gone_postal %> <div class="gone_postal_help"> - <h1>What exactly is happening?</h1> + <h1>Which of these is happening?</h1> <dl> diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml index ab2faf212..29a1a1d68 100644 --- a/app/views/request_mailer/overdue_alert.rhtml +++ b/app/views/request_mailer/overdue_alert.rhtml @@ -1,10 +1,10 @@ -<%= @info_request.public_body.name %> are late. +<%= @info_request.public_body.name %> have delayed. They have not replied to your <%=@info_request.law_used_short%> request '<%= @info_request.title %>' -promptly, as required by law. +promptly, as normally required by law<% if @info_request.public_body.is_school? %> during term time<% end %>. Click on the link below to send a message to <%= @info_request.public_body.name -%> reminding them to reply to your request. <% if @info_request.public_body.is_school? %> This is a school, so legally they get lots of extra slack if it is holiday time. <% end %> +%> reminding them to reply to your request. <%=@url%> diff --git a/app/views/request_mailer/very_overdue_alert.rhtml b/app/views/request_mailer/very_overdue_alert.rhtml new file mode 100644 index 000000000..2393d29e5 --- /dev/null +++ b/app/views/request_mailer/very_overdue_alert.rhtml @@ -0,0 +1,14 @@ +<%= @info_request.public_body.name %> are long overdue. + +They have not replied to your <%=@info_request.law_used_short%> request '<%= @info_request.title %>', +as required by law<% if @info_request.public_body.is_school? %> even during holidays<% end %>. + +Click on the link below to send a message to <%= @info_request.public_body.name +%> telling them to reply to your request. You might like to ask for an internal +review, asking them to find out why response to the request has been so slow. + +<%=@url%> + +-- the WhatDoTheyKnow team + + diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 812bf9b4b..52c2a9e71 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -18,7 +18,7 @@ </p> <p class="form_note"> - <%= link_to "Forgotten your password?", signchange_url + "?pretoken=" + h(params[:token]) %> + <%= link_to "Forgotten your password?", signchangepassword_url + "?pretoken=" + h(params[:token]) %> </p> <p class="form_checkbox"> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 59a9cfcd4..4d2020cdc 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -50,7 +50,8 @@ <%= link_to "Send message to " + h(@display_user.name), contact_user_url(:id => @display_user.id) %> <% if @is_you %> (just to see how it works) - <br><%= link_to "Change your password", signchange_url() %> + <br><%= link_to "Change your password", signchangepassword_url() %> | + <br><%= link_to "Change your email", signchangeemail_url() %> | <br><%= link_to "Set profile photo", profile_photo_url() %> <% end %> </p> diff --git a/app/views/user/signchange_send_confirm.rhtml b/app/views/user/signchange_send_confirm.rhtml deleted file mode 100644 index e1462760c..000000000 --- a/app/views/user/signchange_send_confirm.rhtml +++ /dev/null @@ -1,30 +0,0 @@ -<% @title = "Change password" %> - -<div id="change_password"> - -<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %> - <%= foi_error_messages_for :signchange %> - - <div class="form_note"> - <h1>Change your password</h1> - </div> - - <p> - <label class="form_label" for="signchange_email">Your e-mail:</label> - <%= text_field 'signchange', 'email', { :size => 20 } %> - </p> - - <p class="form_note"> - <strong>Note:</strong> - We will send you an email. Follow the instructions in it to change - your password. - </p> - - <div class="form_button"> - <%= hidden_field_tag 'submitted_signchange_send_confirm', 1 %> - <%= hidden_field_tag 'pretoken', params[:pretoken] %> - <%= submit_tag "Submit" %> - </div> -<% end %> - -</div> diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml new file mode 100644 index 000000000..b98dc383c --- /dev/null +++ b/app/views/user/signchangeemail.rhtml @@ -0,0 +1,41 @@ +<% @title = "Change your email address used on WhatDoTheyKnow.com" %> + +<% raise "internal error" if not @user %> + +<div id="change_email"> + +<% form_tag({:action => "signchangeemail"}, {:id => "signchangeemail_form"}) do %> + <%= foi_error_messages_for :signchangeemail %> + + <div class="form_note"> + <h1>Change your email address used on WhatDoTheyKnow.com</h1> + </div> + + <p> + <label class="form_label" for="signchangeemail_old_email">Old e-mail:</label> + <%= text_field 'signchangeemail', 'old_email', { :size => 20 } %> + </p> + + <p> + <label class="form_label" for="signchangeemail_new_email">New e-mail:</label> + <%= text_field 'signchangeemail', 'new_email', { :size => 20 } %> + </p> + + <p> + <label class="form_label" for="signchangeemail_password">Your password:</label> + <%= password_field 'signchangeemail', 'password', { :size => 15 } %> + </p> + + <p class="form_note"> + <strong>Note:</strong> + We will send an email to your new email address. Follow the + instructions in it to confirm changing your email. + </p> + + <div class="form_button"> + <%= hidden_field_tag 'submitted_signchangeemail_do', 1 %> + <%= submit_tag "Change email on WhatDoTheyKnow.com" %> + </div> +<% end %> + +</div> diff --git a/app/views/user/signchangeemail_confirm.rhtml b/app/views/user/signchangeemail_confirm.rhtml new file mode 100644 index 000000000..96acbf424 --- /dev/null +++ b/app/views/user/signchangeemail_confirm.rhtml @@ -0,0 +1,14 @@ +<% @title = h("Now check your email!") %> + +<h1 class="confirmation_heading">Now check your email!</h1> + +<p class="confirmation_message"> +We've sent an email to your new email address. You'll need to click the link in +it before your email address will be changed. +</p> + +<p class="confirmation_message"> +<small>If you use web-based email or have "junk mail" filters, also check your +bulk/spam mail folders. Sometimes, our messages are marked that way.</small> +</p> + diff --git a/app/views/user/signchange.rhtml b/app/views/user/signchangepassword.rhtml index 032d80945..4191344cb 100644 --- a/app/views/user/signchange.rhtml +++ b/app/views/user/signchangepassword.rhtml @@ -1,14 +1,14 @@ -<% @title = "Change password" %> +<% @title = "Change your password on WhatDoTheyKnow.com" %> <% raise "internal error" if not @user %> <div id="change_password"> -<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %> +<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %> <%= foi_error_messages_for :user %> <div class="form_note"> - <h1>Change your password</h1> + <h1>Change your password on WhatDoTheyKnow.com</h1> </div> <p> @@ -22,9 +22,9 @@ </p> <div class="form_button"> - <%= hidden_field_tag 'submitted_signchange_password', 1 %> + <%= hidden_field_tag 'submitted_signchangepassword_do', 1 %> <%= hidden_field_tag 'pretoken', params[:pretoken] %> - <%= submit_tag "Change password" %> + <%= submit_tag "Change password on WhatDoTheyKnow.com" %> </div> <% end %> diff --git a/app/views/user/signchange_confirm.rhtml b/app/views/user/signchangepassword_confirm.rhtml index baad6729b..baad6729b 100644 --- a/app/views/user/signchange_confirm.rhtml +++ b/app/views/user/signchangepassword_confirm.rhtml diff --git a/app/views/user/signchangepassword_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml new file mode 100644 index 000000000..8b2e4fa91 --- /dev/null +++ b/app/views/user/signchangepassword_send_confirm.rhtml @@ -0,0 +1,30 @@ +<% @title = "Change your password on WhatDoTheyKnow.com" %> + +<div id="change_password"> + +<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %> + <%= foi_error_messages_for :signchangepassword %> + + <div class="form_note"> + <h1>Change your password on WhatDoTheyKnow.com</h1> + </div> + + <p> + <label class="form_label" for="signchangepassword_email">Your e-mail:</label> + <%= text_field 'signchangepassword', 'email', { :size => 20 } %> + </p> + + <p class="form_note"> + <strong>Note:</strong> + We will send you an email. Follow the instructions in it to change + your password. + </p> + + <div class="form_button"> + <%= hidden_field_tag 'submitted_signchangepassword_send_confirm', 1 %> + <%= hidden_field_tag 'pretoken', params[:pretoken] %> + <%= submit_tag "Submit" %> + </div> +<% end %> + +</div> diff --git a/app/views/user_mailer/changeemail_already_used.rhtml b/app/views/user_mailer/changeemail_already_used.rhtml new file mode 100644 index 000000000..0f60ad798 --- /dev/null +++ b/app/views/user_mailer/changeemail_already_used.rhtml @@ -0,0 +1,9 @@ +Someone, perhaps you, just tried to change their email address on +WhatDoTheyKnow.com from <%=@old_email%> to <%=@new_email%>. + +This was not possible because there is already an account using +the email address <%=@new_email%>. + +The accounts have been left as they previously were. + +-- the WhatDoTheyKnow team diff --git a/app/views/user_mailer/changeemail_confirm.rhtml b/app/views/user_mailer/changeemail_confirm.rhtml new file mode 100644 index 000000000..9aa288fb0 --- /dev/null +++ b/app/views/user_mailer/changeemail_confirm.rhtml @@ -0,0 +1,12 @@ +<%= @name %>, + +Please click on the link below to confirm that you want to +change the email address that you use for WhatDoTheyKnow +from <%=@old_email%> to <%=@new_email%> + +<%=@url%> + +We will not reveal your email addresses to anybody unless you +or the law tell us to. + +-- the WhatDoTheyKnow team |