From dcea8fdb0fd098cc179e7495842f599bd4a9d316 Mon Sep 17 00:00:00 2001 From: Dave Arter Date: Tue, 31 Mar 2015 16:35:28 +0100 Subject: [Greenwich] Royal Borough of Greenwich front end --- perllib/FixMyStreet/Cobrand/Greenwich.pm | 47 ++++ templates/web/greenwich/around/intro.html | 7 + templates/web/greenwich/faq/faq-en-gb.html | 134 ++++++++++ templates/web/greenwich/footer.html | 44 +++ .../web/greenwich/front/footer-marketing.html | 31 +++ templates/web/greenwich/header_logo.html | 29 ++ web/cobrands/greenwich/_colours.scss | 24 ++ web/cobrands/greenwich/_fonts.scss | 3 + web/cobrands/greenwich/base.scss | 89 +++++++ web/cobrands/greenwich/bcArrow.gif | Bin 0 -> 1166 bytes web/cobrands/greenwich/config.rb | 25 ++ web/cobrands/greenwich/layout.scss | 295 +++++++++++++++++++++ web/cobrands/greenwich/logo-mobile.gif | Bin 0 -> 5252 bytes web/cobrands/greenwich/logo.gif | Bin 0 -> 2742 bytes web/cobrands/greenwich/mastWave.gif | Bin 0 -> 17255 bytes web/cobrands/greenwich/tab-red.png | Bin 0 -> 2044 bytes 16 files changed, 728 insertions(+) create mode 100644 perllib/FixMyStreet/Cobrand/Greenwich.pm create mode 100644 templates/web/greenwich/around/intro.html create mode 100644 templates/web/greenwich/faq/faq-en-gb.html create mode 100644 templates/web/greenwich/footer.html create mode 100644 templates/web/greenwich/front/footer-marketing.html create mode 100644 templates/web/greenwich/header_logo.html create mode 100644 web/cobrands/greenwich/_colours.scss create mode 100644 web/cobrands/greenwich/_fonts.scss create mode 100644 web/cobrands/greenwich/base.scss create mode 100644 web/cobrands/greenwich/bcArrow.gif create mode 100644 web/cobrands/greenwich/config.rb create mode 100644 web/cobrands/greenwich/layout.scss create mode 100644 web/cobrands/greenwich/logo-mobile.gif create mode 100644 web/cobrands/greenwich/logo.gif create mode 100644 web/cobrands/greenwich/mastWave.gif create mode 100644 web/cobrands/greenwich/tab-red.png diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm new file mode 100644 index 000000000..96baf021e --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm @@ -0,0 +1,47 @@ +package FixMyStreet::Cobrand::Greenwich; +use parent 'FixMyStreet::Cobrand::UKCouncils'; + +use strict; +use warnings; + +sub council_id { return 2493; } +sub council_area { return 'Greenwich'; } +sub council_name { return 'Greenwich Borough Council'; } +sub council_url { return 'greenwich'; } + +sub example_places { + return ( 'SE18 6HQ', "Woolwich Road" ); +} + +sub enter_postcode_text { + my ($self) = @_; + return 'Enter a Royal Greenwich postcode, or street name and area'; +} + +sub disambiguate_location { + my $self = shift; + my $string = shift; + + my $town = 'Greenwich'; + + # as it's the requested example location, try to avoid a disambiguation page + $town .= ', SE10 0EF' if $string =~ /^\s*woolwich\s+r(?:oa)?d\s*(?:,\s*green\w+\s*)?$/i; + + return { + %{ $self->SUPER::disambiguate_location() }, + town => $town, + centre => '51.4743770385684,0.0555696523982184', + span => '0.089851200483885,0.150572372434415', + bounds => [ 51.423679096602, -0.0263872255863898, 51.5135302970859, 0.124185146848025 ], + }; +} + +sub pin_colour { + my ( $self, $p, $context ) = @_; + return 'grey' if $p->state eq 'not responsible'; + return 'green' if $p->is_fixed || $p->is_closed; + return 'red' if $p->state eq 'confirmed'; + return 'yellow'; +} + +1; diff --git a/templates/web/greenwich/around/intro.html b/templates/web/greenwich/around/intro.html new file mode 100644 index 000000000..81c0b55df --- /dev/null +++ b/templates/web/greenwich/around/intro.html @@ -0,0 +1,7 @@ +

[% loc('Report a street cleaning or parks issue in Royal Greenwich') %]

+

+ Use this form for reporting cleaning problems on streets and parks in Greenwich, such as littering, flytipping, graffiti or overflowing bins. +

+

+ To report other kinds of road and street problems like potholes, blocked drains, faulty street lamps or cracks in the pavement, please pick from our list of additional reporting forms. +

diff --git a/templates/web/greenwich/faq/faq-en-gb.html b/templates/web/greenwich/faq/faq-en-gb.html new file mode 100644 index 000000000..f143581d6 --- /dev/null +++ b/templates/web/greenwich/faq/faq-en-gb.html @@ -0,0 +1,134 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +
+ +
+ +

Frequently Asked Questions

+ +

These pages are for reporting things which are broken, dirty, damaged or +dumped, and need fixing, cleaning or clearing:

+ +

+ Note that though most of these services are provided by the Royal Borough of Greenwich, + FixMyStreet will forward some categories of issue to Transport for London (TfL). +

+ +
+
Reporting emergencies (Out of Hours)
+
+

Please do not report problems which present an immediate risk to life, + for example missing manhole covers or a fallen lamp column.

+

Issues reported via the website are only actioned during office hours. + If you require an Out of Hours service please ring our main number + 020 8854 8888 and a message will direct you to the relevant Out of Hours + service.

+ +
+ +
How do I report a problem here?
+
After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.
+
How are the problems solved?
+
They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.
+ +
Do you remove silly or illegal content?
+
Royal Borough of Greenwich and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.
+ +
Can I use FixMyStreet on my mobile?
+
+

The FixMyStreet website will already work on your mobile phone, adapting to + the size of your screen automatically. Using an app has some advantages, though + — for example, you can create a report even when you have no network + connection. +

+
+ +
Can I use these pages to report problems outside of the Royal Borough of Greenwich district? +
Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.
+ +
The site is powered by FixMyStreet, who are they?
+
FixMyStreet was built by mySociety, in conjunction with the Young Foundation. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like TheyWorkForYou. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at hello@mysociety.org, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.
+ +
Why does the site use kilometres for measurements?
+
The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!
+ +
Why can’t I zoom out more on the reporting map?
+
We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on Your Reports will let you see all + the reports you’ve made, wherever they are.
+ +
I’d like a site like this for my own location/ where’s the "source code" to this site?
+
+The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can download the +source code and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +Fiksgatami is an example of our code +being used in a Norwegian version of this site. +
+ +
+ +

Privacy Questions

+ +
+
Who gets to see my email address?
+
+

If you submit a problem, your details, and details of the problem, will be +submitted to the Royal Borough of Greenwich, or TfL, as +appropriate. Other than the council, only people we authorise to view the +FixMyStreet administration interface will be able to see your email address and +they will never use it for anything other than to help administer +FixMyStreet.

+

We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.

+
+ +
What emails will you send to me?
+
We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.
+ +
+ +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html new file mode 100644 index 000000000..31ab35f52 --- /dev/null +++ b/templates/web/greenwich/footer.html @@ -0,0 +1,44 @@ + [% IF pagefooter %] + + [% END %] + + + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] + + +
+
+ +
+
+ + + + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + + + diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html new file mode 100644 index 000000000..66a75b5cc --- /dev/null +++ b/templates/web/greenwich/front/footer-marketing.html @@ -0,0 +1,31 @@ +
+
+ + + +
+ +
+ +
diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html new file mode 100644 index 000000000..fa279bdc4 --- /dev/null +++ b/templates/web/greenwich/header_logo.html @@ -0,0 +1,29 @@ + + +
+ + + + + diff --git a/web/cobrands/greenwich/_colours.scss b/web/cobrands/greenwich/_colours.scss new file mode 100644 index 000000000..ff8ff2b40 --- /dev/null +++ b/web/cobrands/greenwich/_colours.scss @@ -0,0 +1,24 @@ +/* COLOURS */ + +$greenwich_red: #d42828; +$greenwich_dark_red: #a71930; +$greenwich_dark_grey: #4b5459; +$greenwich_med_grey: #d9e0e4; +$greenwich_light_grey: #e0e6e9; + +$primary: $greenwich_red; +$primary_b: #000000; +$primary_text: #222222; + +$base_bg: #fff; +$base_fg: #000; + +$map_nav_bg: #fff; +$nav_fg: #fff; +$nav_fg_hover: transparent; + +$col_click_map: $greenwich_red; +$col_click_map_dark: darken($col_click_map, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/greenwich/_fonts.scss b/web/cobrands/greenwich/_fonts.scss new file mode 100644 index 000000000..b03804e44 --- /dev/null +++ b/web/cobrands/greenwich/_fonts.scss @@ -0,0 +1,3 @@ +$body-font: Verdana, Arial, Helvetica, sans-serif; +$meta-font: $body-font; +$heading-font: georgia, 'new century schoolbook', 'times new roman', times, serif; diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss new file mode 100644 index 000000000..e4561e338 --- /dev/null +++ b/web/cobrands/greenwich/base.scss @@ -0,0 +1,89 @@ +@import "../sass/h5bp"; +@import "./_colours"; +@import "./_fonts"; +@import "../sass/mixins"; +@import "compass"; + +@import "../sass/base"; + +body.frontpage #site-logo, +.ie6 body.frontpage #site-logo, +#site-logo +{ + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + background-size: contain; + width: 82px; + height: 40px; + top: 8px; + left: 4px; +} + +#nav-link { + background: url('/cobrands/greenwich/tab-red.png') 0 0 no-repeat; +} + + +#site-header { + background-color: $base_bg; + background: url("/cobrands/greenwich/mastWave.gif") 0 0 no-repeat; + background-size: cover; +} + + +#mysoc-menu { + display: none; +} + +.issue-list-a li, .list-a li, #user-meta p, #front-main #postcodeForm { + background: $greenwich_light_grey; +} + +label[for=pc] { + color: $greenwich_dark_red; +} + +ol.big-numbers > li:before { + color: $primary; +} + +#front-howto #front_stats { + color: $nav_fg; +} + +#greenwich-menu-desktop, #fms-menu-desktop, #greenwich-breadcrumb { + display: none; +} + +footer { + ul li { + list-style: none; + } + + hr { + padding: 0; + margin: 0 -16px; + height: 4px; + background-color: $greenwich_red; + border: none; + } +} + +h1, h2 { + font-style: italic; +} + +button, input[type=submit], .btn, .green-btn, button.green-btn, input.green-btn { + border: none; + border-radius: 0; + text-transform: none; + color: white; + background: $greenwich_dark_grey; + border-bottom: solid 4px $greenwich_red; + + &:hover { + border: none; + border-bottom: solid 4px lighten($greenwich_red, 5%); + text-decoration: underline; + background: lighten($greenwich_dark_grey, 2%); + } +} diff --git a/web/cobrands/greenwich/bcArrow.gif b/web/cobrands/greenwich/bcArrow.gif new file mode 100644 index 000000000..98e02417c Binary files /dev/null and b/web/cobrands/greenwich/bcArrow.gif differ diff --git a/web/cobrands/greenwich/config.rb b/web/cobrands/greenwich/config.rb new file mode 100644 index 000000000..cab97b18f --- /dev/null +++ b/web/cobrands/greenwich/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss new file mode 100644 index 000000000..d129f4ed6 --- /dev/null +++ b/web/cobrands/greenwich/layout.scss @@ -0,0 +1,295 @@ +@import "_colours"; +@import "_fonts"; +@import "../sass/layout"; + +$fixed_page_width: 990px; + +/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ +.clearfix:before, .clearfix:after { content: " "; display: table; } +.clearfix:after { clear: both; } +/* For IE 6/7 only */ +.clearfix { *zoom: 1; } + + +#site-logo, +.ie6 #site-logo, +body.frontpage #site-logo, +.ie6 body.frontpage #site-logo, +body.authpage #site-logo, +.ie6 body.authpage #site-logo, +body.twothirdswidthpage #site-logo, +.ie6 body.twothirdswidthpage #site-logo +{ + position: relative; + top: 14px; + left: 14px; + margin: 0; + padding: 0; + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + width: 170px; + height: 83px; +} + +.container, #main-nav { + width: $fixed_page_width; +} + +#front-main { + background-color: $base_bg; + padding-top: 0.5em; + text-align: left; + + #front-main-container { + max-width: $fixed_page_width; + background-color: transparent; + padding: 1em 0; + } + + #postcodeForm div { + margin: 0; + } + + h1 { + color: $greenwich_dark_red; + padding-bottom: 3em; + } +} + +body.frontpage #site-header, #site-header { + height: auto; + + .container { + min-height: 0; + } + + .container:first-child { + background: url("/cobrands/greenwich/mastWave.gif") 0 0 no-repeat; + min-height: 110px; + } +} + +body.frontpage { + #user-meta p { + top: -9em; + } + + .issue-list-a li { + border-left: solid 4px $primary; + } + + #fms-menu-desktop { + position: absolute; + width: 990px; + top: 262px; + } +} + +body.twothirdswidthpage #user-meta p { + padding-bottom: 0; + z-index: 2; +} + +.nav-wrapper .nav-wrapper-2 { + border-top: none; +} + +#main-menu { + display: none; +} + +#greenwich-menu-desktop, #fms-menu-desktop, #greenwich-breadcrumb { + display: block; + font-size: 15px; + list-style: none; + margin: 0; + padding: 0; + + li { + display: inline-block; + list-style: none; + margin: 0; + padding: 0.25em 0.5em; + + span, a { + padding: 0.5em; + } + + span, a:hover { + text-decoration: underline; + } + } +} + +#greenwich-menu-desktop { + background: $greenwich_dark_grey; + font-family: $heading-font; + font-style: italic; + border-top: solid 4px $primary; + border-bottom: solid 4px $greenwich_med_grey; + text-align: right; + padding-right: 1em; + + li { + span, a { + color: $nav_fg; + } + } +} + +#greenwich-breadcrumb { + background: transparent; + margin-top: 0.25em; + + li { + padding: 0; + margin: 0; + font-size: 11px; + + span, a { + color: black; + + &.bc_arrow { + background: url('/cobrands/greenwich/bcArrow.gif') no-repeat right 0.4em; + padding: 0 15px 0 0; + } + } + } +} + +#fms-menu-desktop { + background: $greenwich_light_grey; + margin-top: 0.5em; + + li { + a { + color: $greenwich_dark_grey; + } + span { + color: $greenwich_red; + } + } +} + +body.mappage { + #site-header .container { + min-height: 68px; + } + + .main-menu-container { + display: none; + } + + #main-menu { + display: block; + } + + #site-logo { + top: 5px; + left: 6px; + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + background-size: 111px 54px; + width: 111px; + height: 54px; + } + + .nav-wrapper .nav-wrapper-2 { + background: url("/cobrands/greenwich/mastWave.gif") 100% 0 no-repeat; + background-color: $base_bg; + background-size: contain; + border-bottom: solid 4px $primary; + } + + #main-nav { + ul#main-menu { + li a.report-a-problem-btn { + color: $nav_fg; + } + } + + ul li { + a, span { + color: $primary_text; + } + a:hover { + text-decoration: underline; + } + } + } +} + +body.twothirdswidthpage .content .sticky-sidebar { + z-index: 0; + left: 43em; + + aside { + top: 14em; + } +} + +body.fullwidthpage, body.twothirdswidthpage { + .container .content footer { + a.platform-logo { + background-color: $greenwich_dark_grey; + background-position: center center; + background-size: 13em 1.5em; + width: 14em; + height: 3em; + border-radius: 1.5em; + } + + .tablewrapper { + padding: 0; + margin: 1em 0; + + div { + text-align: center; + + p { + margin: 0; + padding: 0; + line-height: 3em; + } + } + } + + .footer-nav { + padding: 0; + margin: 1em 0; + + ul { + margin: 0; + padding: 0; + text-align: center; + + li { + display: inline; + padding: 0 4px 0 7px; + font-size: 0.8em; + border-left: solid 1px $greenwich_dark_grey; + + &:first-child { + border-left: none; + } + + a, a:link, a:visited { + color: $primary_text; + } + } + } + } + + hr { + padding: 0; + margin: 0 -24px; + border-bottom: solid 8px $greenwich_red; + border-top: solid 48px $greenwich_dark_grey; + height: 0; + } + } +} + +// Override the default issue (report) list styling on the /my page, so that +// reports don't pop out the side of the sidebar +.issue-list-a.full-width { + margin-left: -1em; +} diff --git a/web/cobrands/greenwich/logo-mobile.gif b/web/cobrands/greenwich/logo-mobile.gif new file mode 100644 index 000000000..70fb1c692 Binary files /dev/null and b/web/cobrands/greenwich/logo-mobile.gif differ diff --git a/web/cobrands/greenwich/logo.gif b/web/cobrands/greenwich/logo.gif new file mode 100644 index 000000000..dc46d2bf1 Binary files /dev/null and b/web/cobrands/greenwich/logo.gif differ diff --git a/web/cobrands/greenwich/mastWave.gif b/web/cobrands/greenwich/mastWave.gif new file mode 100644 index 000000000..19984c94d Binary files /dev/null and b/web/cobrands/greenwich/mastWave.gif differ diff --git a/web/cobrands/greenwich/tab-red.png b/web/cobrands/greenwich/tab-red.png new file mode 100644 index 000000000..f3ef9d084 Binary files /dev/null and b/web/cobrands/greenwich/tab-red.png differ -- cgit v1.2.3 From 0133134e11dc9082b74d65a66f645004d66fc545 Mon Sep 17 00:00:00 2001 From: Dave Arter Date: Wed, 8 Apr 2015 15:17:41 +0100 Subject: [Greenwich] Use templates from Oxfordshire cobrand to get map pin filter controls --- templates/web/greenwich/around/_report_banner.html | 10 +++++++ .../greenwich/around/around_map_list_items.html | 0 .../web/greenwich/around/on_map_list_items.html | 11 ++++++++ templates/web/greenwich/around/tabbed_lists.html | 5 ++++ templates/web/greenwich/my/_problem-list.html | 25 +++++++++++++++++ templates/web/greenwich/reports/_list-entry.html | 6 ++++ templates/web/greenwich/reports/_list-filters.html | 32 ++++++++++++++++++++++ templates/web/greenwich/reports/_problem-list.html | 19 +++++++++++++ web/cobrands/greenwich/layout.scss | 1 + 9 files changed, 109 insertions(+) create mode 100644 templates/web/greenwich/around/_report_banner.html create mode 100644 templates/web/greenwich/around/around_map_list_items.html create mode 100644 templates/web/greenwich/around/on_map_list_items.html create mode 100644 templates/web/greenwich/around/tabbed_lists.html create mode 100644 templates/web/greenwich/my/_problem-list.html create mode 100644 templates/web/greenwich/reports/_list-entry.html create mode 100644 templates/web/greenwich/reports/_list-filters.html create mode 100644 templates/web/greenwich/reports/_problem-list.html diff --git a/templates/web/greenwich/around/_report_banner.html b/templates/web/greenwich/around/_report_banner.html new file mode 100644 index 000000000..52a869262 --- /dev/null +++ b/templates/web/greenwich/around/_report_banner.html @@ -0,0 +1,10 @@ +

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

