diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/general/search.rhtml | 3 | ||||
| -rw-r--r-- | app/views/help/about.rhtml | 60 | ||||
| -rw-r--r-- | app/views/request/_request_listing_via_event.rhtml | 12 |
3 files changed, 45 insertions, 30 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 82e24db66..60c268f86 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -24,6 +24,9 @@ <%=link_to_unless @sortby.nil?, "Show most relevant results first", search_url(@query, nil) %> | <%=link_to_unless @sortby == 'newest', "Newest results first", search_url(@query, 'newest') %> + <% if @sortby == 'described' %> + | Recently described results first + <% end %> <% end %> <% if @total_hits == 0 %> diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index d4a3da4db..71890380e 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -160,27 +160,49 @@ that. <dl> <dt id="thanks">Which people made WhatDoTheyKnow?</dt> -<dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/volunteertasks">maybe you too</a>)! <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. 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. -<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. Tom Steinberg managed to get the cash to pay for the site out of -<a href="http://www.jrrt.org.uk/jrsstct.htm">a dead chocolate mogul</a>, 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. 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. Lots of -people have been looking up FOI email addresses, and a few volunteering to -administrate the site - most especially Adam McGreggor, Alex Skene and John -Cross. Finally we couldn't do any of this without those +<dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/volunteertasks">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 managed to get the cash to pay for the site out of + <a href="http://www.jrrt.org.uk/jrsstct.htm">a dead chocolate mogul</a> ... +</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> + Lots of people have been looking up FOI email addresses, and a few + volunteering to run the site - most especially Adam McGreggor, Alex + Skene and John Cross. +</li> +<li> +Finally 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> +</ul> You're all stars. </dd> diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml index 408229f94..dfd16decd 100644 --- a/app/views/request/_request_listing_via_event.rhtml +++ b/app/views/request/_request_listing_via_event.rhtml @@ -13,17 +13,7 @@ end %> <% end %> </span> <span class="desc"> - <% - # this will work, but will spawn catdoc and be slow! - #highlight_and_excerpt(event.search_text_main, @highlight_words, 150) - %> - <% if not event.outgoing_message.nil? %> - <%= highlight_and_excerpt(event.outgoing_message.body_without_salutation, @highlight_words, 150) %> - <% elsif not event.incoming_message.nil? %> - <%= highlight_and_excerpt(event.incoming_message.get_body_for_quoting, @highlight_words, 150) %> - <% else %> - <%= highlight_and_excerpt(info_request.initial_request_text, @highlight_words, 150) %> - <% end %> + <%= highlight_and_excerpt(event.search_text_main, @highlight_words, 150) %> </span> <span class="bottomline icon_<%= info_request.calculate_status %>"> |