From 4b1d07e90966994e13245fd1323d65a0d1dd2457 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Wed, 16 Jan 2019 18:35:18 +0000 Subject: [Northamptonshire] cobrand config, template and css changes Co-authored-by: Zarino Zappia Co-authored-by: Matthew Somerville --- perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 85 +++++++++ .../email/northamptonshire/_council_reference.html | 3 + .../email/northamptonshire/_council_reference.txt | 2 + .../_council_reference_alert_update.html | 2 + .../_council_reference_alert_update.txt | 2 + .../northamptonshire/_email_color_overrides.html | 21 +++ .../northamptonshire/confirm_report_sent.html | 1 + .../email/northamptonshire/confirm_report_sent.txt | 1 + templates/web/northamptonshire/about/_sidebar.html | 0 .../web/northamptonshire/about/faq-en-gb.html | 195 +++++++++++++++++++++ templates/web/northamptonshire/around/intro.html | 2 + templates/web/northamptonshire/footer_extra.html | 23 +++ templates/web/northamptonshire/header_extra.html | 1 + templates/web/northamptonshire/header_logo.html | 2 + .../report/_council_sent_info.html | 13 ++ templates/web/northamptonshire/tracking_code.html | 12 ++ web/cobrands/northamptonshire/_colours.scss | 28 +++ web/cobrands/northamptonshire/base.scss | 82 +++++++++ .../northamptonshire/fonts/PraterSansComp.ttf | Bin 0 -> 71320 bytes .../northamptonshire/fonts/PraterSansWeb.eot | Bin 0 -> 64732 bytes .../northamptonshire/fonts/PraterSansWeb.woff | Bin 0 -> 40044 bytes .../northamptonshire/images/email-logo.png | Bin 0 -> 3248 bytes web/cobrands/northamptonshire/img/new-ncc-logo.png | Bin 0 -> 3248 bytes web/cobrands/northamptonshire/layout.scss | 34 ++++ 24 files changed, 509 insertions(+) create mode 100644 perllib/FixMyStreet/Cobrand/Northamptonshire.pm create mode 100644 templates/email/northamptonshire/_council_reference.html create mode 100644 templates/email/northamptonshire/_council_reference.txt create mode 100644 templates/email/northamptonshire/_council_reference_alert_update.html create mode 100644 templates/email/northamptonshire/_council_reference_alert_update.txt create mode 100644 templates/email/northamptonshire/_email_color_overrides.html create mode 100644 templates/email/northamptonshire/confirm_report_sent.html create mode 100644 templates/email/northamptonshire/confirm_report_sent.txt create mode 100644 templates/web/northamptonshire/about/_sidebar.html create mode 100644 templates/web/northamptonshire/about/faq-en-gb.html create mode 100644 templates/web/northamptonshire/around/intro.html create mode 100644 templates/web/northamptonshire/footer_extra.html create mode 100644 templates/web/northamptonshire/header_extra.html create mode 100644 templates/web/northamptonshire/header_logo.html create mode 100644 templates/web/northamptonshire/report/_council_sent_info.html create mode 100644 templates/web/northamptonshire/tracking_code.html create mode 100644 web/cobrands/northamptonshire/_colours.scss create mode 100644 web/cobrands/northamptonshire/base.scss create mode 100644 web/cobrands/northamptonshire/fonts/PraterSansComp.ttf create mode 100644 web/cobrands/northamptonshire/fonts/PraterSansWeb.eot create mode 100644 web/cobrands/northamptonshire/fonts/PraterSansWeb.woff create mode 100644 web/cobrands/northamptonshire/images/email-logo.png create mode 100644 web/cobrands/northamptonshire/img/new-ncc-logo.png create mode 100644 web/cobrands/northamptonshire/layout.scss diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm new file mode 100644 index 000000000..77af588ef --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm @@ -0,0 +1,85 @@ +package FixMyStreet::Cobrand::Northamptonshire; +use parent 'FixMyStreet::Cobrand::Whitelabel'; + +use strict; +use warnings; + +use Moo; +with 'FixMyStreet::Roles::ConfirmValidation'; + +sub council_area_id { 2234 } +sub council_area { 'Northamptonshire' } +sub council_name { 'Northamptonshire County Council' } +sub council_url { 'northamptonshire' } + +sub example_places { ( 'NN1 1NS', "Bridge Street" ) } + +sub enter_postcode_text { 'Enter a Northamptonshire postcode, street name and area, or check an existing report number' } + +sub base_url { + my $self = shift; + return $self->next::method() if FixMyStreet->config('STAGING_SITE'); + return 'https://fixmystreet.northamptonshire.gov.uk'; +} + +sub disambiguate_location { + my $self = shift; + my $string = shift; + + return { + %{ $self->SUPER::disambiguate_location() }, + centre => '52.30769080650276,-0.8647071378799923', + bounds => [ 51.97726778979222, -1.332346116362747, 52.643600776698605, -0.3416080408721255 ], + }; +} + +sub send_questionnaires { 0 } + +sub on_map_default_status { 'open' } + +sub report_sent_confirmation_email { 1 } + +sub contact_email { + my $self = shift; + return join( '@', 'highways', $self->council_url . '.gov.uk' ); +} + +sub privacy_policy_url { + 'https://www3.northamptonshire.gov.uk/councilservices/council-and-democracy/transparency/information-policies/privacy-notice/place/Pages/street-doctor.aspx' +} + +sub enable_category_groups { 1 } + +sub is_two_tier { 1 } + +sub get_geocoder { 'OSM' } + +sub map_type { 'OSM' } + +sub open311_config { + my ($self, $row, $h, $params) = @_; + + my $extra = $row->get_extra_fields; + + # remove the emergency category which is informational only + @$extra = grep { $_->{name} ne 'emergency' } @$extra; + + push @$extra, + { name => 'report_url', + value => $h->{url} }, + { name => 'title', + value => $row->title }, + { name => 'description', + value => $row->detail }, + { name => 'category', + value => $row->category }; + + $row->set_extra_fields(@$extra); + + $params->{multi_photos} = 1; +} + +# sending updates not part of initial phase +sub should_skip_sending_update { 1; } + +1; diff --git a/templates/email/northamptonshire/_council_reference.html b/templates/email/northamptonshire/_council_reference.html new file mode 100644 index 000000000..8a1a9e1ee --- /dev/null +++ b/templates/email/northamptonshire/_council_reference.html @@ -0,0 +1,3 @@ +

The report's reference number is [% problem.id %]. + Please quote this if you need to contact the council about this report.

+ diff --git a/templates/email/northamptonshire/_council_reference.txt b/templates/email/northamptonshire/_council_reference.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/northamptonshire/_council_reference.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/northamptonshire/_council_reference_alert_update.html b/templates/email/northamptonshire/_council_reference_alert_update.html new file mode 100644 index 000000000..bc7e0282c --- /dev/null +++ b/templates/email/northamptonshire/_council_reference_alert_update.html @@ -0,0 +1,2 @@ +

The report's reference number is [% problem.id %]. + Please quote this if you need to contact the council about this report.

diff --git a/templates/email/northamptonshire/_council_reference_alert_update.txt b/templates/email/northamptonshire/_council_reference_alert_update.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/northamptonshire/_council_reference_alert_update.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/northamptonshire/_email_color_overrides.html b/templates/email/northamptonshire/_email_color_overrides.html new file mode 100644 index 000000000..0946aeaaf --- /dev/null +++ b/templates/email/northamptonshire/_email_color_overrides.html @@ -0,0 +1,21 @@ +[% + +# $blue: #0066cc; +# $dark: #222; +color_purple = '#7F1183' +color_green = '#2C8500' +color_white = '#fff' + +header_background_color = color_green +header_text_color = color_white + +secondary_column_background_color = color_white + +button_background_color = color_purple +button_text_color = color_white + +logo_width = "190" # pixel measurement, but without 'px' suffix +logo_height = "41" # pixel measurement, but without 'px' suffix +logo_file = "email-logo.png" + +%] diff --git a/templates/email/northamptonshire/confirm_report_sent.html b/templates/email/northamptonshire/confirm_report_sent.html new file mode 100644 index 000000000..b698520dd --- /dev/null +++ b/templates/email/northamptonshire/confirm_report_sent.html @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.html' %] diff --git a/templates/email/northamptonshire/confirm_report_sent.txt b/templates/email/northamptonshire/confirm_report_sent.txt new file mode 100644 index 000000000..3d566f89b --- /dev/null +++ b/templates/email/northamptonshire/confirm_report_sent.txt @@ -0,0 +1 @@ +[% INCLUDE 'other-reported.txt' %] diff --git a/templates/web/northamptonshire/about/_sidebar.html b/templates/web/northamptonshire/about/_sidebar.html new file mode 100644 index 000000000..e69de29bb diff --git a/templates/web/northamptonshire/about/faq-en-gb.html b/templates/web/northamptonshire/about/faq-en-gb.html new file mode 100644 index 000000000..6aab3ba38 --- /dev/null +++ b/templates/web/northamptonshire/about/faq-en-gb.html @@ -0,0 +1,195 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +

Frequently Asked Questions

+
+
How can I report a pothole, street or road problem?
+
+

+ This easy to use web site is designed to help Northamptonshire residents to report, + view, or discuss local highway faults, including potholes, directly and quickly + to us by simply locating them on a map. You can do this by using your computer + or your mobile phone. +

+

+ Please report one problem at a time; you will be given an opportunity at the end + to report another problem using the personal details previously entered. +

+

+ If you are reporting an emergency please do not report it online, but ring our + Customer Service Centre on 0300 126 1000. +

+
+ +
What sort of problems can I report?
+
+

+ You can report faults linked to amenities or problems that are broken or dirty, + damaged or dumped, or need fixing, cleaning or clearing such as: +

+
    +
  • Drain Covers
    • +
  • Kerbs
    • +
  • Safety Bollards
    • +
  • Potholes
    • +
+
+
What isn’t it for?
+
+

+ The web site is not a way of getting in touch with the council for all issues + — please use it only for problems highlighted above. +

+

+ As we often route problems via our cleansing services or highways departments, + using the site for other matters may result in a delay in your report getting + to the right people. +

+
+

+ You will need to contact the county council directly for: +

+
    +
  • Any urgent or emergency problems +
  • Complaining about the council +
  • Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. +
+

+ You will need to contact your district council directly for problems such as:: +

+
    +
  • Anti-social behaviour
    • +
  • Noise pollution or barking dogs
    • +
  • Fires and smoke/smell pollution
    • +
  • Missing wheelie bins or recycling boxes or missed rubbish collections
    • +
  • CCTV
    • +
  • Complaining about your neighbours
    • +
  • Joy riding, drug taking, animal cruelty, or other criminal activity
    • +
+

+

+ You will need to contact Highways England for problems on the following roads:: +

+

+

    +
  • M1
    • +
  • M45
    • +
  • A5
    • +
  • A14
    • +
  • A43 between the M40 Junction 10 and M1 Junction 15a (from Northampton to the county boundary near Stamford is NCC
    • +
  • A45 between Thrapston and the M1 Junction 15 (from Junction 16 to the county boundary towards Dunchurch is NCC)
    • +
+

+
+
+ +
How do I use the reporting tool on the site?
+
+ After entering a postcode or location, you will then be presented with a map of + that area. You can then view problems already reported in that area, or report new + ones of your own simply by clicking on the map at the location of the problem. +
+ +
How are the problems solved?
+
+ They are reported to us automatically. We then resolve the problem the way we + normally would and update the fault on the map. +
+ +
What does the map show?
+
+ The map shows all faults submitted online. You can view the exact location of + each fault and see its current status. +
+ +
What updates will I receive?
+
+

+ When you record a fault you can sign up to receive updates and you will + receive an initial email to acknowledge the report. +

+

+ You will then receive an email every time that fault is updated. This could be when + a member of the public posts an update onto the fault or when we post a status update. +

+

+ Road problems that are the responsibility of our Highways department, such as potholes, + will receive automatic updates at different stages. You will receive an email when the + problem has been inspected and another one when a decision has been made on the action + required. +

+

+ Some faults may be marked as referred when they are not the responsibility of Northamptonshire + County Council, for example problems such as graffiti or rubbish which are the responsibility + of the District Council for that area. +

+

+ All of these updates will also be posted on the mapped fault so that anyone can see the status of any + fault recorded by clicking on it on the map. +

+
+ +
How can I get an update on a fault?
+
+

+ When you record a fault you can sign up to receive updates. You will then receive an initial + email to acknowledge the report. In time, you will receive a further email when the problem is + assigned for inspection, one if the problem needs to be referred to another department or + organisation, and a final email when it is fixed or requires no further work. +

+

+ These updates will also be posted on the mapped fault so that anyone can see the status of + any fault recorded by clicking on it on the map. +

+
+ +
Can I report a fault on my mobile?
+
+

+ Yes, you can view our website on your phone or tablet and it will automatically adapt to the + size of your screen. +

+
+
+ + +
+
Inappropriate use
+
+ Northamptonshire County Council is not responsible for the content and + accuracy of material submitted by its users. Northamptonshire County Council will monitor + this website for instances of inappropriate use, and reserves the right to moderate + comments if such instances occur. +
+ +
Why does the site use kilometres for measurements?
+
+ The maps are from Ordnance Survey who based their grid reference + system on measurements in metres and kilometres. +
+ +
How do I report a fault outside of Northamptonshire?
+
+ The map only shows locations within Northamptonshire to keep it locally focussed. +
+
+ + +
+
Acknowledgement
+
+ This site was built by mySociety, + in conjunction with the Young Foundation. + FixMyStreet is the project of a registered charity mySociety which has grown out of the community of + volunteers who built sites like TheyWorkForYou.com. + mySociety’s primary mission is to build Internet projects which give people simple, tangible + benefits in the civic and community aspects of their lives. Their first project + was WriteToThem, where you can write to any of your + elected representatives, for free. +
+
+

+ You can find out more about FixMyStreet at www.fixmystreet.com. +

+

 

+ +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/northamptonshire/around/intro.html b/templates/web/northamptonshire/around/intro.html new file mode 100644 index 000000000..d086264a4 --- /dev/null +++ b/templates/web/northamptonshire/around/intro.html @@ -0,0 +1,2 @@ +

Find and report road or street problems

+

(like potholes, blocked drains, or obstructions)

diff --git a/templates/web/northamptonshire/footer_extra.html b/templates/web/northamptonshire/footer_extra.html new file mode 100644 index 000000000..0ef9f1efc --- /dev/null +++ b/templates/web/northamptonshire/footer_extra.html @@ -0,0 +1,23 @@ +