diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html deleted file mode 100644 index bd68bad72..000000000 --- a/templates/web/bromley/index.html +++ /dev/null @@ -1,99 +0,0 @@ -[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] -[% map_js = BLOCK %] - -[% END %] - -[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %] - -

Reporting a problem in Bromley’s streets or parks

- -[% IF error %] -

[% error %]

-[% END %] - -
-
- [% question = c.cobrand.enter_postcode_text() %] -
- -
- - -
-
- -
-
- -

This is primarily for reporting physical problems that can be fixed -like graffiti, cleansing issues or road defects. To report other -kinds of problems like missed bins use our -online report it forms. -

- -
-
-

[% loc('How to report a problem') %]

- -
    -
  1. [% question %]
    2. -
  2. [% loc('Locate the problem on a map of the area') %]
    3. -
  3. [% loc('Enter details of the problem') %]
    4. -
  4. Confirm the report and Bromley Council will investigate
    5. -
- -
- [% INCLUDE "front/stats.html" %] - [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] -
-
- - - [% - recent_photos = c.cobrand.recent_photos('front', 5); - %] - - [% IF recent_photos.size %] -
-

[% loc('Recently reported problems') %]

- -
- -
- -
- [% END %] -
- - - - - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index c98982a60..a7240688f 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -69,7 +69,12 @@
-

[% loc( 'Click map to report a problem' ) %]

+

[% + loc( 'Click map to report a problem' ); + IF c.cobrand.moniker == 'bromley'; + 'Yellow pins show existing reports'; + END + %]

[% diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 42c60d051..476c426b0 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -19,9 +19,12 @@ Modernizr.load({ [% pre_container_extra = BLOCK %]

-

[% loc('Report, view, or discuss local problems') %]

- -

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

+ [% IF c.cobrand.moniker == 'bromley' %] +

Reporting a problem in Bromley’s streets or parks

+ [% ELSE %] +

[% loc('Report, view, or discuss local problems') %]

+

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

+ [% END %] [% question @@ -42,8 +45,12 @@ Modernizr.load({ [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] -[% IF error %] -

[% error %]

+[% IF c.cobrand.moniker == 'bromley' %] +

This is primarily for reporting physical problems that can be fixed +like graffiti, cleansing issues or road defects. To report other +kinds of problems like missed bins use our +online report it forms. +

[% END %]
@@ -54,7 +61,11 @@ Modernizr.load({
  • [% question %]
  • [% loc('Locate the problem on a map of the area') %]
  • [% loc('Enter details of the problem') %]
    • -
  • [% loc('We send it to the council on your behalf') %]
    • + [% IF c.cobrand.is_council %] +
  • Confirm the report and [% c.cobrand.council_name %] will investigate
    • + [% ELSE %] +
  • [% loc('We send it to the council on your behalf') %]
    • + [% END %]
    diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 5fa5fd116..eef0ee679 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -46,7 +46,7 @@ body.twothirdswidthpage .content { #front-main { background: $primary; @include border-radius(1em 1em 0 0); - margin-bottom: 1em; + margin: 2em 1em 0; padding-top: 0; // layout sets this because base has it slightly lighter h2 { -- cgit v1.2.3 From f02765c7ca752b9bf31b8d0fbc9df01dbacedb9e Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Fri, 18 May 2012 09:18:47 +0100 Subject: Add a .mailmap file Among other things, this means that authors are identified correctly in the output of "git shortlog". --- .mailmap | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..b279f97a8 --- /dev/null +++ b/.mailmap @@ -0,0 +1,33 @@ +Anders Einar Hilden +Andrew Perry +Anna Powell-Smith +Anna Powell-Smith +bci-cities +Chris Lightfoot +Dave Whiteland +Dave Whiteland +Duncan Parkes +Edmund von der Burg +Francis Irving +Guillaume Rischard +Guillaume Rischard +Josh Angell +Kagee +Keith Garrett +Kevin Brubeck Unhammer +Louise Crow +Louise Crow +Louise Crow +Mark Longair +Matthew Somerville +Matthew Somerville +Matthew Somerville +Matthew Somerville +Matthew Somerville +Matthew Somerville +Matthew Somerville +Matthew Somerville +Struan Donald +Struan Donald +Tim Morley +Tony Bowden -- cgit v1.2.3 From e9475bd7f2af04aacc40e44fde7394092a2731ae Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 May 2012 11:43:35 +0100 Subject: Remove some duplicate code. --- perllib/FixMyStreet/Cobrand/Bromley.pm | 58 ++---------------------------- perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 2 +- 2 files changed, 3 insertions(+), 57 deletions(-) diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index 90e71a36e..f65c2c258 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -1,5 +1,6 @@ package FixMyStreet::Cobrand::Bromley; -use base 'FixMyStreet::Cobrand::UKCouncils'; +use parent 'FixMyStreet::Cobrand::FixMyStreet'; +use parent 'FixMyStreet::Cobrand::UKCouncils'; use strict; use warnings; @@ -53,60 +54,5 @@ sub pin_colour { return 'yellow'; } -# Copy of function from FixMyStreet.pm cobrand as it's not inherited currently -sub generate_problem_banner { - my ( $self, $problem ) = @_; - - my $banner = {}; - if ( $problem->is_open && time() - $problem->lastupdate_local->epoch > 8 * 7 * 24 * 60 * 60 ) - { - $banner->{id} = 'unknown'; - $banner->{text} = _('Unknown'); - } - if ($problem->is_fixed) { - $banner->{id} = 'fixed'; - $banner->{text} = _('Fixed'); - } - if ($problem->is_closed) { - $banner->{id} = 'closed'; - $banner->{text} = _('Closed'); - } - - if ( grep { $problem->state eq $_ } ( 'investigating', 'in progress', 'planned' ) ) { - $banner->{id} = 'progress'; - $banner->{text} = _('In progress'); - } - - return $banner; -} - -sub process_extras { - my $self = shift; - my $ctx = shift; - my $contacts = shift; - my $extra = shift; - - for my $field (qw/ fms_extra_title first_name last_name /) { - my $value = $ctx->request->param($field); - - if ( !$value ) { - $ctx->stash->{field_errors}->{$field} = - _('This information is required'); - } - push @$extra, - { - name => $field, - description => uc($field), - value => $value || '', - }; - } - - if ( $ctx->request->param('fms_extra_title') ) { - $ctx->stash->{fms_extra_title} = - $ctx->request->param('fms_extra_title'); - $ctx->stash->{extra_name_info} = 1; - } -} - 1; diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 774723420..bd7c708a8 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -54,7 +54,7 @@ sub process_extras { my $extra = shift; if ( $contacts->[0]->area_id == 2482 ) { - for my $field ( qw/ fms_extra_title / ) { + for my $field ( qw/ fms_extra_title first_name last_name / ) { my $value = $ctx->request->param( $field ); if ( !$value ) { -- cgit v1.2.3 From 617ac1389fb985568c7a94df83c9f8d7ebcbe61a Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 May 2012 12:29:30 +0100 Subject: StreetReport seems to have disappeared. --- templates/web/default/faq/faq-en-gb.html | 39 ++++++++++++---------------- templates/web/fixmystreet/faq/faq-en-gb.html | 39 ++++++++++++---------------- templates/web/fixmystreet/footer.html | 1 - web/cobrands/fixmystreet/_layout.scss | 8 ------ 4 files changed, 34 insertions(+), 53 deletions(-) diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index ed9d53c24..290be5564 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -61,29 +61,27 @@ by a registered charity, though, so if you want to make a contribution, please do.