diff options
author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-31 14:23:02 +0100 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-31 14:23:02 +0100 |
commit | ed850c6d928acfa6898d67a9220b00ade64b45ea (patch) | |
tree | 33e94f379b1c60dcdfe35afe4d5d9f53ac1b591f | |
parent | 3d967f09d8171b283c9a90afa6407dc033e4ae42 (diff) |
[SeeSomething] Remove cobrand.
27 files changed, 2 insertions, 811 deletions
diff --git a/.gitignore b/.gitignore index 0885b0361..fc1d063c6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ FixMyBarangay.po /web/css/main.css /web/cobrands/*/*.css /web/cobrands/*/*.css.map -/web/cobrands/seesomething *.auto.min.js # Photo upload cache diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 87a4191af..d37e0b39c 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -1484,7 +1484,7 @@ sub stats : Path('stats') : Args(0) { $selected_body = $c->user->from_body->id; } - if ( $c->cobrand->moniker eq 'seesomething' || $c->cobrand->moniker eq 'zurich' ) { + if ( $c->cobrand->moniker eq 'zurich' ) { return $c->cobrand->admin_stats(); } diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm deleted file mode 100644 index 4d4dd000e..000000000 --- a/perllib/FixMyStreet/Cobrand/SeeSomething.pm +++ /dev/null @@ -1,135 +0,0 @@ -package FixMyStreet::Cobrand::SeeSomething; -use parent 'FixMyStreet::Cobrand::UKCouncils'; - -use strict; -use warnings; - -sub council_id { return [ 2520, 2522, 2514, 2546, 2519, 2538, 2535 ]; } -sub council_area { return 'West Midlands'; } -sub council_name { return 'See Something Say Something'; } -sub council_url { return 'seesomething'; } -sub area_types { [ 'MTD' ] } - -sub area_check { - my ( $self, $params, $context ) = @_; - - my $councils = $params->{all_areas}; - my $council_match = grep { $councils->{$_} } @{ $self->council_id }; - - if ($council_match) { - return 1; - } - - return ( 0, "That location is not covered by See Something, Say Something" ); -} - -sub disambiguate_location { - my $self = shift; - my $string = shift; - - my $town = 'West Midlands'; - - return { - %{ $self->SUPER::disambiguate_location() }, - town => $town, - centre => '52.4803101685267,-2.2708272758854', - span => '1.4002794815887,2.06340043925997', - bounds => [ 51.8259444771676, -3.23554082684068, 53.2262239587563, -1.17214038758071 ], - }; -} - -sub example_places { - return ( 'WS1 4NH', 'Austin Drive, Coventry' ); -} - -sub send_questionnaires { - return 0; -} - -sub ask_ever_reported { - return 0; -} - -sub report_sent_confirmation_email { 1; } - -sub report_check_for_errors { return (); } - -sub never_confirm_reports { 1; } - -sub allow_anonymous_reports { 1; } - -sub anonymous_account { return { name => 'Anonymous Submission', email => FixMyStreet->config('DO_NOT_REPLY_EMAIL') }; } - -sub admin_allow_user { - my ( $self, $user ) = @_; - return 1 if ( $user->from_body || $user->is_superuser ); -} - -sub admin_pages { - my $self = shift; - - return { - 'stats' => ['Reports', 0], - }; -}; - -sub admin_stats { - my $self = shift; - my $c = $self->{c}; - - my %filters = (); - - # XXX The below lookup assumes a body ID === MapIt area ID - my %councils = - map { - my $name = $_->name; - $name =~ s/(?:Borough|City) Council//; - ($_->id => $name); - } - $c->model('DB::Body')->search({ id => $self->council_id }); - - $c->stash->{council_details} = \%councils; - - if ( !$c->user_exists || !grep { $_ == $c->user->from_body->id } @{ $self->council_id } ) { - $c->detach( '/page_error_404_not_found' ); - } - - if ( $c->get_param('category') ) { - $filters{category} = $c->get_param('category'); - $c->stash->{category} = $c->get_param('category'); - } - - if ( $c->get_param('subcategory') ) { - $filters{subcategory} = $c->get_param('subcategory'); - $c->stash->{subcategory} = $c->get_param('subcategory'); - } - - if ( $c->get_param('service') ) { - $filters{service} = { -ilike => $c->get_param('service') }; - $c->stash->{service} = $c->get_param('service'); - } - - my $page = $c->get_param('p') || 1; - - my $p = $c->model('DB::Problem')->search( - { - confirmed => { not => undef }, - %filters - }, - { - columns => [ qw( - service category subcategory confirmed bodies_str - ) ], - order_by => { -desc=> [ 'confirmed' ] }, - rows => 20, - } - )->page( $page ); - - $c->stash->{reports} = $p; - $c->stash->{pager} = $p->pager; - - return 1; -} - -1; - diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm index 9abccf510..28f3411d0 100644 --- a/perllib/FixMyStreet/SendReport/Email.pm +++ b/perllib/FixMyStreet/SendReport/Email.pm @@ -29,13 +29,6 @@ sub build_recipient_list { $self->unconfirmed_notes->{$body_email}{$row->category} = $note; } - my $body_name = $body->name; - # see something uses council areas but doesn't send to councils so just use a - # generic name here to minimise confusion - if ( $row->cobrand eq 'seesomething' ) { - $body_name = 'See Something, Say Something'; - } - my @emails; # allow multiple emails per contact if ( $body_email =~ /,/ ) { @@ -44,7 +37,7 @@ sub build_recipient_list { @emails = ( $body_email ); } for my $email ( @emails ) { - push @{ $self->to }, [ $email, $body_name ]; + push @{ $self->to }, [ $email, $body->name ]; } } diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index fd3108438..71090cd26 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -1363,121 +1363,6 @@ subtest "test Hart" => sub { } }; -subtest "test SeeSomething" => sub { - $mech->host('seesomething.fixmystreet.com'); - $mech->clear_emails_ok; - $mech->log_out_ok; - - my $cobrand = FixMyStreet::Cobrand::SeeSomething->new(); - - my $body_ss = $mech->create_body_ok(2535, 'Sandwell Borough Council', id => 2535); - my $bus_contact = $mech->create_contact_ok( - body_id => $body_ss->id, - category => 'Bus', - email => 'bus@example.com', - non_public => 1, - ); - - for my $test ( { - desc => 'report with no user details works', - pc => 'WS1 4NH', - fields => { - detail => 'Test report details', - category => 'Bus', - subcategory => 'Smoking', - }, - email => $cobrand->anonymous_account->{email}, - }, - { - desc => 'report with user details works', - pc => 'WS1 4NH', - fields => { - detail => 'Test report details', - category => 'Bus', - subcategory => 'Smoking', - email => 'non_anon_user@example.com', - name => 'Non Anon', - }, - email => 'non_anon_user@example.com', - }, - { - desc => 'report with public category', - pc => 'WS1 4NH', - fields => { - detail => 'Test report details', - category => 'Bus', - subcategory => 'Smoking', - }, - email => $cobrand->anonymous_account->{email}, - public => 1, - } - ) { - subtest $test->{desc} => sub { - $mech->clear_emails_ok; - my $user = - FixMyStreet::App->model('DB::User')->find( { email => $test->{email} } ); - - if ( $user ) { - $user->alerts->delete; - $user->problems->delete; - $user->delete; - } - - if ( $test->{public} ) { - $bus_contact->non_public(0); - $bus_contact->update; - } else { - $bus_contact->non_public(1); - $bus_contact->update; - } - - $mech->get_ok( '/around' ); - FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'seesomething' ], - MAPIT_URL => 'http://mapit.uk/', - }, sub { - $mech->submit_form_ok( - { - with_fields => { - pc => $test->{pc}, - }, - }, - 'submit around form', - ); - $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); - - $mech->submit_form_ok( - { - with_fields => $test->{fields}, - }, - 'Submit form details with no user details', - ); - }; - is_deeply $mech->page_errors, [], "check there were no errors"; - - $user = - FixMyStreet::App->model('DB::User')->find( { email => $test->{email} } ); - ok $user, "user found"; - - my $report = $user->problems->first; - ok $report, "Found the report"; - - $mech->email_count_is(0); - - ok $report->confirmed, 'Report is confirmed automatically'; - - is $mech->uri->path, '/report/new', 'stays on report/new page'; - $mech->content_contains( 'Your report has been sent', 'use report created template' ); - - $user->alerts->delete; - $user->problems->delete; - $user->delete; - }; - } - - $bus_contact->delete; -}; - subtest "categories from deleted bodies shouldn't be visible for new reports" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], diff --git a/t/cobrand/seesomething.t b/t/cobrand/seesomething.t deleted file mode 100644 index 4da1c9c6e..000000000 --- a/t/cobrand/seesomething.t +++ /dev/null @@ -1,87 +0,0 @@ -use strict; -use warnings; -use DateTime; -use Test::More; - -use FixMyStreet; -use FixMyStreet::TestMech; - -my $EMAIL = 'seesomething@example.com'; - -my $mech = FixMyStreet::TestMech->new; -my $db = FixMyStreet::DB->storage->schema; -my $dt_parser = $db->storage->datetime_parser; - -$db->txn_begin; - -$db->resultset('Comment')->delete; -$db->resultset('Problem')->delete; - -my $user = $mech->create_user_ok( $EMAIL ); - -my $body = $mech->create_body_ok( 2520, 'Coventry City Council', id => 2520 ); -$mech->create_body_ok( 2522, 'Dudley Borough Council' ); -$mech->create_body_ok( 2514, 'Birmingham City Council' ); -$mech->create_body_ok( 2546, 'Walsall Borough Council' ); -$mech->create_body_ok( 2519, 'Wolverhampton City Council' ); -$mech->create_body_ok( 2538, 'Solihull Borough Council' ); -$mech->create_body_ok( 2535, 'Sandwell Borough Council' ); - -$user->update({ from_body => $body }); - -my $date = $dt_parser->format_datetime(DateTime->now); - -my $report = FixMyStreet::DB->resultset('Problem')->find_or_create( { - postcode => 'EH1 1BB', - bodies_str => '2520', - areas => ',2520,', - service => 'Android', - category => 'Bus', - subcategory => 'Loud Music', - title => 'Loud Music', - detail => 'Loud Music', - used_map => 1, - name => 'SeeSomething Test User', - anonymous => 0, - state => 'confirmed', - confirmed => $date, - lang => 'en-gb', - cobrand => 'default', - cobrand_data => '', - send_questionnaire => 1, - latitude => '52.4081', - longitude => '-1.5106', - user_id => $user->id, -} ); - -subtest 'admin/stats' => sub { - FixMyStreet::override_config { - ALLOWED_COBRANDS => [ 'seesomething' ], - }, sub { - my $user = $mech->log_in_ok( $EMAIL ); - - $mech->get( '/admin/stats' ); - if (ok $mech->success) { - - $date =~s/ / /; - $date =~s/\+0000//; - my $xml = <<EOXML; - <tr> - <td>Android</td> - <td>Bus</td> - <td class="nowrap">Loud Music</td> - <td class="nowrap">Coventry </td> - <td class="nowrap">$date</td> - </tr> -EOXML - $mech->content_contains($xml); - } - else { - diag $mech->content; - diag $mech->status; - }; - } -}; - -$db->txn_rollback; -done_testing; diff --git a/templates/web/seesomething/admin/footer.html b/templates/web/seesomething/admin/footer.html deleted file mode 100644 index bdd42e2e4..000000000 --- a/templates/web/seesomething/admin/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> -<!-- [% INCLUDE 'debug_footer.html' %] --> - </div> <!-- .wrapper --> -</body> -</html> diff --git a/templates/web/seesomething/admin/header.html b/templates/web/seesomething/admin/header.html deleted file mode 100644 index 40bea25bf..000000000 --- a/templates/web/seesomething/admin/header.html +++ /dev/null @@ -1,2 +0,0 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'admin fullwidthpage' %] - <h1>[% title %]</h1> diff --git a/templates/web/seesomething/admin/stats.html b/templates/web/seesomething/admin/stats.html deleted file mode 100644 index 155bff472..000000000 --- a/templates/web/seesomething/admin/stats.html +++ /dev/null @@ -1,63 +0,0 @@ -[% INCLUDE 'admin/header.html' title=loc('Reports') %] -[% PROCESS 'admin/report_blocks.html' %] - -[% BLOCK options %] - [% FOR option IN option_list %] - <option value="[% option %]"[% ' selected' IF selected == option %]>[% option %]</opytion> - [% END %] -[% END %] - -<form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="filter-form"> - <label for="form_category">Transport Type: </label> - <select class="form-control" name="category" id="form_category"> - <option value="">Select</option> - [% PROCESS options, option_list = [ 'Bus', 'Metro', 'Train' ], selected = category %] - </select> - - <label for="form_subcategory">Incident Type: </label> - <select class="form-control" name="subcategory" id="form_subcategory"> - <option value="">Select</option> - [% PROCESS options, option_list = ['Smoking', 'Drugs', 'Anti-social Behaviour', 'Loud Music', 'Damage', 'Feet on Seats', 'Other'], selected = subcategory %] - </select> - - <label for="form_service">Device: </label> - <select class="form-control" name="service" id="form_service"> - <option value="">Select</option> - [% PROCESS options, option_list = [ 'Android', 'iPhone' ], selected = service %] - </select> - - <input type="submit" class="btn" name="getcounts" size="30" id="getcounts" value="Look Up" /> -</form> - -[% IF pager.total_entries == 0 %] -<p align="center"> -No Results found -</p> -[% ELSE %] -<table class="admin-report"> - <thead> - <tr> - <th>Device</th> - <th>Transport Category</th> - <th>Incident Category</th> - <th>Area</th> - <th>Submitted</th> - </tr> - </thead> - <tbody> - [%- WHILE (report = reports.next) %] - <tr> - <td>[% report.service || 'Other' %]</td> - <td>[% report.category %]</td> - <td class="nowrap">[% report.subcategory %]</td> - <td class="nowrap">[% council_details.${report.bodies_str} %]</td> - <td class="nowrap">[% PROCESS format_time time=report.confirmed %]</td> - </tr> - [%- END %] - </tbody> -</table> -[% END %] - -[% INCLUDE 'pagination.html', param = 'p' %] - -[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html deleted file mode 100644 index 7886c3a5d..000000000 --- a/templates/web/seesomething/around/display_location.html +++ /dev/null @@ -1,52 +0,0 @@ -[% - - url_skip = c.uri_for( - '/report/new', - { - pc => pc - latitude => latitude, - longitude => longitude, - skipped => 1, - } - ); - - PROCESS "maps/${map.type}.html"; - sidebar_html = PROCESS 'report/new/sidebar.html', js = 1, report.used_map = 1; - - INCLUDE 'header.html', - title => loc('Viewing a location') - bodyclass => 'mappage', - robots => 'noindex,nofollow'; - -%] - -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate" novalidate> - <input type="hidden" name="token" value="[% csrf_token %]"> - [% IF c.req.params.map_override %] - <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> - [% END %] - <input type="hidden" name="pc" value="[% pc | html %]"> - - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> - - [% map_html %] - </div> - - <div id="map_sidebar"> - <div id="side"> - [% INCLUDE 'around/_report_banner.html' %] - </div> - - <div style="display:none" id="side-form"> - [% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 - report.name = c.user.name - %] - </div> - </div> - -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/around/index.html b/templates/web/seesomething/around/index.html deleted file mode 100644 index a143e90a2..000000000 --- a/templates/web/seesomething/around/index.html +++ /dev/null @@ -1,24 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %] - -<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> - <div id="side-form"> - <div id="report-a-problem-main"> - [% INCLUDE 'around/postcode_form.html' %] - - [% IF location_error %] - <p class="error">[% location_error %]</p> - [% END %] - - [% IF possible_location_matches %] - <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> - <ul class="pc_alternatives"> - [% FOREACH match IN possible_location_matches %] - <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> - [% END %] - </ul> - [% END %] - </div> - </div> -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/around/postcode_form.html b/templates/web/seesomething/around/postcode_form.html deleted file mode 100644 index 56fcdca97..000000000 --- a/templates/web/seesomething/around/postcode_form.html +++ /dev/null @@ -1,17 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - [% - question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); - %] - - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </div> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - </div> -</div> diff --git a/templates/web/seesomething/auth/general.html b/templates/web/seesomething/auth/general.html deleted file mode 100644 index 09639d15b..000000000 --- a/templates/web/seesomething/auth/general.html +++ /dev/null @@ -1,46 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] - -<h1>[% loc('Sign in') %]</h1> - -<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> - <fieldset> - <input type="hidden" name="r" value="[% c.req.params.r | html %]"> - - [% IF email_error; - - # other keys include fqdn, mxcheck if you'd like to write a custom error message - - errors = { - missing => loc('Please enter your email'), - other => loc('Please check your email address is correct') - }; - - loc_email_error = errors.$email_error || errors.other; - END %] - <label class="n" for="email">[% loc('Email') %]</label> - [% IF loc_email_error %] - <div class="form-error">[% loc_email_error %]</div> - [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> - [% END %] - <input type="email" class="form-control required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> - - <div class="form-txt-submit-box"> - <label class="n" for="password_sign_in">Password</label> - <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> - </div> - - <div class="form-txt-submit-box"> - <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="form-txt-submit-box"> - <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> - </div> - - </fieldset> -</form> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/auth/sign_out.html b/templates/web/seesomething/auth/sign_out.html deleted file mode 100644 index ef1d11b58..000000000 --- a/templates/web/seesomething/auth/sign_out.html +++ /dev/null @@ -1,7 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] - -<h1>[% loc('You have been signed out') %]</h1> - -<p>Please feel free to <a href="[% c.uri_for('/auth', { r => 'admin/stats' } ) %]">sign in again</a></p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/footer.html b/templates/web/seesomething/footer.html deleted file mode 100644 index 6fd0f42b2..000000000 --- a/templates/web/seesomething/footer.html +++ /dev/null @@ -1,15 +0,0 @@ - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> - - <div class="nav-wrapper"> - <div class="nav-wrapper-2"> - [% INCLUDE "main_nav.html" hide_mysoc_link=1 %] - </div> - </div> - </div> <!-- .wrapper --> - - [% INCLUDE 'common_footer_tags.html' %] - -</body> -</html> diff --git a/templates/web/seesomething/front/stats.html b/templates/web/seesomething/front/stats.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/seesomething/front/stats.html +++ /dev/null diff --git a/templates/web/seesomething/front/tips.html b/templates/web/seesomething/front/tips.html deleted file mode 100644 index 9043ee4bd..000000000 --- a/templates/web/seesomething/front/tips.html +++ /dev/null @@ -1,5 +0,0 @@ - <p> - If you are unsure about where the incident took place as you were on a - moving train or bus, then use the location of the start of your journey - and mention which bus or train you were on in your report. - </p> diff --git a/templates/web/seesomething/header_extra.html b/templates/web/seesomething/header_extra.html deleted file mode 100644 index 839e03dbe..000000000 --- a/templates/web/seesomething/header_extra.html +++ /dev/null @@ -1 +0,0 @@ -<script src="[% version('/cobrands/seesomething/validation_rules.js') %]"></script> diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html deleted file mode 100644 index 40780fba4..000000000 --- a/templates/web/seesomething/index.html +++ /dev/null @@ -1,42 +0,0 @@ -[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %] - -[% PROCESS "maps/fms.html" %] -[% INCLUDE 'header.html', title = '', bodyclass = 'mappage' %] - -<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm"> -<script type="text/javascript"> -var fixmystreet = fixmystreet || {}; -$.extend(fixmystreet, { - 'latitude': 52.505241, - 'longitude': -1.815285, - 'zoom': 3, - 'numZoomLevels': 5, - 'zoomOffset': 13, - 'map_type': "" -}); -</script> -<div id="map_box"> - <div id="map"></div> - </div> - - <div id="side-form"> - <div id="report-a-problem-main"> - [% form = PROCESS 'around/postcode_form.html' %] - [% form %] - - [% IF error %] - <p class="form-error">[% error %]</p> - [% END %] - - <div class="tablewrapper"> - <div id="front-howto"> - [% INCLUDE 'index-steps.html' %] - </div> - - </div> - - </div> - </div> -</form> - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/seesomething/js/translation_strings.html b/templates/web/seesomething/js/translation_strings.html deleted file mode 100644 index 0ae40bf97..000000000 --- a/templates/web/seesomething/js/translation_strings.html +++ /dev/null @@ -1,15 +0,0 @@ - translation_strings = { - detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', - name: { - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' - }, - category: '[% loc('Please choose a transport category') | replace("'", "\\'") %]', - subcategory: '[% loc('Please choose an incident category') | replace("'", "\\'") %]', - rznvy: { - required: '[% loc('Please enter your email') | replace("'", "\\'") %]', - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - }, - email: { - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - } - }; diff --git a/templates/web/seesomething/main_nav_items.html b/templates/web/seesomething/main_nav_items.html deleted file mode 100644 index 0bfb9576a..000000000 --- a/templates/web/seesomething/main_nav_items.html +++ /dev/null @@ -1,3 +0,0 @@ -[%~ PROCESS navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%] - -[%~ PROCESS navitem uri='/faq' label=loc('Help') ~%] diff --git a/templates/web/seesomething/report/display.html b/templates/web/seesomething/report/display.html deleted file mode 100644 index 93b0048a2..000000000 --- a/templates/web/seesomething/report/display.html +++ /dev/null @@ -1,9 +0,0 @@ -[% - INCLUDE 'header.html' - robots = 'index, nofollow', - bobyclass = 'mappage'; -%] - -Reports to this site are private - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html deleted file mode 100644 index f18d4fd02..000000000 --- a/templates/web/seesomething/report/new/category.html +++ /dev/null @@ -1,15 +0,0 @@ -[% IF category_options.size ~%] - [% IF category; - category = category | lower; - END; ~%] - <label for='form_category' class="select"> - [%~ loc('Category') ~%] - </label>[% =%] - <select name='category' data-theme="c" id='form_category' class="form-control"> - [%~ FOREACH cat_op IN category_options ~%] - [% cat_op_lc = cat_op | lower =%] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc ~%] - >[% cat_op | html %]</option> - [%~ END =%] - </select> -[%~ END ~%] diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html deleted file mode 100644 index 21b51384b..000000000 --- a/templates/web/seesomething/report/new/fill_in_details_form.html +++ /dev/null @@ -1,106 +0,0 @@ -<div id="report-a-problem-main"> - <p>Click and drag on the map to reposition the pin.</p> - <h1>[% loc('Reporting a problem') %]</h1> - - - [% INCLUDE 'errors.html' %] - <fieldset> - <div id="problem_form"> - - [% INCLUDE 'report/new/form_heading.html' %] - - [% IF field_errors.council %] - <p class='form-error'>[% field_errors.council %]</p> - [% END %] - - <label for="form_detail">[% loc('Details') %]</label> - [% IF field_errors.detail %] - <p class='form-error'>[% field_errors.detail %]</p> - [% END %] - <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> - - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Transport Category') %]</label> - <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - <div id="form_subcategory_row"> - <label for="form_subcategory">[% loc('Incident Category') %]</label> - <select class="form-control" name="subcategory" id="form_subcategory" required> - <option value="">-- Pick a category --</option> - <option value="Smoking/other drugs">Smoking/other drugs</option> - <option value="Drugs">Drugs</option> - <option value="Anti-social behaviour">Anti-social behaviour</option> - <option value="Loud music">Loud music</option> - <option value="Damage">Damage</option> - <option value="Feet on seats">Feet on seats</option> - <option value="Other">Other</option> - </select> - </div> - - [% IF c.cobrand.allow_photo_upload %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - <label for="form_photo"> - <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span> - </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 report. Note that you can attach a maximum of 3 to this report (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 %] - - <h2>Personal Details:</h2> - - <label for="form_name">[% loc('Name (optional)') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - - <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - - <label for="form_email">[% loc('Your email (optional)') %]</label> - [% IF field_errors.email %] - <p class='form-error'>[% field_errors.email %]</p> - [% END %] - <input type="email" class="form-control" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]"> - - - - <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input type="text" class="form-control" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> - - <div class="form-txt-submit-box "> - <input class="green-btn" type="submit" id="submit_noname" name="submit_noname" value="[% loc('Submit') %]"> - </div> - - </div> - </fieldset> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - - <input type="hidden" name="submit_problem" value="1"> -</div> diff --git a/templates/web/seesomething/set_body_class.html b/templates/web/seesomething/set_body_class.html deleted file mode 100644 index b613706f2..000000000 --- a/templates/web/seesomething/set_body_class.html +++ /dev/null @@ -1 +0,0 @@ -[% bodyclass = ( bodyclass ? bodyclass : 'mappage' ) %] diff --git a/templates/web/seesomething/site-name.html b/templates/web/seesomething/site-name.html deleted file mode 100644 index 7a3ceec89..000000000 --- a/templates/web/seesomething/site-name.html +++ /dev/null @@ -1 +0,0 @@ -See Something, Say Something diff --git a/templates/web/seesomething/tokens/confirm_problem.html b/templates/web/seesomething/tokens/confirm_problem.html deleted file mode 100644 index 0a455434b..000000000 --- a/templates/web/seesomething/tokens/confirm_problem.html +++ /dev/null @@ -1,33 +0,0 @@ -[% - - IF report.used_map; - PROCESS "maps/${map.type}.html"; - END; - - INCLUDE 'header.html', - title => loc('Report created') - bodyclass => 'mappage', - robots => 'noindex,nofollow'; -%] - - -[% IF report.used_map %] - [% map_html %] - </div> - <div id="map_sidebar"> -[% END %] - - <div id="side"> - <div id="report-a-problem-main"> - <h1>Complete</h1> - <p>Your report has been sent. If you included contact details we may be in touch to follow up or request more details.</p> - <p>Thank you for saying something and making our transport safer.</p> - <p><img src="../cobrands/seesomething/images/btp-wmp-logos.png" alt="British Transport Police and the West Midlands Police" width="271" height="116"></p> - </div> - </div> - -[% IF report.used_map %] - </div> -[% END %] - -[% INCLUDE 'footer.html' %] |