diff options
| author | Matthew Somerville <matthew@fury.ukcod.org.uk> | 2011-04-08 11:31:44 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@fury.ukcod.org.uk> | 2011-04-08 11:31:44 +0100 |
| commit | 45226ce720a460f6a7265ed8e2faafc38bcf0e31 (patch) | |
| tree | 1950874973d012a1e5a668444a97780293d91bd3 | |
| parent | 65fd3142a388207262fafeb831f29c12470c6a65 (diff) | |
| parent | 473bca111dc1b14f1535ec56de83243c50ba04d7 (diff) | |
Merge branch 'master' into london
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | web/index.cgi | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index cce185f08..7d42f6e82 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /private_locale ._* .sass-cache - +perl-external/ +inc/ diff --git a/web/index.cgi b/web/index.cgi index a563548aa..c8fdb6158 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -133,6 +133,8 @@ sub front_page { 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 broken paving slabs)' + if $q->{site} eq 'southampton'; $out .= '<br><small>' . $subhead . '</small>' if $subhead ne ' '; $out .= '</p>'; #if (my $url = mySociety::Config::get('IPHONE_URL')) { @@ -580,6 +582,7 @@ please specify the closest point on land.')) unless %$all_councils; foreach (@$categories) { $council_ok{$_->{area_id}} = 1; next if $_->{category} eq _('Other'); + next if $q->{site} eq 'southampton' && $_->{category} eq 'Street lighting'; push @categories, $_->{category}; } if ($q->{site} eq 'scambs') { |