diff options
| -rwxr-xr-x | web/alert.cgi | 59 | ||||
| -rw-r--r-- | web/css.css | 10 | ||||
| -rwxr-xr-x | web/index.cgi | 9 | ||||
| -rw-r--r-- | web/js.js | 2 |
4 files changed, 67 insertions, 13 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index 8c4cafabd..36c921457 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: alert.cgi,v 1.17 2007-09-25 09:44:19 matthew Exp $ +# $Id: alert.cgi,v 1.18 2007-09-25 11:19:29 matthew Exp $ use strict; use Standard; @@ -15,6 +15,7 @@ use CrossSell; use mySociety::Alert; use mySociety::AuthToken; use mySociety::Config; +use mySociety::DBHandle qw(select_all); use mySociety::EmailUtil qw(is_valid_email); use mySociety::Gaze; use mySociety::MaPit; @@ -131,7 +132,7 @@ sub alert_list { . Page::short_name($c_ward->{name}), "$county->{name}, within $c_ward->{name} ward" ]; $options .= $q->p($q->strong('Or problems reported to:')) . $q->ul(alert_list_options($q, @options)); - $options .= $q->p($q->small('We send different categories of problem + $options .= $q->p($q->small('FixMyStreet sends different categories of problem to the appropriate council, so problems within the boundary of a particular council might not match the problems sent to that council. For example, a graffiti report will be sent to the district council, so will appear in both that council\'s alerts, @@ -149,6 +150,11 @@ but will only appear in the "Within the boundary" alert for the county council.' my $dist = mySociety::Gaze::get_radius_containing_population($lat, $lon, 200000); $dist = int($dist*10+0.5)/10; + my $checked = ''; + $checked = ' checked' if $q->param('feed') && $q->param('feed') eq "local:$x:$y"; + + my $pics = alert_recent_photos($e, $n, $dist); + <<EOF; <h1>Local RSS feeds and email alerts for ‘$input_h{pc}’</h1> @@ -156,16 +162,18 @@ but will only appear in the "Within the boundary" alert for the county council.' <input type="hidden" name="type" value="local"> <input type="hidden" name="pc" value="$input_h{pc}"> -<p>We have a variety of RSS feeds and email alerts for local problems. Simply -select which type of alert you’d like and click the button, or enter -your email address to subscribe to an email alert.</p> +$pics + +<p>Here are the types of local problem alerts for ‘$input_h{pc}’. +Select which type of alert you’d like and click the button for an RSS +feed, or enter your email address to subscribe to an email alert.</p> $errors -<p>The easiest alert is our simple geographic one:</p> +<p>The simplest alert is our geographic one:</p> <p id="rss_local"> -<input type="radio" name="feed" id="local:$x:$y" value="local:$x:$y"> +<input type="radio" name="feed" id="local:$x:$y" value="local:$x:$y"$checked> <label for="local:$x:$y">Problems within ${dist}km of this location</label> (a default distance which covers roughly 200,000 people) <a href="/rss/$x,$y"><img src="/i/feed.png" width="16" height="16" title="RSS feed of nearby problems" alt="RSS feed" border="0"></a> @@ -173,7 +181,7 @@ distance which covers roughly 200,000 people) <p id="rss_local_alt"> (alternatively the RSS feed can be customised, within <a href="/rss/$x,$y/2">2km</a> / <a href="/rss/$x,$y/5">5km</a> / <a href="/rss/$x,$y/10">10km</a> / <a href="/rss/$x,$y/20">20km</a>) -</ul> +</p> <p>Or you can subscribe to an alert based upon what ward or council you’re in:</p> @@ -219,18 +227,31 @@ sub alert_front_page { my %input_h = map { $_ => $q->param($_) ? ent($q->param($_)) : '' } qw(pc); my $out = <<EOF; <h1>Local RSS feeds and email alerts</h1> -<p>We have a variety of RSS feeds and email alerts for local problems, including +<p>FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems within a certain distance of a particular location.</p> $errors <form method="get" action="/alert"> <p>To find out what local alerts we have for you, please enter your UK -postcode or street name here: +postcode or street name and area: <input type="text" name="pc" value="$input_h{pc}"> <input type="submit" value="Look up"> </form> EOF + + return $out if $q->referer() =~ /fixmystreet\.com/; + + my $probs = select_all("select id, title from problem + where state in ('confirmed', 'fixed') and photo is not null + order by confirmed desc limit 8"); + $out .= '<h2>Some photos of recent reports</h2>' if @$probs; + foreach (@$probs) { + my $title = ent($_->{title}); + $out .= '<img border="0" src="/photo?tn=1;id=' . $_->{id} . + '" alt="' . $title . '" title="' . $title . '"> '; + } + return $out; } @@ -356,3 +377,21 @@ sub alert_do_subscribe { return Page::send_email($email, undef, 'alert', %h); } +sub alert_recent_photos { + my ($e, $n, $dist) = @_; + my $probs = select_all("select id, title + from problem_find_nearby(?, ?, ?) as nearby, problem + where nearby.problem_id = problem.id + and state in ('confirmed', 'fixed') and photo is not null + order by confirmed desc limit 5", $e, $n, $dist); + my $out = ''; + $out .= '<div id="alert_photos"><h2>Photos of recent nearby reports</h2>' if @$probs; + foreach (@$probs) { + my $title = ent($_->{title}); + $out .= '<img border="0" src="/photo?tn=1;id=' . $_->{id} . + '" alt="' . $title . '" title="' . $title . '"> '; + } + $out .= '</div>' if @$probs; + return $out; +} + diff --git a/web/css.css b/web/css.css index 52acd8f6d..92bdae29f 100644 --- a/web/css.css +++ b/web/css.css @@ -443,6 +443,16 @@ ol#current img { margin: 0 0 2em 4em; } +#alert_photos { + text-align: center; + float: right; + width: 150px; + margin-left: 0.5em; +} +#alert_photos h2 { + font-size: 100%; +} + /* Report page */ #col_problems, #col_fixed { diff --git a/web/index.cgi b/web/index.cgi index dd7c19bf7..7680d8685 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: index.cgi,v 1.164 2007-09-18 08:27:05 matthew Exp $ +# $Id: index.cgi,v 1.165 2007-09-25 11:19:29 matthew Exp $ use strict; use Standard; @@ -618,7 +618,10 @@ EOF } $out .= <<EOF; <h2>Closest problems within ${dist}km</h2> - <p><a href="/rss/$x,$y"><img align="right" src="/i/feed.png" width="16" height="16" title="RSS feed of recent local problems" alt="RSS feed" border="0"></a></p> + <div id="alert_links"> + <a id="email_alert" href="/alert?pc=$input_h{pc};type=local;feed=local:$x:$y;alert=Subscribe">Email me problems</a> + <span id="rss_link"><a href="/rss/$x,$y"><img src="/i/feed.png" width="16" height="16" title="RSS feed of recent local problems" alt="RSS feed" border="0" style="vertical-align: middle"></a></span> + </div> EOF $list = ''; foreach (@$current) { @@ -716,7 +719,7 @@ sub display_problem { <input type="submit" value="Subscribe"> </form> EOF - $out .= ' | <span id="rss_link"><a href="/rss/'.$input_h{id}.'"><img src="/i/feed.png" width="16" height="16" title="RSS feed" alt="RSS feed of updates to this problem" border="0" style="vertical-align: sub"></a></span>'; + $out .= ' <span id="rss_link"><a href="/rss/'.$input_h{id}.'"><img src="/i/feed.png" width="16" height="16" title="RSS feed" alt="RSS feed of updates to this problem" border="0" style="vertical-align: middle"></a></span>'; $out .= '</div>'; $out .= Page::display_problem_updates($input{id}); @@ -78,6 +78,8 @@ function email_alert_close() { } YAHOO.util.Event.onContentReady('email_alert', function() { YAHOO.util.Event.addListener(this, 'click', function(e) { + if (!document.getElementById('email_alert_box')) + return true; YAHOO.util.Event.preventDefault(e); if (YAHOO.util.Dom.getStyle('email_alert_box', 'display') == 'block') { email_alert_close(); |