diff options
| -rw-r--r-- | perllib/Problems.pm | 14 | ||||
| -rwxr-xr-x | web/index.cgi | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/perllib/Problems.pm b/perllib/Problems.pm index d828470b9..7250cc3f4 100644 --- a/perllib/Problems.pm +++ b/perllib/Problems.pm @@ -6,7 +6,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: Problems.pm,v 1.18 2009-07-01 14:55:35 louise Exp $ +# $Id: Problems.pm,v 1.19 2009-08-31 12:20:57 louise Exp $ # package Problems; @@ -21,13 +21,11 @@ use mySociety::MaPit; my $site_restriction = ''; my $site_key = 0; sub set_site_restriction { - my $site = shift; - my @cats = Page::scambs_categories(); - my $cats = join("','", @cats); - $site_restriction = " and council=2260 and category in - ('$cats') " - if $site eq 'scambs'; - $site_key = 1; + my $q = shift; + my $site = $q->{site}; + if ($site ne 'fixmystreet'){ + ($site_restriction, $site_key) = Cobrand::set_site_restriction($q); + } } # Front page statistics diff --git a/web/index.cgi b/web/index.cgi index 193b0b91e..371a62966 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.277 2009-08-27 19:40:18 louise Exp $ +# $Id: index.cgi,v 1.278 2009-08-31 12:20:55 louise Exp $ use strict; use Standard; @@ -107,7 +107,6 @@ sub front_page { my $pc_h = ent($q->param('pc') || ''); my $out = '<p id="expl"><strong>' . _('Report, view, or discuss local problems') . '</strong>'; my $subhead = _('(like graffiti, fly tipping, broken paving slabs, or street lighting)'); - $subhead = '(like graffiti, fly tipping, or neighbourhood noise)' if $q->{site} eq 'scambs'; $out .= '<br><small>' . $subhead . '</small>' if $subhead ne ' '; $out .= '</p>'; #if (my $url = mySociety::Config::get('IPHONE_URL')) { @@ -159,14 +158,11 @@ EOF <div id="front_intro"> EOF $out .= $q->h2(_('How to report a problem')); - my $step4 = $q->li(_('We send it to the council on your behalf')); - $step4 = $q->li('The council receives your report and acts upon it') - if $q->{site} eq 'scambs'; $out .= $q->ol( $q->li(_('Enter a nearby GB postcode, or street name and area')), $q->li(_('Locate the problem on a map of the area')), $q->li(_('Enter details of the problem')), - $step4 + $q->li(_('We send it to the council on your behalf')) ); (my $fixed_pretty = $fixed) =~ s/(?<=\d)(?=(?:\d\d\d)+$)/,/g; |