+
+

[% loc( 'Have you found a problem here?' ) %]

+

Click on the map to report it

+
+ + [% loc("Can't see the map? Skip this step") %] + diff --git a/templates/web/greenwich/around/around_map_list_items.html b/templates/web/greenwich/around/around_map_list_items.html new file mode 100644 index 000000000..e69de29bb diff --git a/templates/web/greenwich/around/on_map_list_items.html b/templates/web/greenwich/around/on_map_list_items.html new file mode 100644 index 000000000..893f5c698 --- /dev/null +++ b/templates/web/greenwich/around/on_map_list_items.html @@ -0,0 +1,11 @@ +[% all_reports = on_map.merge(around_map) %] +[% IF all_reports.size %] + [% FOREACH problem IN all_reports %] + [% UNLESS problem.title; problem = problem.problem; END %] + [% INCLUDE "reports/_list-entry.html" %] + [% END %] +[% ELSE %] +
  • +

    [% loc('There are no reports to show.') %]

    +
    • +[% END %] diff --git a/templates/web/greenwich/around/tabbed_lists.html b/templates/web/greenwich/around/tabbed_lists.html new file mode 100644 index 000000000..0d7dfddfc --- /dev/null +++ b/templates/web/greenwich/around/tabbed_lists.html @@ -0,0 +1,5 @@ +[% INCLUDE "reports/_list-filters.html" %] + +
      + [% INCLUDE "around/on_map_list_items.html" %] +
    diff --git a/templates/web/greenwich/my/_problem-list.html b/templates/web/greenwich/my/_problem-list.html new file mode 100644 index 000000000..1ff69f9fb --- /dev/null +++ b/templates/web/greenwich/my/_problem-list.html @@ -0,0 +1,25 @@ +
      + [% IF problems.all %] + [% FOREACH p = problems.all %] + [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %] + [% END %] + [% ELSE %] +
    • +

      [% loc('There are no reports to show.') %]

      +
      • + [% END %] +
    + +[% IF ! problems.size %] + + +[% END %] diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html new file mode 100644 index 000000000..cd70410d3 --- /dev/null +++ b/templates/web/greenwich/reports/_list-entry.html @@ -0,0 +1,6 @@ +
  • + +

    [% problem.title | html %]

    +

    Reported [%- prettify_dt( problem.confirmed, 1 ) %]

    +     +
    • diff --git a/templates/web/greenwich/reports/_list-filters.html b/templates/web/greenwich/reports/_list-filters.html new file mode 100644 index 000000000..5d610261b --- /dev/null +++ b/templates/web/greenwich/reports/_list-filters.html @@ -0,0 +1,32 @@ +[% IF use_section_wrapper %] +
    +
    +[% END %] + +

    + + + +

    + +[% IF use_section_wrapper %] +
    +
    +[% END %] diff --git a/templates/web/greenwich/reports/_problem-list.html b/templates/web/greenwich/reports/_problem-list.html new file mode 100644 index 000000000..45746e309 --- /dev/null +++ b/templates/web/greenwich/reports/_problem-list.html @@ -0,0 +1,19 @@ +
    + [% INCLUDE column + problems = problems.${body.id} + %] +
    + +[% BLOCK column %] +
      + [% IF problems %] + [% FOREACH problem IN problems %] + [% INCLUDE 'reports/_list-entry.html' %] + [% END %] + [% ELSE %] +
    • +

      [% loc('There are no reports to show.') %]

      +
      • + [% END %] +
    +[% END %] diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index d129f4ed6..bde0eded5 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -1,6 +1,7 @@ @import "_colours"; @import "_fonts"; @import "../sass/layout"; +@import "../sass/report_list"; $fixed_page_width: 990px; -- cgit v1.2.3 From bf01023635dccf7116b703f4a0634594940d27d6 Mon Sep 17 00:00:00 2001 From: Dave Arter Date: Thu, 2 Apr 2015 15:35:49 +0100 Subject: [Greenwich] Add links to Greenwich FMS to pages on fixmystreet.com --- perllib/FixMyStreet/Cobrand/Greenwich.pm | 2 +- templates/web/fixmystreet.com/reports/_extras.html | 3 ++- templates/web/fixmystreet.com/static/council.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm index 96baf021e..18b0c2f5e 100644 --- a/perllib/FixMyStreet/Cobrand/Greenwich.pm +++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm @@ -6,7 +6,7 @@ use warnings; sub council_id { return 2493; } sub council_area { return 'Greenwich'; } -sub council_name { return 'Greenwich Borough Council'; } +sub council_name { return 'Royal Borough of Greenwich'; } sub council_url { return 'greenwich'; } sub example_places { diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 77a46493b..ff2a67dc2 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -5,7 +5,8 @@ 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Hart District Council' = 'hart.fixmystreet.com' 'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk' - 'Stevenage Borough Council' = 'stevenage.fixmystreet.com' + 'Stevenage Borough Council' = 'stevenage.fixmystreet.com', + 'Royal Borough of Greenwich' = 'fix.royalgreenwich.gov.uk' } secure = { 'fix.bromley.gov.uk' = 's' diff --git a/templates/web/fixmystreet.com/static/council.html b/templates/web/fixmystreet.com/static/council.html index f8eecb0d0..b7c158818 100644 --- a/templates/web/fixmystreet.com/static/council.html +++ b/templates/web/fixmystreet.com/static/council.html @@ -100,7 +100,7 @@

    Who's using FixMyStreet for councils?

    -

    Our UK client councils include Stevenage, Bromley, Barnet, Oxfordshire, Hart, East Sussex County Council, and (soon to launch) Warwickshire County Council.

    +

    Our UK client councils include Stevenage, Bromley, Barnet, Oxfordshire, Hart, East Sussex County Council, Greenwich, and (soon to launch) Warwickshire County Council.

    FixMyStreet for Councils is also in use outside the UK, in the city of Zurich, Switzerland.

    Case studies

    For the insider view, and to understand the integration process, read these councils’ stories.

    -- cgit v1.2.3 From 0ec07300dc6fd0fb455473150917ec8c9e38c22e Mon Sep 17 00:00:00 2001 From: Dave Arter Date: Fri, 29 May 2015 16:59:11 +0100 Subject: [Greenwich] Include external_id when submitting Open311 reports --- perllib/FixMyStreet/SendReport/Open311.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index d65a8ddb1..cfcac9bd8 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -127,8 +127,8 @@ sub send { $revert = 1; } - if ($row->cobrand eq 'fixmybarangay') { - # FixMyBarangay endpoints expect external_id as an attribute, as do Oxfordshire + if ($row->cobrand eq 'fixmybarangay' || $row->cobrand eq 'greenwich') { + # FixMyBarangay endpoints expect external_id as an attribute, as do Greenwich $row->set_extra_fields( { 'name' => 'external_id', 'value' => $row->id } ); $revert = 1; } -- cgit v1.2.3