aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Arter <davea@mysociety.org>2016-08-02 12:34:32 +0100
committerDave Arter <davea@mysociety.org>2016-08-02 12:34:32 +0100
commitdbab7c79c187f991a47f51a0ad82d980448a52c2 (patch)
tree2f70e3fe4584923db0d01ae26a8ef9db805dfa6d
parent1af9684e54aedb7f9935cdc4d38a28c61ec7d1f5 (diff)
[East Sussex] Remove East Sussex cobrand
-rwxr-xr-xbin/fixmystreet.com/build_eastsussex_templates96
-rw-r--r--perllib/FixMyStreet/Cobrand/EastSussex.pm134
-rw-r--r--t/cobrand/two_tier.t1
-rw-r--r--templates/web/eastsussex/.gitignore6
-rwxr-xr-xtemplates/web/eastsussex/about/faq-en-gb.html135
-rw-r--r--templates/web/eastsussex/around/intro.html4
-rw-r--r--templates/web/eastsussex/footer.html.template36
-rw-r--r--templates/web/eastsussex/header.html.template57
-rw-r--r--templates/web/eastsussex/report/new/after_category.html1
-rw-r--r--templates/web/eastsussex/report/new/after_name.html3
-rw-r--r--templates/web/eastsussex/report/new/category.html16
-rw-r--r--templates/web/eastsussex/report/public_label.html1
-rw-r--r--templates/web/eastsussex/report/update-form.html220
-rw-r--r--templates/web/fixmystreet.com/about/council.html3
-rwxr-xr-xtemplates/web/fixmystreet.com/reports/_extras.html1
-rw-r--r--web/cobrands/eastsussex/_colours.scss20
-rw-r--r--web/cobrands/eastsussex/base.scss229
-rw-r--r--web/cobrands/eastsussex/layout.scss211
-rw-r--r--web/cobrands/eastsussex/report-form.js22
-rw-r--r--web/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.pngbin4012 -> 0 bytes
20 files changed, 1 insertions, 1195 deletions
diff --git a/bin/fixmystreet.com/build_eastsussex_templates b/bin/fixmystreet.com/build_eastsussex_templates
deleted file mode 100755
index b22f5214f..000000000
--- a/bin/fixmystreet.com/build_eastsussex_templates
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env perl
-#
-# Build header.html and footer.html from online East Sussex template fragments.
-
-use strict;
-use warnings;
-use feature 'say';
-
-my %TEMPLATES = (
- "header.html.template" => [
- "HtmlTag",
- "MetadataDesktop",
- [
- "HeaderDesktop",
- [
- ["<header>", '<header class="eastsussex">'],
- ]
- ],
- ],
- "footer.html.template" => [
- "FooterDesktop",
- ]
-);
-
-my $BASE_URL = "https://www.eastsussex.gov.uk/masterpages/remote/control.aspx?control=%s&host=mysociety.org";
-
-use File::Basename qw(dirname basename);
-use File::Spec;
-my $DIR;
-BEGIN {
- $DIR = dirname(File::Spec->rel2abs($0)) . '/../..';
- require "$DIR/setenv.pl";
-}
-
-use File::ChangeNotify;
-use Getopt::Long;
-use LWP::Simple qw($ua);
-use Path::Tiny;
-
-$ua->agent("FixMyStreet/1.0");
-# The server seems to have some issues with SSL negotiation
-$ua->ssl_opts(SSL_version => 'SSLv23:!SSLv2:!SSLv3:!TLSv11:!TLSv12');
-
-chdir "$DIR/templates/web/eastsussex";
-
-GetOptions('watch' => \my $watch);
-
-if ($watch) {
- watch_local_files();
-} else {
- update_templates();
-}
-
-# ---
-
-sub update_templates {
- while (my ($template_path, $fragment_names) = each %TEMPLATES) {
- my %fragments;
- foreach my $name (@$fragment_names) {
- my $patches;
- ($name, $patches) = @$name if ref $name;
-
- my $url = sprintf($BASE_URL, $name);
- my $content = LWP::Simple::get($url);
- # If we got nothing, bail out!
- return unless $content;
-
- $content =~ s/\r//g;
- $content =~ s/$_->[0]/$_->[1]/ for @$patches;
- $fragments{$name} = $content;
- path("$name.html")->spew_utf8($fragments{$name});
- }
- my $template = path($template_path)->slurp_utf8;
- $template =~ s/{$_}/$fragments{$_}/ for keys %fragments;
- path(substr($template_path, 0, -9))->spew_utf8($template);
- }
- return 1;
-}
-
-sub watch_local_files {
- say "Watching for changes to: " . join(', ', keys %TEMPLATES);
- my $files = join('|', keys %TEMPLATES);
- my $watcher = File::ChangeNotify->instantiate_watcher(
- directories => '.',
- filter => qr/$files/,
- );
-
- while ( my @events = $watcher->wait_for_events() ) {
- for my $event (@events) {
- my $filename = basename($event->path);
- say "$filename has changed, updating templates...";
- my $success = update_templates();
- say $success ? "done." : 'Failed.';
- }
- }
-}
diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
deleted file mode 100644
index 80a86706a..000000000
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-package FixMyStreet::Cobrand::EastSussex;
-use base 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-sub council_id { return 2224; }
-sub council_area { return 'East Sussex'; }
-sub council_name { return 'East Sussex County Council'; }
-sub council_url { return 'eastsussex'; }
-sub is_two_tier { return 1; }
-
-sub disambiguate_location {
- my $self = shift;
- my $string = shift;
- return {
- %{ $self->SUPER::disambiguate_location() },
- town => 'East Sussex',
- centre => '50.9413275309703,0.276320277101682',
- span => '0.414030932264716,1.00374244745585',
- bounds => [ 50.7333642759327, -0.135851370247794, 51.1473952081975, 0.867891077208056 ],
- };
-}
-
-sub example_places {
- return ( 'BN7 2LZ', 'White Hill, Lewes' );
-}
-
-sub enter_postcode_text {
- my ($self) = @_;
- return 'Enter an East Sussex postcode, or street name and area';
-}
-
-# increase map zoom level so street names are visible
-sub default_map_zoom { return 3; }
-
-
-=head2 temp_update_potholes_contact
-
-Routine to update the extra for potholes (temporary setup hack, will be
-superseded by Open311/integration).
-
-Can run with a script or command line like:
-
- bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::EastSussex -e \
- 'FixMyStreet::Cobrand::EastSussex->new({c => FixMyStreet::App->new})->temp_update_potholes_contact'
-
-=cut
-
-use constant POTHOLE_SIZES => [
- {'key' => ['Blank'], 'name' => ['--']},
- {'key' => ['golf'], 'name' => ['Golf ball sized']},
- {'key' => ['tennis'], 'name' => ['Tennis ball sized']},
- {'key' => ['football'], 'name' => ['Football sized']},
- {'key' => ['larger'], 'name' => ['Larger']}
-];
-
-use constant POTHOLE_DICT => {
- map {
- @{ $_->{key} },
- @{ $_->{name} },
- } @{ POTHOLE_SIZES() },
-};
-
-sub resolve_pothole_size {
- my ($self, $key) = @_;
- return $self->POTHOLE_DICT->{$key};
-}
-
-sub temp_update_potholes_contact {
- my $self = shift;
-
- my $category = 'Potholes';
- my $contact = $self->{c}->model('DB::Contact')
- ->search({
- body_id => $self->council_id,
- category => $category,
- })->first
- or die "No such category: $category";
-
- my $fields = [
- {
- 'code' => 'detail_size', # there is already builtin handling for this field in Report::New
- 'variable' => 'true',
- 'order' => '1',
- 'description' => 'Size of the pothole?',
- 'required' => 'true',
- 'datatype' => 'singlevaluelist',
- 'datatype_description' => {},
- 'values' => {
- 'value' => $self->POTHOLE_SIZES,
- },
- }
- ];
- # require IO::String; require RABX;
- # RABX::wire_wr( $fields, IO::String->new(my $extra) );
-
- $contact->update({ extra => $fields });
-}
-
-sub get_geocoder {
- return 'OSM'; # default of Bing gives poor results, let's try overriding.
-}
-
-# for the /around/ page
-sub on_map_default_max_pin_age {
- return '3 months';
-}
-
-# for the /reports/ page
-sub reports_per_page { return 20; }
-
-sub pin_colour {
- my ( $self, $p, $context ) = @_;
-
- return 'grey' unless $self->owns_problem( $p );
-
- # TODO refactor to a Moo(se)? lazy attribute
- my $open_states = $self->{open_states} ||= $p->open_states;
-
- return $open_states->{ $p->state } ? 'yellow' : 'green';
-}
-
-sub send_questionnaires {
- return 0;
-}
-
-sub contact_email {
- my $self = shift;
- return join( '@', 'highways', 'eastsussex.gov.uk' );
-}
-
-1;
-
diff --git a/t/cobrand/two_tier.t b/t/cobrand/two_tier.t
index f52e66abc..97bbccc01 100644
--- a/t/cobrand/two_tier.t
+++ b/t/cobrand/two_tier.t
@@ -8,7 +8,6 @@ use FixMyStreet::Cobrand;
my @cobrands = (
[ hart => 2333 ],
[ oxfordshire => 2237 ],
- [ eastsussex => 2224 ],
[ stevenage => 2347 ],
[ warwickshire => 2243 ],
);
diff --git a/templates/web/eastsussex/.gitignore b/templates/web/eastsussex/.gitignore
deleted file mode 100644
index 8380978ad..000000000
--- a/templates/web/eastsussex/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-header.html
-footer.html
-FooterDesktop.html
-HeaderDesktop.html
-HtmlTag.html
-MetadataDesktop.html
diff --git a/templates/web/eastsussex/about/faq-en-gb.html b/templates/web/eastsussex/about/faq-en-gb.html
deleted file mode 100755
index 7356389cd..000000000
--- a/templates/web/eastsussex/about/faq-en-gb.html
+++ /dev/null
@@ -1,135 +0,0 @@
-[% INCLUDE 'header.html', title = 'Help', bodyclass = 'fullwidthpage' %]
-
-<h1> Frequently Asked Questions </h1>
-
-<p>These pages are for reporting problems on the road that need attention, such as:
-<ul>
- <li>potholes
- <li>pavements
- <li>street lights
- <li>signs and bollards
- <li>flooding
- <li>overhanging bushes and trees
- </ul>
-<p> For services that are not provided by East Sussex County Council, FixMyStreet will forward your report to the appropriate local authority. For example, these types of problems will be sent to the district or borough council:</p>
-
-<ul>
- <li>missed bin collection
- <li>graffiti
- <li>street cleaning, including dog fouling and street sweeping
- <li>fly tipping
-</ul>
-
-<p>The following issues should be reported directly to the police:</p>
-
-<ul>
- <li> abandoned vehicles
- <li> anti-social behaviour
- <li> criminal behaviour
-</ul>
-
-<dl>
- <dt><a name="emergencies"></a>Reporting emergencies and out of hours service</dt>
- <dd>
- <p> Please do not report problems which present an immediate risk to life, for example missing manhole covers or a fallen lamp column. </p>
- <p> Issues reported via the website are only actioned during office hours.
- If you require an Out of Hours service please ring 01323 410051
- or see our <a href="http://www.eastsussex.gov.uk/contactus/emergencycontacts.htm">Emergency and out of hours contacts</a> list.
- </p>
-
- </dd>
-
- <dt>How do I report a problem here?</dt>
- <dd>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.</dd>
- <dt>How are the problems solved?</dt>
- <dd>They are reported directly to East Sussex County Council.
- You can also discuss the problem on the website with other customers if you wish.</dd>
-
- <dt>Do you remove silly or illegal content?</dt>
- <dd>East Sussex County Council 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.</dd>
-
- <dt>Can I use FixMyStreet on my mobile?</dt>
- <dd>
- <p>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
- &mdash; for example, you can create a report even when you have no network
- connection.
- <ul>
- <li>
- <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a>
- <li>
- <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a>
- <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
- <a href="http://store.ovi.com/content/107557">Ovi Store</a>.
- </ul>
- </dd>
-
- <dt>Can I use these pages to report problems outside of the East Sussex area?</dd>
- <dd>Yes, if you enter a postcode or address outside the county 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.</dd>
-
- <dt>The site is powered by FixMyStreet, who are they?</dt>
- <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>.
-mySociety is the project of a registered charity which has grown out of the community of
-volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>.
-mySociety&rsquo;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 <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
-or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
-
- <dt>Why does the site use kilometres for measurements?</dt>
- <dd>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!</dd>
-
- <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
- <dd>We want to keep reports locally focused, so we restrict the ability to
- move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all
- the reports you&rsquo;ve made, wherever they are.</dd>
-
- <dt>I&rsquo;d like a site like this for my own location/ where&rsquo;s the "source code" to this site?</dt>
- <dd>
-The mySociety software behind this site is open source, and available
-under the GNU Affero GPL software license. You can <a
-href="http://github.com/mysociety/fixmystreet">download the
-source code</a> and help mySociety develop it.
-You&rsquo;re welcome to use it in your own projects, although you must also
-make available the source code to any such projects.
-<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code
-being used in a Norwegian version of this site.
-</dd>
-
-</dl>
-
- <h2><a name="privacy"></a>Privacy Questions</h2>
-
- <dl>
- <dt>Who gets to see my email address?</dt>
- <dd>
-<p>If you submit a problem, your details, and details of the problem, will be
-submitted to East Sussex County Council, or to the appropriate District Council, 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.</p>
-<p>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.</p>
-</dd>
-
- <dt>What emails will you send to me?</dt>
- <dd>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.</dd>
-
- </dl>
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/eastsussex/around/intro.html b/templates/web/eastsussex/around/intro.html
deleted file mode 100644
index b3f403087..000000000
--- a/templates/web/eastsussex/around/intro.html
+++ /dev/null
@@ -1,4 +0,0 @@
- <h1>Report and view street and road problems </h1>
- <h2>
- (including potholes, broken paving slabs and street lighting)
- </h2>
diff --git a/templates/web/eastsussex/footer.html.template b/templates/web/eastsussex/footer.html.template
deleted file mode 100644
index b5b1a8ac6..000000000
--- a/templates/web/eastsussex/footer.html.template
+++ /dev/null
@@ -1,36 +0,0 @@
- </div> <!-- content -->
- </div> <!-- container -->
- </div>
-
-</div></div></div> <!-- 3 levels of wrapper -->
-
- <div class="nav-wrapper clearfix">
- <div class="main-menu-wrapper">
- <div class="main-menu">
- <ul class="clearfix button-nav" id="mobile-menu">
- <li class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
- >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END
- %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/reports/East+Sussex' %]span[% ELSE %]a href="/reports/East+Sussex"[% END
- %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
- %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
- %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
- [% IF c.user_exists %]
- <li>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </li>
- [% END %]
- </ul>
- </div>
- </div>
- </div>
-</div>
-
-{FooterDesktop}
-
-</body>
-</html>
diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template
deleted file mode 100644
index 2963dc642..000000000
--- a/templates/web/eastsussex/header.html.template
+++ /dev/null
@@ -1,57 +0,0 @@
-{HtmlTag}
-
-<head>
- {MetadataDesktop}
-
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
- [% extra_css %]
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
- <![endif]-->
-
- [% INCLUDE 'common_header_tags.html' %]
- [% extra_js %]
- <script src="[% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script>
-
- [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
- <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
- [% END %]
-
- <title>East Sussex County Council</title>
-</head>
-
-<body id="eastsussex-gov-uk" class="[% bodyclass | html IF bodyclass %]">
-
-<div id="site-header">
- {HeaderDesktop}
-
- <div class="container" id="nav-container">
- <nav id="breadcrumb_breadcrumbTrail">
- <ol class="button-nav application-nav screen">
- <li class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
- >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END
- %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/reports/East+Sussex' %]span[% ELSE %]a href="/reports/East+Sussex"[% END
- %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
- %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
- %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
- %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
- %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
- </ol>
- [% IF c.user_exists %]
- <div class="sign-in large">
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </div>
- [% END %]
- </nav>
- </div>
-</div>
-
-<div class="wrapper" id="wrapper"><div id="wrapper2"><div id="wrapper3">
- <div id="mysociety" role="main" class="body">
- <div class="container">
- [% pre_container_extra %]
- <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
diff --git a/templates/web/eastsussex/report/new/after_category.html b/templates/web/eastsussex/report/new/after_category.html
deleted file mode 100644
index 3d21922cb..000000000
--- a/templates/web/eastsussex/report/new/after_category.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><small>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact us directly using our website <a href="http://www.eastsussex.gov.uk">eastsussex.gov.uk</a>.</small></p>
diff --git a/templates/web/eastsussex/report/new/after_name.html b/templates/web/eastsussex/report/new/after_name.html
deleted file mode 100644
index 8b0fc9816..000000000
--- a/templates/web/eastsussex/report/new/after_name.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <span id="name-public-warning" class="label-warning public-warning name-warning">
- [% loc('public') %]
- </span>
diff --git a/templates/web/eastsussex/report/new/category.html b/templates/web/eastsussex/report/new/category.html
deleted file mode 100644
index 3c2ff4c36..000000000
--- a/templates/web/eastsussex/report/new/category.html
+++ /dev/null
@@ -1,16 +0,0 @@
-[% IF category_options.size ~%]
- [% IF category;
- category = category | lower;
- END; ~%]
- <label for='form_category' id="form_category_label">
- Type
- </label>[% =%]
- <select name='category' id='form_category'>
- [%~ FOREACH cat_op IN category_options ~%]
- [% cat_op_lc = cat_op | lower =%]
- [% IF loop.first; cat_op = '-- Pick a type --'; END ~%]
- <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc || (category_options.size == 2 AND loop.last) ~%]
- >[% IF loop.first %][% cat_op %][% ELSE %][% cat_op | html %][% END %]</option>
- [%~ END =%]
- </select>
-[%~ END ~%]
diff --git a/templates/web/eastsussex/report/public_label.html b/templates/web/eastsussex/report/public_label.html
deleted file mode 100644
index 5c06a86d5..000000000
--- a/templates/web/eastsussex/report/public_label.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="label-warning public-warning">[% loc('public') %]</span>
diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html
deleted file mode 100644
index b2c67890f..000000000
--- a/templates/web/eastsussex/report/update-form.html
+++ /dev/null
@@ -1,220 +0,0 @@
-[% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body) %]
-[% IF allow_creation %]
-
-<script>
- $(function () {
- $('#update_form_content').hide();
- $('#display_update').show();
-
- $('#display_update').click( function () {
- $('#update_form_content').show();
- $('#display_update').hide();
- $('#create_new').hide();
- $('#form_update').focus();
- });
- });
-</script>
-
-<div id="create_new">
- <h2> Create a <strong>new</strong> report near this location </h2>
-
- <p>
- If you've discovered a new, or recurring problem (even if it's similar to the one in this
- report) then :
- </p>
-
- <form method="post" action="/report/new">
- <input type="hidden" name="token" value="[% csrf_token %]">
- <input type="hidden" name="latitude" value="[% problem.latitude %]">
- <input type="hidden" name="longitude" value="[% problem.longitude %]">
- <input type="submit" class="green-btn" value="CREATE A NEW PROBLEM NEARBY">
- </form>
-
- <p><strong>OR...</strong></p>
-</div>
-
-
-<div id="update_form">
- <h2> Discuss <strong>this</strong> report </h2>
-
- <p>
- This allows you to comment on this report, and discuss with local residents.
- </p>
-
- <input type="button" id="display_update" class="green-btn" value="Comment on this report"
- style="display:none">
-
- <div id="update_form_content">
-
- <h2>[% loc( 'Provide an update') %]</h2>
-
- [% IF c.cobrand.moniker != 'stevenage' %]
- <div class="general-notes">
- [% INCLUDE 'report/updates-sidebar-notes.html' %]
- </div>
- [% END %]
-
- [% INCLUDE 'errors.html' %]
-
- <form method="post" action="[% c.uri_for( '/report/update' ) %]" id="form_update_form" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]>
- <input type="hidden" name="token" value="[% csrf_token %]">
- <fieldset>
- <input type="hidden" name="submit_update" value="1">
- <input type="hidden" name="id" value="[% problem.id | html %]">
-
- [% IF c.cobrand.allow_photo_upload %]
- <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
- <label for="form_photo">[% loc('Photo') %]</label>
-
- [% IF field_errors.photo %]
- <p class='form-error'>[% field_errors.photo %]</p>
- [% END %]
-
- <div id="form_photos">
- [% IF upload_fileid %]
- <p>[% loc('You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
- [% FOREACH id IN upload_fileid.split(',') %]
- <img align="right" src="/photo/temp.[% id %]" alt="">
- [% END %]
- [% END %]
- <input type="file" name="photo1" id="form_photo">
- <label for="form_photo2">[% loc('Photo') %]</label>
- <input type="file" name="photo2" id="form_photo2">
- <label for="form_photo3">[% loc('Photo') %]</label>
- <input type="file" name="photo3" id="form_photo3">
- </div>
- [% END %]
-
- <label for="form_update">[% loc( 'Update:' ) %]
- <span class="label-warning public-warning">
- [% loc('public') %]
- </span>
- </label>
- [% IF field_errors.update %]
- <div class='form-error'>[% field_errors.update %]</div>
- [% END %]
- <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
-
- [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
- <label for="form_state">[% loc( 'State' ) %]</label>
- <select name="state" id="form_state">
- [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
- loc('Investigating')], ['action scheduled', loc('Action Scheduled')],
- ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')],
- ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')],
- ['fixed', loc('Fixed')] ] %]
- <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option>
- [% END %]
- </select>
- [% ELSE %]
- [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %]
-
- <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]>
- <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label>
-
- [% ELSIF !problem.is_fixed %]
-
- <div class="checkbox-group">
- <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]>
- <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label>
- </div>
-
- [% END %]
- [% END %]
-
- [% IF c.user_exists %]
-
- [% INCLUDE name %]
-
- <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]">
-
-
- [% ELSE %]
-
- <label for="form_rznvy">[% loc('Your email' ) %]
- <span class="muted">([% loc('We never show your email') %])</span>
- </label>
- [% IF field_errors.email %]
- <p class='form-error'>[% field_errors.email %]</p>
- [% END %]
- <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required>
-
- <div id="form_sign_in">
- <h3>[% loc("Now to submit your update&hellip;") %]</h3>
- <h2>[% loc("Do you have a FixMyStreet password?") %]</h2>
-
- <div id="form_sign_in_yes" class="form-box">
- <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
-
- <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
- [% IF field_errors.password %]
- <p class='form-error'>[% field_errors.password %]</p>
- [% END %]
- <div class="form-txt-submit-box">
- <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
- <input class="green-btn" type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]">
- </div>
-
- <div class="checkbox-group">
- <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
- </div>
-
- <div class="general-notes">
- <p><strong>[% loc('Forgotten your password?') %]</strong>
- [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
- </div>
-
- </div>
- <div id="form_sign_in_no" class="form-box">
- <h5>[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5>
-
- [% INCLUDE name %]
-
- <label for="password_register">[% loc('Password (optional)') %]</label>
-
- <div class="general-notes">
- <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
- </div>
-
- <div class="form-txt-submit-box">
- <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
- <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]">
- </div>
-
- </div>
- </div>
-
- [% END %]
- </fieldset>
- </form>
- </div> <!-- update_form_content -->
-</div>
-[% END %]
-
-[% BLOCK name %]
- [% INCLUDE 'report/new/extra_name.html' %]
-
- [% name_public = update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %]
- <label for="form_name">[% loc('Name') %]
- <span id="name-public-warning" class="label-warning public-warning name-warning">
- [% loc('public') %]
- </span>
- </label>
-
- [% IF field_errors.name %]
- <p class='form-error'>[% field_errors.name %]</p>
- [% END %]
-
-
- <input type="text" [% IF problem.bodies_str == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]">
-
- <div class="checkbox-group">
- <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
- <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
- </div>
- <div class="checkbox-group">
- <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]>
- <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label>
- </div>
-[% END %]
diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index 45871305c..b78d5d708 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -101,7 +101,7 @@
<div class="fixed-container">
<div class="section-content">
<h2>Who's using FixMyStreet for councils?</h2>
- <p>Our UK client councils include <a href="https://fix.angus.gov.uk/">Angus</a>, <a href="https://fixmystreet.bristol.gov.uk/">Bristol</a>, <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://harrogate.fixmystreet.com/">Harrogate</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="https://fixmystreet.eastherts.gov.uk/">East Herts Council</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</p>
+ <p>Our UK client councils include <a href="https://fix.angus.gov.uk/">Angus</a>, <a href="https://fixmystreet.bristol.gov.uk/">Bristol</a>, <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://harrogate.fixmystreet.com/">Harrogate</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="https://fixmystreet.eastherts.gov.uk/">East Herts Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and <a href="http://warwickshire.fixmystreet.com/">Warwickshire County Council</a>.</p>
<p>FixMyStreet for Councils is also in use outside the UK, in the city of <a href="https://www.zueriwieneu.ch/">Zurich</a>, Switzerland.</p>
<h3>Case studies</h3>
<p>For the insider view, and to understand the integration process, read these councils’ stories.</p>
@@ -122,7 +122,6 @@
--><a href="http://hart.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!--
--><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!--
--><a href="https://www.zueriwieneu.ch/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!--
- --><a href="http://eastsussex.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!--
--><a href="https://fix.angus.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a>
</div>
diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html
index d5aee674c..6fa067d1c 100755
--- a/templates/web/fixmystreet.com/reports/_extras.html
+++ b/templates/web/fixmystreet.com/reports/_extras.html
@@ -4,7 +4,6 @@
'Bromley Council' = 'fix.bromley.gov.uk'
'Bristol City Council' = 'fixmystreet.bristol.gov.uk'
'East Hertfordshire District Council' = 'fixmystreet.eastherts.gov.uk'
- 'East Sussex County Council' = 'eastsussex.fixmystreet.com'
'Harrogate Borough Council' = 'harrogate.fixmystreet.com'
'Hart District Council' = 'hart.fixmystreet.com'
'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk'
diff --git a/web/cobrands/eastsussex/_colours.scss b/web/cobrands/eastsussex/_colours.scss
deleted file mode 100644
index c24c6e688..000000000
--- a/web/cobrands/eastsussex/_colours.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-/* COLOURS */
-
-$eastsussex_dark: #194C7E;
-$eastsussex_primary: #155F91;
-
-$primary: $eastsussex_primary;
-$col_click_map: $eastsussex_primary;
-$col_fixed_label_dark: $eastsussex_primary;
-$col_fixed_label: $eastsussex_primary;
-
-$primary_b: #000000;
-$primary_text: #ffffff;
-
-$base_bg: #ffffff;
-$base_fg: #1a1a1a;
-
-/* Unused here */
-$map_nav_bg: #222;
-$nav_fg: #fff;
-$nav_fg_hover: #444;
diff --git a/web/cobrands/eastsussex/base.scss b/web/cobrands/eastsussex/base.scss
deleted file mode 100644
index d855e67a4..000000000
--- a/web/cobrands/eastsussex/base.scss
+++ /dev/null
@@ -1,229 +0,0 @@
-@import "../sass/h5bp";
-@import "./_colours";
-@import "../sass/mixins";
-
-$heading-font: Arial, "Helvetica Neue", Helvetica, sans-serif !default;
-
-@import "../sass/base";
-
-body {
- font-size: 13px;
-}
-
-footer {
- background: #00a1de;
- display: none;
-}
-
-.content {
- padding: 0 1em;
-}
-
-a, a:visited {
- color: #369;
- &:hover, &:active {
- color: #369;
- }
-}
-
-.item-list--reports__item {
- color: #666;
- a {
- color: #666;
- }
-}
-
-h1.main {
- color: $primary;
- text-align: center;
- margin: 0.5em 0;
-}
-
-#site-header {
- position: relative;
- background: #fff;
- height: auto;
- .container {
- padding: 0;
- }
-}
-#site-header .eastsussex .header {
- margin: 0 0 2px;
-}
-
-// Make the navigation bar thinner on the map page so that it takes up less
-// room and doesn't push the map too far down.
-.mappage .application-nav {
- padding: 4.5px 9px;
-}
-
-// Colour tab to match colour scheme
-#nav-link {
- width: 50px;
- height: 48px;
-}
-
-#report-cta {
- top: 24px; // height of header
- margin-top: -0.7em;
- font-size: 1em;
- border-color: mix(#fff, $primary, 20%);
-
- &:hover, &:focus {
- background-color: mix(#fff, $primary, 10%);
- }
-}
-
-#breadcrumb_breadcrumbTrail ol li {
- list-style: none;
-}
-
-.big-green-banner {
- text-transform: none;
- z-index: 5000;
-}
-
-.green-btn, input.green-btn, input.green-btn:hover {
- background: #44697d;
- border: lighten(#44697d, 10%);
- font-weight: bold;
- font-size: 1.1em;
-}
-
-#form_sign_in {
- margin-top: 1em;
-}
-
-#front-main {
- #front-main-container {
- text-align: center;
- }
-
- #postcodeForm {
- padding: 1em;
-
- label {
- text-align: center;
- }
-
- div {
- padding-top: 0px;
- input#sub {
- height: 100%;
- }
- }
- }
-}
-
-.frontpage #mysociety #front-main-container {
- h1, h2 {
- text-align: center;
- }
-}
-
-
-body > p {
- margin: 0;
-}
-
-.main-menu ul {
- padding: 0;
- margin: 6px;
- text-align: center;
-
- li {
- display: inline-block;
- list-style: none;
-
- a, span {
- padding: 2px 6px;
- margin: 3px;
- border-radius: 3px;
- }
-
- a, a:hover {
- background-color: #00a1de;
- color: white;
- }
-
- span {
- background-color: #00a1de;
- color: white;
- }
- }
-}
-
-.footer .languages ul {
-
- li {
- display: inline-block;
- float: none !important;
- }
-}
-
-button, input[type=submit], .btn {
- text-transform: none;
-}
-
-/* as per email from Matt Tooke, we are using ESCC's .button-nav
-styling, but this doesn't dtrt with span, so adding ourselves */
-
-.button-nav span,
-.main-menu ul.button-nav li span {
- float: left;
- display: block;
- margin: 5px 2px 5px 0;
- padding: 4px 10px;
- background: #00a1de;
- color: #fff;
- font-weight: bold;
- text-decoration: none;
- white-space: nowrap;
- border-radius: 3px;
- border: 0;
-}
-
-.email {
- background-image: none;
-}
-
-::-webkit-input-placeholder {
- font-style: normal;
-}
-:-moz-placeholder {
- font-style: normal;
-}
-:-ms-placeholder {
- font-style: normal;
-}
-.placeholder {
- font-style: normal;
-}
-
-
-#geolocate_link {
- font-size: 1.0em;
-}
-
-.ie7 {
- body {
- z-index: 1;
- }
- #site-header {
- z-index: 1;
- }
-}
-
-.label-warning {
- background: lighten(#ff3300, 20%);
- color: white;
- font-size: 90%;
- padding: 2px;
- cursor: default;
-}
-
-// Stop the big green banner (it's not even green) at the top of map pages
-// overriding the header in the z-index
-.big-green-banner {
- z-index: auto;
-}
diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss
deleted file mode 100644
index cf13bd1d2..000000000
--- a/web/cobrands/eastsussex/layout.scss
+++ /dev/null
@@ -1,211 +0,0 @@
-$mappage-header-height: 16em;
-
-@import "_colours";
-@import "../sass/layout";
-
-#front-main {
- // Undo the top margin added in base.scss
- margin-top: 0;
- padding: 0
-}
-
-#front-main-container {
- background-color: $eastsussex_primary;
- padding: 1em;
-}
-
-.container, .eastsussex-container {
- width: 100%;
- max-width: 966px;
-}
-
-#menu {
- height: 55px;
-}
-
-footer {
- position: relative;
- z-index: 1000;
- margin-top: 0;
- background: #aee1f4;
-
- a {
- text-decoration: underline;
- }
-
- h2 {
- margin: 0;
- }
-
- form.newsletter.form {
- input#newsletter {
- display: inline-block;
- }
-
- input[type=submit] {
- background: #1e5b83;
- text-transform: none;
- }
-
- label {
- font-weight: normal;
- }
- }
-}
-
-
-div.form-error, p.form-error {
- display: block !important;
-}
-
-body.mappage {
- .main-menu-wrapper {
- position: fixed
- }
-
- footer {
- display: none;
- }
-
- #mysociety {
- margin-top: 0;
- padding-top: 16em;
- padding-bottom: 0;
- width: auto;
- background: transparent;
- float: none;
- }
-
- #wrapper {
- display: block;
- width: auto;
- }
-
- #site-header {
- position: fixed; // Keep the headers fixed at the top on the map page
- width: 100%;
- z-index: 2;
- background: #dae1e5; // the same colour that the .application-nav normally is
- }
-
- .application-nav {
- background: transparent;
- padding: 0.2em 0 0 0;
- }
-}
-
-.general-notes {
- font-size: 13px;
- line-height: 14px;
-}
-
-body.twothirdswidthpage .content .sticky-sidebar aside {
- top: 0;
- position: absolute;
-}
-
-body.frontpage {
- #site-header {
- height: auto;
-
- .mobile-header-nav {
- display: none;
- }
- }
-}
-
-#site-header {
- border-top-width: 0;
- margin-top: 0;
- background: rgb(3, 160, 227);
-
- .container {
- position: relative;
- }
-
- #nav-container.container {
- min-height: 0;
- }
-
- #breadcrumb_breadcrumbTrail {
- position: relative;
-
- a {
- color: white;
- }
-
-
- .breadcrumb {
- margin: 9px 0 6px 0;
-
- span {
- font-weight: bold;
- }
-
- li.level1 a {
- color: #194c7e;
- }
- }
-
- .sign-in {
- position: absolute;
- top: 4px;
- right: 4px;
- }
- }
-
- .header {
- a.contact {
- text-decoration: underline;
- }
-
- .alphabet h2 {
- font-size: 1em;
- font-weight: bold;
- }
- }
-}
-
-#mysociety {
- margin-top: 0;
- padding-bottom: 24px;
-
- .container {
- padding: 0;
- }
-}
-
-.content {
- margin-top: 0;
- width: auto;
-}
-
-.banner p#fixed {
- background-position: -328px -333px;
-}
-
-#skipped-map {
- clear: both;
- margin-top: 3em; /* required to push "Your Reports" visible on Safari/IE */
-}
-
-.main-menu-wrapper {
- display: none;
-}
-
-
-
-@media only screen and (max-width: 61em) {
- #site-header {
- height: auto;
- }
-
- body.twothirdswidthpage .content .sticky-sidebar {
- top: 1em;
- }
-}
-
-footer {
- display: block;
-}
-
diff --git a/web/cobrands/eastsussex/report-form.js b/web/cobrands/eastsussex/report-form.js
deleted file mode 100644
index e61d48b9a..000000000
--- a/web/cobrands/eastsussex/report-form.js
+++ /dev/null
@@ -1,22 +0,0 @@
-function setup_anonymous_checkbox (div) {
- var label = div.find( '.name-warning' );
- checkbox = div.find('input[type=checkbox]');
-
- checkbox.change( function () {
- var v = $(this).attr('checked');
- if (v) {
- label.show();
- }
- else {
- label.hide();
- }
- });
-}
-
-$(function () {
- setup_anonymous_checkbox( $('#form_sign_in_no') );
- setup_anonymous_checkbox( $('#form-box--logged-in-name') );
- setup_anonymous_checkbox( $('#update_form') );
-
- $('.public-warning').attr({ 'title': 'This information will be be visible to the public on the report' });
-});
diff --git a/web/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png b/web/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png
deleted file mode 100644
index e87c89668..000000000
--- a/web/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png
+++ /dev/null
Binary files differ