diff options
48 files changed, 499 insertions, 124 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 0d3b024a8..7922dfea1 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -94,8 +94,11 @@ __PACKAGE__->setup(); # tell the code we're secure if we are. after 'prepare_headers' => sub { my $self = shift; - $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'https://www.zueriwieneu.ch'; - $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'http://www.fixmystreet.com' && $self->req->headers->header('Host') eq 'fix.bromley.gov.uk'; + my $base_url = $self->config->{BASE_URL}; + my $host = $self->req->headers->header('Host'); + $self->req->secure( 1 ) if $base_url eq 'https://www.zueriwieneu.ch'; + $self->req->secure( 1 ) if $base_url eq 'https://www.fixmystreet.com' + && ( $host eq 'fix.bromley.gov.uk' || $host eq 'www.fixmystreet.com' ); }; # set up DB handle for old code diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 7e0cccc7b..5b3283a2c 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -368,11 +368,32 @@ sub load_and_group_problems : Private { my ( $self, $c ) = @_; my $page = $c->req->params->{p} || 1; + my $type = $c->req->params->{t} || 'all'; my $where = { non_public => 0, state => [ FixMyStreet::DB::Result::Problem->visible_states() ] }; + + my $not_open = [ FixMyStreet::DB::Result::Problem::fixed_states(), FixMyStreet::DB::Result::Problem::closed_states() ]; + if ( $type eq 'new' ) { + $where->{confirmed} = { '>', \"ms_current_timestamp() - INTERVAL '4 week'" }; + $where->{state} = { 'IN', [ FixMyStreet::DB::Result::Problem::open_states() ] }; + } elsif ( $type eq 'older' ) { + $where->{confirmed} = { '<', \"ms_current_timestamp() - INTERVAL '4 week'" }; + $where->{lastupdate} = { '>', \"ms_current_timestamp() - INTERVAL '8 week'" }; + $where->{state} = { 'IN', [ FixMyStreet::DB::Result::Problem::open_states() ] }; + } elsif ( $type eq 'unknown' ) { + $where->{lastupdate} = { '<', \"ms_current_timestamp() - INTERVAL '8 week'" }; + $where->{state} = { 'IN', [ FixMyStreet::DB::Result::Problem::open_states() ] }; + } elsif ( $type eq 'fixed' ) { + $where->{lastupdate} = { '>', \"ms_current_timestamp() - INTERVAL '8 week'" }; + $where->{state} = $not_open; + } elsif ( $type eq 'older_fixed' ) { + $where->{lastupdate} = { '<', \"ms_current_timestamp() - INTERVAL '8 week'" }; + $where->{state} = $not_open; + } + if ($c->stash->{ward}) { $where->{areas} = { 'like', '%,' . $c->stash->{ward}->{id} . ',%' }; $where->{bodies_str} = [ @@ -449,7 +470,7 @@ sub redirect_body : Private { $url .= '/' . $c->cobrand->short_name( $c->stash->{body} ); $url .= '/' . $c->cobrand->short_name( $c->stash->{ward} ) if $c->stash->{ward}; - $c->res->redirect( $c->uri_for($url) ); + $c->res->redirect( $c->uri_for($url, $c->req->params ) ); } sub add_row { diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index ec3423f35..c4e33a3c1 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -40,8 +40,9 @@ sub base_url { my $base_url = mySociety::Config::get('BASE_URL'); my $u = $self->council_url; if ( $base_url !~ /$u/ ) { - $base_url =~ s{http://(?!www\.)}{http://$u.}g; - $base_url =~ s{http://www\.}{http://$u.}g; + # council cobrands are not https so transform to http as well + $base_url =~ s{(https?)://(?!www\.)}{http://$u.}g; + $base_url =~ s{(https?)://www\.}{http://$u.}g; } return $base_url; } @@ -59,7 +60,7 @@ sub area_check { if ($council_match) { return 1; } - my $url = 'http://www.fixmystreet.com/'; + my $url = 'https://www.fixmystreet.com/'; if ($context eq 'alert') { $url .= 'alert'; } else { @@ -86,7 +87,7 @@ sub reports_body_check { # We want to make sure we're only on our page. unless ( $self->council_name =~ /^\Q$code\E/ ) { - $c->res->redirect( 'http://www.fixmystreet.com' . $c->req->uri->path_query, 301 ); + $c->res->redirect( 'https://www.fixmystreet.com' . $c->req->uri->path_query, 301 ); $c->detach(); } diff --git a/perllib/FixMyStreet/DB/Result/Body.pm b/perllib/FixMyStreet/DB/Result/Body.pm index be4adeca9..6b529735d 100644 --- a/perllib/FixMyStreet/DB/Result/Body.pm +++ b/perllib/FixMyStreet/DB/Result/Body.pm @@ -98,9 +98,9 @@ __PACKAGE__->has_many( # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hTOxxiiHmC8nmQK/p8dXhQ sub url { - my ( $self, $c ) = @_; + my ( $self, $c, $args ) = @_; # XXX $areas_info was used here for Norway parent - needs body parents, I guess - return $c->uri_for( '/reports/' . $c->cobrand->short_name( $self ) ); + return $c->uri_for( '/reports/' . $c->cobrand->short_name( $self ), $args || {} ); } sub areas { diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 157d63d01..e3dc46c64 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -1485,7 +1485,7 @@ subtest "categories from deleted bodies shouldn't be visible for new reports" => subtest "extra google analytics code displayed on logged in problem creation" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], - BASE_URL => 'http://www.fixmystreet.com', + BASE_URL => 'https://www.fixmystreet.com', MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { # check that the user does not exist @@ -1544,7 +1544,7 @@ subtest "extra google analytics code displayed on logged in problem creation" => subtest "extra google analytics code displayed on email confirmation problem creation" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], - BASE_URL => 'http://www.fixmystreet.com', + BASE_URL => 'https://www.fixmystreet.com', MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { $mech->log_out_ok; diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t index 42e69fd03..36af2f36a 100644 --- a/t/app/controller/reports.t +++ b/t/app/controller/reports.t @@ -11,15 +11,19 @@ ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' ); $mech->create_body_ok(2514, 'Birmingham City Council'); $mech->create_body_ok(2651, 'City of Edinburgh Council'); $mech->create_body_ok(2504, 'Westminster City Council'); +$mech->create_body_ok(2649, 'Fife Council'); $mech->delete_problems_for_body( 2504 ); $mech->delete_problems_for_body( 2651 ); +$mech->delete_problems_for_body( 2649 ); my @edinburgh_problems = $mech->create_problems_for_body(3, 2651, 'All reports'); my @westminster_problems = $mech->create_problems_for_body(5, 2504, 'All reports'); +my @fife_problems = $mech->create_problems_for_body(15, 2649, 'All reports'); is scalar @westminster_problems, 5, 'correct number of westminster problems created'; is scalar @edinburgh_problems, 3, 'correct number of edinburgh problems created'; +is scalar @fife_problems, 15, 'correct number of fife problems created'; $edinburgh_problems[1]->update( { state => 'in progress', @@ -27,6 +31,59 @@ $edinburgh_problems[1]->update( { lastupdate => DateTime->now()->subtract( weeks => 5 ), } ); +$fife_problems[1]->update( { + state => 'fixed - user', + confirmed => DateTime->now()->subtract( weeks => 6 ), + lastupdate => DateTime->now()->subtract( weeks => 5 ), +}); + +$fife_problems[2]->update( { + state => 'fixed - user', + confirmed => DateTime->now()->subtract( weeks => 2 ), + lastupdate => DateTime->now()->subtract( weeks => 1 ), +}); + +$fife_problems[3]->update( { + state => 'fixed - user', + confirmed => DateTime->now()->subtract( weeks => 10 ), + lastupdate => DateTime->now()->subtract( weeks => 9 ), +}); + +$fife_problems[4]->update( { + confirmed => DateTime->now()->subtract( weeks => 10 ), + lastupdate => DateTime->now()->subtract( weeks => 9 ), +}); + +$fife_problems[5]->update( { + confirmed => DateTime->now()->subtract( weeks => 7 ), + lastupdate => DateTime->now()->subtract( weeks => 5 ), +}); + +$fife_problems[6]->update( { + confirmed => DateTime->now()->subtract( weeks => 7 ), + lastupdate => DateTime->now()->subtract( weeks => 2 ), +}); + +$fife_problems[7]->update( { + confirmed => DateTime->now()->subtract( weeks => 10 ), + lastupdate => DateTime->now()->subtract( weeks => 6 ), +}); + +$fife_problems[8]->update( { + confirmed => DateTime->now()->subtract( weeks => 10 ), + lastupdate => DateTime->now()->subtract( weeks => 2 ), +}); + +$fife_problems[9]->update( { + state => 'fixed - user', + confirmed => DateTime->now()->subtract( weeks => 10 ), + lastupdate => DateTime->now()->subtract( weeks => 7 ), +}); + +$fife_problems[10]->update( { + state => 'hidden', +}); + # Run the cron script that makes the data for /reports so we don't get an error. system( "bin/cron-wrapper update-all-reports" ); @@ -42,6 +99,12 @@ is $stats->{'City of Edinburgh Council'}->[2], 1, 'correct number of older repor is $stats->{'Westminster City Council'}->[1], 5, 'correct number of reports for Westminster'; +is $stats->{'Fife Council'}->[1], 5, 'correct number of new reports for Fife'; +is $stats->{'Fife Council'}->[2], 4, 'correct number of old reports for Fife'; +is $stats->{'Fife Council'}->[3], 1, 'correct number of unknown reports for Fife'; +is $stats->{'Fife Council'}->[4], 3, 'correct number of fixed reports for Fife'; +is $stats->{'Fife Council'}->[5], 1, 'correct number of older fixed reports for Fife'; + FixMyStreet::override_config { MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { @@ -56,6 +119,61 @@ $mech->content_contains('All reports Test 3 for 2504', 'problem to be marked non my $problems = $mech->extract_problem_list; is scalar @$problems, 5, 'correct number of problems displayed'; +FixMyStreet::override_config { + MAPIT_URL => 'http://mapit.mysociety.org/', +}, sub { + $mech->get_ok('/reports/City+of+Edinburgh?t=new'); +}; +$problems = $mech->extract_problem_list; +is scalar @$problems, 2, 'correct number of new problems displayed'; + +FixMyStreet::override_config { + MAPIT_URL => 'http://mapit.mysociety.org/', +}, sub { + $mech->get_ok('/reports/City+of+Edinburgh?t=older'); +}; +$problems = $mech->extract_problem_list; +is scalar @$problems, 1, 'correct number of older problems displayed'; + +for my $test ( + { + desc => 'new fife problems on report page', + type => 'new', + expected => 5 + }, + { + desc => 'older fife problems on report page', + type => 'older', + expected => 4 + }, + { + desc => 'unknown fife problems on report page', + type => 'unknown', + expected => 1 + }, + { + desc => 'fixed fife problems on report page', + type => 'fixed', + expected => 3 + }, + { + desc => 'older_fixed fife problems on report page', + type => 'older_fixed', + expected => 1 + }, +) { + subtest $test->{desc} => sub { + FixMyStreet::override_config { + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + $mech->get_ok('/reports/Fife+Council?t=' . $test->{type}); + }; + + $problems = $mech->extract_problem_list; + is scalar @$problems, $test->{expected}, 'correct number of ' . $test->{type} . ' problems displayed'; + }; +} + my $private = $westminster_problems[2]; ok $private->update( { non_public => 1 } ), 'problem marked non public'; diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt index 44c9ad744..eb7c9aae6 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/default/submit-brent.txt @@ -39,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index 117584467..a7f2b0229 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -8,7 +8,7 @@ local problem that they believe might require your attention. To view a map of the precise location of this issue, or to provide an update on the problem, please visit the following link: - http://www.fixmystreet.com/report/39092 + https://www.fixmystreet.com/report/39092 ---------- @@ -51,11 +51,11 @@ The FixMyStreet team This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about 'Potholes', please let us know by -visiting <http://www.fixmystreet.com/contact>. This will help +visiting <https://www.fixmystreet.com/contact>. This will help improve the service for local people. We also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 2a2eae3e6..fb9aa41db 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -33,11 +33,11 @@ Replies to this email will go to the user who submitted the problem. This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about -<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>. +<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>. This will help improve the service for local people. We also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/fixamingata/submit-brent.txt b/templates/email/fixamingata/submit-brent.txt index 75a954765..eb7c9aae6 100644 --- a/templates/email/fixamingata/submit-brent.txt +++ b/templates/email/fixamingata/submit-brent.txt @@ -39,5 +39,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/for-councils/fixmystreet/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/fixamingata/submit-example.txt b/templates/email/fixamingata/submit-example.txt index 4956a7a93..33ab598a5 100644 --- a/templates/email/fixamingata/submit-example.txt +++ b/templates/email/fixamingata/submit-example.txt @@ -57,5 +57,5 @@ feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: http://www.mysociety.org/for-councils/fixmystreet/ +Read more here: https://www.mysociety.org/services/fixmystreet-for-councils/ diff --git a/templates/email/fixmystreet/signature.txt b/templates/email/fixmystreet/signature.txt index 67906ac2f..14b7d83e7 100644 --- a/templates/email/fixmystreet/signature.txt +++ b/templates/email/fixmystreet/signature.txt @@ -2,10 +2,10 @@ All the best, The FixMyStreet team -http://www.FixMyStreet.com +https://www.FixMyStreet.com Twitter: https://twitter.com/FixMyStreet Facebook: http://www.facebook.com/fixmystreet Problems? questions? -Visit http://www.fixmystreet.com/faq +Visit https://www.fixmystreet.com/faq diff --git a/templates/web/barnet/faq/faq-en-gb.html b/templates/web/barnet/faq/faq-en-gb.html index 08bb744a6..bc381a509 100755 --- a/templates/web/barnet/faq/faq-en-gb.html +++ b/templates/web/barnet/faq/faq-en-gb.html @@ -46,7 +46,7 @@ by a user of the site.</dd> </dd> <dt>Can I use these pages to report problems outside of the London Borough of Barnet?</dd> - <dd>No, please visit the main FixMyStreet site at <a href="http://www.fixmystreet.com/">http://www.fixmystreet.com/</a> to report problem outside the borough.</dd> + <dd>No, please visit the main FixMyStreet site at <a href="https://www.fixmystreet.com/">https://www.fixmystreet.com/</a> to report problem outside the borough.</dd> <dt>Who built FixMyStreet?</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>. diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 30b35f152..26ce2b99d 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -1,5 +1,5 @@ <p id="barnet-powered-by" class="desk-only"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a> </p> </div><!-- .content role=main --> </div><!-- .container --> @@ -9,7 +9,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> + <li><a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/barnet/img/fms-logo.png" style="height:20px;"></a></li> </ul> <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 31b566047..26ef45031 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -1,6 +1,6 @@ </div><!-- .content role=main --> <p id="bromley-powered-by" class="desk-only"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </p> </div><!-- .container --> @@ -10,7 +10,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> + <li><a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/bromley/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a></li> </ul> <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index f2eb505ab..608a77dc2 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -62,7 +62,7 @@ your config file is not pointing to a live MapIt service.") %] [% END %] <br> - [% loc("For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] + [% loc("For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] </p> </div> <p> @@ -109,7 +109,7 @@ "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> <strong>You don't need to set them if the Send Method is email.</strong>. For more information on Open311, see - <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>. + <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>. " ) %] </p> @@ -159,7 +159,7 @@ "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. For more information, see - <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." + <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." ) %] </p> </div> diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 36c0daf91..e3dead34a 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage alertindex' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 3bfbfb467..57f346d31 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -86,7 +86,7 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</ to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/default/reports/body.html b/templates/web/default/reports/body.html index 2b19e5735..1b6a3a157 100755 --- a/templates/web/default/reports/body.html +++ b/templates/web/default/reports/body.html @@ -80,7 +80,7 @@ [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> FixMyStreet is now available for local council websites. - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out more</a>. + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out more</a>. </p> [% END %] diff --git a/templates/web/default/reports/index.html b/templates/web/default/reports/index.html index e4b4c3033..1e4130a37 100755 --- a/templates/web/default/reports/index.html +++ b/templates/web/default/reports/index.html @@ -28,11 +28,11 @@ [%- ELSIF ! (loop.count % 2) %] class="a" [%- END %]> <td class="title"><a href="[% body.url(c) %]">[% body.name %]</a></td> -<td class="data">[% open.${body.id}.new or 0 %]</td> -<td class="data">[% open.${body.id}.older or 0 %]</td> -<td class="data">[% open.${body.id}.unknown or 0 %]</td> -<td class="data">[% fixed.${body.id}.new or 0 %]</td> -<td class="data">[% fixed.${body.id}.old or 0 %]</td> +<td class="data">[% IF open.${body.id}.new %]<a href="[% body.url(c, { t => 'new' }) %]">[% open.${body.id}.new %]</a>[% ELSE %]0[% END %]</td> +<td class="data">[% IF open.${body.id}.older %]<a href="[% body.url(c, { t => 'older' }) %]">[% open.${body.id}.older %]</a>[% ELSE %]0[% END %]</td> +<td class="data">[% IF open.${body.id}.unknown %]<a href="[% body.url(c, { t => 'unknown' }) %]">[% open.${body.id}.unknown %]</a>[% ELSE %]0[% END %]</td> +<td class="data">[% IF fixed.${body.id}.new %]<a href="[% body.url(c, { t => 'fixed' }) %]">[% fixed.${body.id}.new %]</a>[% ELSE %]0[% END %]</td> +<td class="data">[% IF fixed.${body.id}.old %]<a href="[% body.url(c, { t => 'older_fixed' }) %]">[% fixed.${body.id}.old %]</a>[% ELSE %]0[% END %]</td> </tr> [% TRY %][% PROCESS "reports/_extras.html" %][% CATCH file %][% END %] [% END %] diff --git a/templates/web/emptyhomes/faq/faq-cy.html b/templates/web/emptyhomes/faq/faq-cy.html index 2945d24a9..842f0c028 100644 --- a/templates/web/emptyhomes/faq/faq-cy.html +++ b/templates/web/emptyhomes/faq/faq-cy.html @@ -48,7 +48,7 @@ Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwa href="http://github.com/mysociety/fixmystreet"> lawrlwytho’r cod gwreiddiol</a> a’n helpu ni i’w ddatblygu. Mae croeso i chi hefyd ei ddefnyddio yn eich prosiectau eich hunan, er bod rhaid i chi ryddhau’r cod gwreiddiol i unrhyw brosiectau o’r fath.</dd> <dt>Pobl sy’n adeiladu pethau, nid sefydliadau. Pwy wnaeth ei adeiladu <em>go iawn</em>?</dt> - <dd>Ysgrifennwyd yr addasiad hwn o <a href="http://www.fixmystreet.com/">Fix­MyStreet</a> + <dd>Ysgrifennwyd yr addasiad hwn o <a href="https://www.fixmystreet.com/">Fix­MyStreet</a> gan Matthew Somerville. Diolch i’r <a href="http://www.ordnancesurvey.co.uk">Arolwg Ordnans</a> (am y mapiau, codau post y DU a chyfeiriadau’r DU – data © Hawlfraint y Goron, cedwir pob hawl diff --git a/templates/web/emptyhomes/faq/faq-en-gb.html b/templates/web/emptyhomes/faq/faq-en-gb.html index e6fbc25ea..4b3e71ce2 100755 --- a/templates/web/emptyhomes/faq/faq-en-gb.html +++ b/templates/web/emptyhomes/faq/faq-en-gb.html @@ -37,10 +37,6 @@ repair or the owner is unwilling to do anything. In most cases it takes six months before you can expect to see anything change, occasionally longer. This doesn’t mean the council isn’t doing anything, which is why we encourage councils to update you to let you know what is happening.</p> <p> -We will contact you twice (a month and six months after you report the empty -home) so you can tell us what has happened. If the council doesn’t do anything, -or you think their response is inadequate we will advise you what you can do -next.</p> <p> If the empty home is owned by the government or one its agencies, councils are often powerless to help. However you might be able to take action directly yourself using the @@ -51,14 +47,6 @@ yourself using the things to do. Many councils only deal with empty homes that are reported to them. If people do not report empty homes, councils may well conclude that other areas of work are more important.</p> <p> -There are over 840,000 empty homes in the UK. The Empty Homes Agency estimates -that over half of these are unnecessarily empty. The effect of this is to -significantly reduce the available housing stock fuelling the UK’s housing -crisis. A by-product of this waste is that far greater pressure is put on -building land as more homes are built to meet the shortfall. The Empty Homes -Agency estimate that bringing just a quarter of the UK’s empty homes into use -would provide homes for 700,000 people, save 160 square kilometres of land and -save 10 million tonnes of CO<sub>2</sub> over building the same number of new homes. </dt> </dl> <h2>Privacy Questions</h2> @@ -91,7 +79,7 @@ source code</a> and help us 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.</dd> <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>This adaptation of <a href="http://www.fixmystreet.com/">Fix­MyStreet</a> + <dd>This adaptation of <a href="https://www.fixmystreet.com/">Fix­MyStreet</a> was written by Matthew Somerville. Thanks go to <a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, UK postcodes, and UK addresses – data © Crown copyright, all diff --git a/templates/web/emptyhomes/footer.html b/templates/web/emptyhomes/footer.html index e9a70de4f..29af4df9f 100644 --- a/templates/web/emptyhomes/footer.html +++ b/templates/web/emptyhomes/footer.html @@ -5,10 +5,10 @@ <div> Empty Homes<br> -75 Westminster Bridge Road<br> +14-16 Cowcross Street<br> London<br> -SE1 7HS<br> -Tel: 020 7921 4450 <br> +EC1M 6DG<br> +Tel: 020 3135 0674<br> Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> </div> diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html index 0dc03336f..c956b0e2e 100644 --- a/templates/web/emptyhomes/front/stats.html +++ b/templates/web/emptyhomes/front/stats.html @@ -3,6 +3,6 @@ <div id="front_stats"> <div>[% tprintf( loc("<big>%s</big> reports"), stats ) | comma %]</div> - <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div> + <!-- <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div> --> <div id="eha-app-link"><a href="https://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8">Get the Empty Homes Spotter App for iPhone</a></div> </div> diff --git a/templates/web/fixmindelo/faq/faq-pt-cv.html b/templates/web/fixmindelo/faq/faq-pt-cv.html index cae17ebc6..c3541a48d 100644 --- a/templates/web/fixmindelo/faq/faq-pt-cv.html +++ b/templates/web/fixmindelo/faq/faq-pt-cv.html @@ -83,7 +83,7 @@ </dt> <dt>Eu sou de um conselho, podemos ter FixMyStreet em nosso site?</dt> <dd> - Sim, você pode! Nós oferecemos marca, as versões do FixMyStreet para sites locais do conselho hospedado. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Detalhes completos</a>. + Sim, você pode! Nós oferecemos marca, as versões do FixMyStreet para sites locais do conselho hospedado. <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Detalhes completos</a>. </dd> <dt>Voces removem conteudo ilegal, descriminatorio ou sem conteudo de fix?</dt> <dd>FixMyStreet não é responsável pelo conteúdo e precisão do material enviado por seus usuários. Reservamo-nos o direito de editar ou remover quaisquer problemas ou atualizações que consideramos ser impróprio ao ser informado por um usuário do site.</dd> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index b9d720dab..2c13123be 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -98,7 +98,7 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> - <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any @@ -130,32 +130,32 @@ by a user of the site.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + <dd>This site was built by <a href="https://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.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your +was <a href="https://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> <dd>FixMyStreet was originally paid for via the Department for Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> + work to <a href="https://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> <dt>Do you need any help with the project?</dt> <dd>Yes, we can use help in all sorts of ways, technical or non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> +href="https://www.mysociety.org/helpus/">Get Involved page</a>.</dd> <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> <dd> The software behind this site is open source, and available to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the +href="https://github.com/mysociety/fixmystreet">download the source code</a> and help us 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. @@ -167,7 +167,7 @@ being used in a Norwegian version of this site. VisibleGovernment.ca wrote their own code for <a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. +href="https://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in Drupal. </p> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index cb39416f4..848095596 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,45 +1,41 @@ [% IF pagefooter %] <footer role="content-info"> - <div class="tablewrapper bordered"> - <div id="footer-mobileapps"> - <h4>The FixMyStreet App</h4> - <p> - <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> - <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> - </a> - <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> - <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" /> - </a> - </p> - </div> - - <div id="footer-help"> - <ul> - <li> - <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> - </li> - <li> - <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p> - </li> - </ul> - </div> - </div> - <p><a href="/privacy">Privacy and cookies</a></p> + [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] </div><!-- .content role=main --> </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' %] + <div id="footer-nav"> + <div class="tablewrapper"> + <ul id="footer-main-nav"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% 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 == '/contact' %]span[% ELSE %]a href="/contact"[% END + %]>[% loc("Contact") %]</[% c.req.uri.path == '/contact' ? 'span' : 'a' %]></li> + </ul> + <ul id="footer-help-nav"> + <li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + [% END %] </div><!-- .table-cell --> <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li>[% - %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% - %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> + <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> </ul> <ul id="main-menu"> @@ -52,7 +48,9 @@ %]<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> + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% + %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> </div> diff --git a/templates/web/fixmystreet/front/footer-marketing.html b/templates/web/fixmystreet/front/footer-marketing.html new file mode 100644 index 000000000..8a8985d1f --- /dev/null +++ b/templates/web/fixmystreet/front/footer-marketing.html @@ -0,0 +1,29 @@ + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <h4>The FixMyStreet App</h4> + <p> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> + <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> + </a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> + <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" /> + </a> + </p> + </div> + + <div id="footer-help"> + <p> + Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a> + </p> + <ul> + <li> + <h4>[% loc('Are you a developer?') %]</h4> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + </li> + <li> + <h4>[% loc('Are you from a council?') %]</h4> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out about FixMyStreet for councils</a>.') %]</p> + </li> + </ul> + </div> + </div> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 6ed84a85d..7ddb09e26 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -28,7 +28,7 @@ [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] - <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> + <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] diff --git a/templates/web/fixmystreet/questionnaire/completed-open.html b/templates/web/fixmystreet/questionnaire/completed-open.html index ff19134be..0726f5fc7 100644 --- a/templates/web/fixmystreet/questionnaire/completed-open.html +++ b/templates/web/fixmystreet/questionnaire/completed-open.html @@ -23,7 +23,7 @@ Thank you very much for filling in our questionnaire. </p> [% ELSE %] [% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try <a href="http://www.writetothem.com/">writing direct +suggestions: why not try <a href="https://www.writetothem.com/">writing direct to your councillor(s)</a> or, if it’s a problem that could be fixed by local people working together, why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? diff --git a/templates/web/fixmystreet/reports/_extras.html b/templates/web/fixmystreet/reports/_extras.html index 258e94ce7..850784232 100755 --- a/templates/web/fixmystreet/reports/_extras.html +++ b/templates/web/fixmystreet/reports/_extras.html @@ -19,7 +19,7 @@ <td class="title" colspan="6" style="padding-top:0"> <small title="This council's online reporting is powered by FixMyStreet">(includes reports from <a href="http[% secure.$site %]://[% site %]">[% site %]</a> using - <a href="http://www.mysociety.org/for-councils/fixmystreet/">FixMyStreet for Councils</a>)</small> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">FixMyStreet for Councils</a>)</small> </td> </tr> [% END %] diff --git a/templates/web/fixmystreet/static/fun.html b/templates/web/fixmystreet/static/fun.html index 57a74a0d7..03d977d44 100644 --- a/templates/web/fixmystreet/static/fun.html +++ b/templates/web/fixmystreet/static/fun.html @@ -10,24 +10,24 @@ Do let us know if you find any more.</p> <ul class="plain-list"> - <li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> + <li><img src='https://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> <h2>Dumped Piano (right)</h2> <p>The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — - <a href='http://www.fixmystreet.com/report/9468'>Problem report</a> + <a href='https://www.fixmystreet.com/report/9468'>Problem report</a> <li><h2>Mad Seagull</h2> <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — - <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> + <a href='https://www.fixmystreet.com/report/2722'>Problem report</a> - <li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> + <li><img src='https://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> <h2>Boxes full of cheese dumped (right)</h2> <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — - <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> + <a href='https://www.fixmystreet.com/report/6553'>Problem report</a> <li><h2>Dangerous Nivea Billboard</h2> <p>“The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident” — - <a href='http://www.fixmystreet.com/report/7552'>Problem report</a> + <a href='https://www.fixmystreet.com/report/7552'>Problem report</a> </ul> diff --git a/templates/web/fixmystreet/static/posters.html b/templates/web/fixmystreet/static/posters.html index 760397b02..b56a6f847 100644 --- a/templates/web/fixmystreet/static/posters.html +++ b/templates/web/fixmystreet/static/posters.html @@ -3,7 +3,7 @@ %] [% - badge = '<a href="http://www.fixmystreet.com/"> <img src="http://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>' + badge = '<a href="https://www.fixmystreet.com/"> <img src="https://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>' %] <h1>Publicity Material</h1> diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html index b280624ae..a2545cb1c 100755 --- a/templates/web/fixmystreet/static/privacy.html +++ b/templates/web/fixmystreet/static/privacy.html @@ -76,10 +76,10 @@ send you emails in relation to your problem.</dd> <p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p> -<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> +<p><a href="https://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> <h2>Credits</h2> -<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). +<p>Bits of wording taken from the <a href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet/tracking_code.html index 9d8c00d3c..0453e1a22 100644 --- a/templates/web/fixmystreet/tracking_code.html +++ b/templates/web/fixmystreet/tracking_code.html @@ -1,4 +1,4 @@ -[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %] +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] <script type="text/javascript"> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), @@ -23,5 +23,5 @@ ga('send', 'pageview'); </script> [% ELSE %] -<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" --> +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> [% END %] diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html index ebdd74d51..e3fe6f098 100644 --- a/templates/web/hart/footer.html +++ b/templates/web/hart/footer.html @@ -77,7 +77,7 @@ </footer> <div class="clearfix" id="footer-row-2"> <div id="hart-powered-by"> - <a href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> + <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a> </div> <div id="footer-images"> <a href="https://twitter.com/HartCouncil"> diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index 3aa87e229..ddf3fc44d 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -227,7 +227,7 @@ </dd> </dl> <p> - You can find out more about FixMyStreet at <a href="http://www.fixmystreet.com">www.fixmystreet.com</a>. + You can find out more about FixMyStreet at <a href="https://www.fixmystreet.com">www.fixmystreet.com</a>. </p> <p> <p> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index 29146d935..89a4eebb8 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -11,7 +11,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="mysoc-menu"> - <li><a id="mysoc-logo" href="http://www.mysociety.org/for-councils/fixmystreet/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> + <li><a id="mysoc-logo" href="https://www.mysociety.org/services/fixmystreet-for-councils/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li> </ul> <ul id="main-menu"> @@ -40,7 +40,7 @@ </address> <ul><!-- use | between items --> <li class="powered-by-fms"> - <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> + <a href="https://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> </li> </ul> </div> diff --git a/templates/web/reading/reports/cobrand_stats.html b/templates/web/reading/reports/cobrand_stats.html index 80976c3a6..381e4f5af 100644 --- a/templates/web/reading/reports/cobrand_stats.html +++ b/templates/web/reading/reports/cobrand_stats.html @@ -1,5 +1,5 @@ <ul> <li>Reports submitted via <a href="[% uri_for('/') %]">reading.fixmystreet.com</a>: [% stats.cobrand %]</li> - <li>Reports submitted via <a href="http://www.fixmystreet.com/">www.fixmystreet.com</a>: [% stats.main_site %]<br /><br /> + <li>Reports submitted via <a href="https://www.fixmystreet.com/">www.fixmystreet.com</a>: [% stats.main_site %]<br /><br /> Statistics date from launch of Reading FixMyStreet.</li> </ul> diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index 92449916f..49ddc8cc7 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -19,7 +19,7 @@ </li> <li> <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.mysociety.org/services/fixmystreet-for-councils/">Find out about FixMyStreet for councils</a>.') %]</p> </li> </ul> </div> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index dc7af64bb..381864d58 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -10,6 +10,10 @@ @import "compass"; @import "../sass/base"; +#footer-nav { + display: none; +} + #country_banner { display: none; color: $primary_text; background: $primary; diff --git a/web/cobrands/fixmystreet/images/fms-platform-logo.svg b/web/cobrands/fixmystreet/images/fms-platform-logo.svg new file mode 100644 index 000000000..c495eaafa --- /dev/null +++ b/web/cobrands/fixmystreet/images/fms-platform-logo.svg @@ -0,0 +1 @@ +<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 445.8 50"><g><g><g fill="#ffffff"><path d="M66.1 13.6h-2.6v-2.5h15c1.7 0 2.4.7 2.4 2.4v2.8h-2.6v-1.9c0-.6-.3-.9-.9-.9h-8.5v10.5h10.2v2.5h-10.2v12.5h-2.8v-25.4zM85.5 22.3c0-.6-.3-.9-.9-.9h-1.7v-2.3h2.8c1.7 0 2.4.7 2.4 2.4v14.4c0 .6.3.9.9.9h1.7v2.3h-2.8c-1.7 0-2.4-.7-2.4-2.4v-14.4zm-.1-11.2h2.6v3.4h-2.6v-3.4zM99.6 28.7l-4.4-6.4c-.5-.7-1-.8-1.8-.8h-.8v-2.3h1.4c2 0 2.6.3 3.8 2.2l2.9 4.5c.3.5.7 1.2.7 1.2h.1s.4-.7.6-1.2l2.9-4.5c1.2-1.8 1.7-2.2 3.8-2.2h1.4v2.3h-.8c-.8 0-1.4.1-1.9.8l-4.4 6.4 7.1 10.4h-3.2l-4.9-7.4c-.3-.5-.6-1.1-.6-1.1h-.1s-.3.6-.7 1.1l-4.9 7.4h-3.2l7-10.4zM111.8 36.6h1.5c.6 0 .8-.3.9-.9l2-24.6h2.8l7.5 16.3c.7 1.4 1.4 3.3 1.4 3.3h.1s.7-1.9 1.4-3.3l7.5-16.3h2.8l2 24.6c0 .6.3.9.9.9h1.5v2.5h-2.7c-1.7 0-2.3-.7-2.4-2.4l-1.3-17c-.1-1.5-.1-3.9-.1-3.9h-.1s-.8 2.5-1.4 3.9l-6.7 14.2h-2.5l-6.9-14.2c-.6-1.4-1.5-4-1.5-4h-.1s0 2.5-.1 4l-1.3 17c-.1 1.7-.7 2.4-2.4 2.4h-2.7v-2.5zM149.4 45c1.8 0 3-1.4 3.7-3.3l1.2-2.7-7.1-16.7c-.3-.7-.7-.9-1.4-.9h-.4v-2.3h1.2c1.8 0 2.4.4 3.1 2.2l5.2 12.5c.4 1 .7 2.1.7 2.1h.1s.3-1.2.7-2.1l5-12.5c.7-1.8 1.3-2.2 3.1-2.2h1.2v2.3h-.4c-.7 0-1.1.2-1.4.9l-8.7 20.9c-1 2.5-3.1 4.2-5.8 4.2-2.8 0-4.4-1.9-4.4-1.9l1.3-2c.1 0 1.4 1.5 3.1 1.5zM190.2 16.7c0 1.9-1.7 3-3.2 3-.8 0-1.6-.3-2.4-1.4-.2-.3-.4-.6-.6-.8-.9-1.2-2.4-1.9-4.7-1.9-2.8 0-4.8 1-4.8 2.9 0 .6.2 1.2.8 1.7.6.5 1.6.8 3.6 1.3 6.2 1.7 6.9 1.8 8.3 2.7 1.7 1.1 3.6 3.2 3.6 6.5 0 2.9-1.4 5.2-3.3 6.7-2.3 1.8-5.3 2.4-8.3 2.4-2.9 0-5.5-.5-7.6-1.5-4.2-2.1-4.5-4.8-4.5-5.5 0-1.9 1.6-3.1 3.1-3.1 1.3 0 2.2.8 3.1 2.2.9 1.3 1.9 2.8 6 2.8.9 0 1.9-.1 2.8-.4.3-.1 2.1-.8 2.1-2.9 0-1.1-.5-1.8-1.2-2.2-.8-.6-1.4-.7-5.2-1.7-4.6-1.2-9.9-2.6-9.9-8.4 0-5.1 4-8.5 11.3-8.5 7-.3 11 3.3 11 6.1zM200.3 18.4c1.7 0 2.1 0 2.6.2.4.2 1.1.8 1.1 1.9 0 .4-.1.8-.3 1.1-.6 1.2-1.4 1.2-3.4 1.2v9.9c0 1.8.6 1.9 2.1 1.9 1.6 0 2 1.2 2 2.1 0 2.4-2.8 2.6-4.3 2.6-5.4 0-5.5-3.1-5.5-5.5v-11c-.7 0-1.3 0-1.9-.3-.2-.1-1.1-.6-1.1-1.9 0-.4 0-.7.2-1 .6-1.2 1.8-1.2 2.8-1.2v-2.8c0-.9 0-2 .8-2.8.2-.2.8-.9 2.2-.9.4 0 .8.1 1.1.2 1.7.6 1.7 2.3 1.8 3.5v2.8zM206.1 21.9c0-1 0-2.1.9-2.9.4-.4 1-.8 2-.8.5 0 1 .1 1.2.3 1.6.8 1.6 2.5 1.6 3.2v.5c.2-.6.4-1.2.8-1.8.9-1.6 2.5-2.3 4.2-2.3 2.2 0 3 1.3 3 2.7 0 .8-.2 1.4-.7 1.9-.6.6-1.4.7-2.1.8-.6 0-1.1 0-1.6.1-3.1.5-3.1 3.7-3.2 5.9v6.2c0 .9 0 2.1-.8 2.9-.5.5-1.3.8-2.1.8-.2 0-.6 0-1-.2-2-.6-2-2.3-2-3.6v-13.7zM225.8 30.5c.1 1 .3 2.1 1.3 3.1 1.3 1.4 2.8 1.4 3.2 1.4 1.6 0 2.4-.6 2.8-1 .2-.2.4-.5.7-.7.6-.5 1.2-.7 1.7-.7 1.4 0 2.6 1.2 2.6 2.6 0 .8-.4 1.7-1.6 2.5-1.8 1.3-4.2 1.8-6.5 1.8-7.8 0-10.5-5.8-10.5-10.7 0-6.1 4-10.9 10.6-10.9 7.4 0 9.5 5.9 9.5 9.8 0 2.7-1.4 2.7-2.5 2.7h-11.3zm8.4-4.3c-.2-.7-.3-1.4-.7-2.1-.8-1.1-2-1.6-3.4-1.6-3.2 0-3.9 2.3-4.3 3.7h8.4zM247.5 30.5c.1 1 .3 2.1 1.3 3.1 1.3 1.4 2.8 1.4 3.2 1.4 1.6 0 2.4-.6 2.8-1 .2-.2.4-.5.7-.7.6-.5 1.2-.7 1.7-.7 1.4 0 2.6 1.2 2.6 2.6 0 .8-.4 1.7-1.6 2.5-1.8 1.3-4.2 1.8-6.5 1.8-7.8 0-10.5-5.8-10.5-10.7 0-6.1 4.1-10.9 10.6-10.9 7.4 0 9.5 5.9 9.5 9.8 0 2.7-1.4 2.7-2.5 2.7h-11.3zm8.5-4.3c-.2-.7-.3-1.4-.7-2.1-.8-1.1-2-1.6-3.4-1.6-3.2 0-3.9 2.3-4.3 3.7h8.4zM271 18.4c1.7 0 2.1 0 2.6.2.4.2 1.1.8 1.1 1.9 0 .4-.1.8-.3 1.1-.6 1.2-1.4 1.2-3.4 1.2v9.9c0 1.8.6 1.9 2.1 1.9 1.6 0 2 1.2 2 2.1 0 2.4-2.8 2.6-4.3 2.6-5.4 0-5.5-3.1-5.5-5.5v-11c-.7 0-1.3 0-1.9-.3-.2-.1-1.1-.6-1.1-1.9 0-.4 0-.7.2-1 .6-1.2 1.8-1.2 2.8-1.2v-2.8c0-.9 0-2 .8-2.8.2-.2.8-.9 2.2-.9.4 0 .8.1 1.1.2 1.7.6 1.7 2.3 1.8 3.5v2.8zM25.2 0c-13.9 0-25.2 11.2-25.2 25s11.3 25 25.2 25c13.9 0 25.2-11.2 25.2-25s-11.3-25-25.2-25zm0 44.8c-3.5 0-6.9-.9-9.7-2.5l9-9.2.1-.1c.7.2 1.5.3 2.3.3 5.3 0 9.5-4.2 9.6-9.4 0-.8-.1-1.6-.3-2.4l-5 5-5.6-1.2-1.2-5.5 5-5c-.8-.2-1.6-.4-2.5-.4-5.3 0-9.5 4.2-9.6 9.4 0 1.1.2 2.2.6 3.1l-9.1 9.3c-2.2-3.2-3.5-7-3.5-11.2 0-10.9 8.9-19.8 19.9-19.8 11 0 19.9 8.9 19.9 19.8s-8.9 19.8-19.9 19.8z"/></g><g fill="#ffffff"><path d="M294.5 14.1h-2.6v-2.5h12c5 0 8.7 3.3 8.7 8.5 0 5.3-3.7 8.7-8.7 8.7h-6.5v11.1h-2.8v-25.8zm9 12.2c3.7 0 6.2-2.3 6.2-6.2 0-3.8-2.5-6-6.2-6h-6.2v12.2h6.2zM317 14.8c0-.6-.3-.9-.9-.9h-1.7v-2.4h2.9c1.7 0 2.5.7 2.5 2.5v22.6c0 .6.3.9.9.9h1.7v2.4h-2.9c-1.7 0-2.5-.7-2.5-2.5v-22.6zM337.4 27.4h1.1v-.2c0-4.2-1.5-5.7-5.2-5.7-1 0-4 .3-4 1.8v1.3h-2.6v-1.9c0-2.8 4.8-3.4 6.6-3.4 6.4 0 7.9 3.4 7.9 7.8v9.7c0 .6.3.9.9.9h1.7v2.4h-2.8c-1.7 0-2.4-.8-2.4-2.4v-1.5h-.1s-1.7 4.4-6.7 4.4c-3.4 0-6.9-2-6.9-6 .1-7 9-7.2 12.5-7.2zm-5 10.6c3.9 0 6.2-4 6.2-7.5v-.9h-1.2c-3.2 0-9.6.1-9.6 4.6.1 1.9 1.5 3.8 4.6 3.8zM348.5 21.9h-2.7v-2.3h2.7v-5.6h2.7v5.6h5.1v2.3h-5.1v10.3c0 4.8 3 5.4 4.6 5.4.6 0 .9-.1.9-.1v2.5s-.5.1-1.2.1c-2.3 0-7.1-.8-7.1-7.5v-10.7zM361.8 21.9h-2.5v-2.3h2.5v-.7c0-6.7 4.7-7.5 7-7.5.8 0 1.2.1 1.2.1v2.5s-.4-.1-1-.1c-1.5 0-4.5.6-4.5 5.1v.7h5.2v2.3h-5.2v18h-2.7v-18.1zM381.9 19.1c5.9 0 10.7 4.5 10.7 10.5 0 6.1-4.8 10.7-10.7 10.7-5.9 0-10.7-4.6-10.7-10.7 0-6 4.8-10.5 10.7-10.5zm.1 18.8c4.3 0 7.9-3.5 7.9-8.3 0-4.6-3.5-8-7.9-8s-7.9 3.4-7.9 8c0 4.8 3.5 8.3 7.9 8.3zM397.8 22.9c0-.6-.3-.9-.9-.9h-1.7v-2.4h2.8c1.7 0 2.5.7 2.5 2.3v1.4c0 .8-.1 1.5-.1 1.5h.1c1-3.1 3.2-5.4 6.4-5.4.6 0 1.1.1 1.1.1v2.7s-.5-.1-1-.1c-2.9 0-5 2.3-5.9 5.2-.4 1.3-.6 2.7-.6 4v8.5h-2.7v-16.9zM412.6 22.9c0-.6-.3-.9-.9-.9h-1.7v-2.4h2.8c1.7 0 2.5.7 2.5 2.3v.9c0 .8-.1 1.5-.1 1.5h.1c1-2.7 4.2-5.1 7.3-5.1 3.8 0 5.7 1.7 6.3 5.1h.1c1.1-2.7 4-5.1 7.5-5.1 4.9 0 6.7 2.9 6.7 7.9v9.6c0 .6.3.9.9.9h1.7v2.4h-2.8c-1.7 0-2.5-.7-2.5-2.5v-9.8c0-3.3-.7-6-4.4-6-3.1 0-5.6 2.7-6.4 5.7-.3.9-.4 1.9-.4 2.9v9.6h-2.7v-12.2c0-3.1-.4-6-4.3-6-3.3 0-5.8 2.9-6.6 6-.2.8-.3 1.8-.3 2.7v9.6h-2.7v-17.1z"/></g></g></g></svg> diff --git a/web/cobrands/fixmystreet/images/locate-me.png b/web/cobrands/fixmystreet/images/locate-me.png Binary files differnew file mode 100644 index 000000000..47a0eef20 --- /dev/null +++ b/web/cobrands/fixmystreet/images/locate-me.png diff --git a/web/cobrands/fixmystreet/images/locate-me@2.png b/web/cobrands/fixmystreet/images/locate-me@2.png Binary files differnew file mode 100644 index 000000000..df920fadb --- /dev/null +++ b/web/cobrands/fixmystreet/images/locate-me@2.png diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d7f4257c1..6baa4e959 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -78,9 +78,6 @@ h3, h4 { } } } - ul#mysoc-menu { - background: $primary url(images/tile-y.jpg); - } } .nav-wrapper { .nav-wrapper-2 { @@ -94,3 +91,212 @@ body.mappage { } } } + +#main-nav { + ul#mysoc-menu { + background: #515151; + margin-top: -4px; + li a { + &#mysoc-logo { + background-position: 0px 15px; + } + } + } +} + +body.twothirdswidthpage, +body.fullwidthpage { + #front-main { + color: #333; + padding-bottom: 4em; + + h1 { + font-size: 3em; + font-weight: bold; + font-family: MuseoSans,Helmet,Freesans,sans-serif; + } + h2 { + font-family: MuseoSans,Helmet,Freesans,sans-serif; + } + #postcodeForm { + div { + font-size: 1.3em; + width: 24em; + label { + font-family: MuseoSans,Helmet,Freesans,sans-serif; + } + input#pc { + color: #777; + font-size: 0.9em; + height: 2.6em; + width: 20em; + &:focus { + outline: 0; + } + } + input#sub { + font-size: 1.1em; + height: 2.4em; + width: 3.5em; + font-family: MuseoSans,Helmet,Freesans,sans-serif; + font-weight: bold; + } + } + } + a#geolocate_link { + font-family: MuseoSans,Helmet,Freesans,sans-serif; + background: url(images/locate-me.png) no-repeat; + height: 34px; + padding-left: 24px; + margin-top: 0.25em; + @media only screen and (min-resolution: 320dpi), + only screen and (-webkit-min-device-pixel-ratio: 2) { + background: url(images/locate-me@2.png) no-repeat; + } + } + } + + .container { + .content { + box-shadow: none; + padding: 1em 1em 0em; + margin-bottom: 0em; + footer { + margin-top: 0em; + .tablewrapper { + padding-top: 2em; + padding-bottom: 3em; + background: #1a1a1a url(images/tile.jpg) 0 0 repeat; + color: $base_fg; + a:link, + a:visited { + color: $primary; + } + #footer-mobileapps { + a { + padding-left: 0.5em; + } + } + h4 { + font-weight: normal; + padding-bottom: 0.5em; + } + } + + a.platform-logo { + vertical-align: baseline; + display: inline-block; + background-position: top left; + background-repeat: no-repeat; + background-size: auto 1.5em; + background-image: url("images/fms-platform-logo.svg"); + text-indent: -1000%; + height: 1.7em; + width: 16em; + padding-right: 0.25em; + } + } + } + } +} + +.ie6, .ie7, .ie8 { + body.frontpage, + body.twothirdswidthpage { + .content { + border: 0px; + } + } +} +.ie8 body.frontpage .container .content footer a.platform-logo { + background: none; + text-indent: 0px; +} + +body.frontpage { + .container { + background-color: transparent; + + .content { + background-color: transparent; + padding: 0em 0em 1em; + + > .tablewrapper { + margin: -4em 0em 0em; + padding: 1em 1em; + background-color: white; + width: auto; + } + } + footer { + .bordered { + margin: 0em; + } + } + } +} + +body.twothirdswidthpage { + .container { + .content { + footer { + max-width: 48em; + @media only screen and (min-width: 61em) { + max-width: 60em; + } + .tablewrapper { + border: 0px; + } + } + } + } +} + +#footer-nav { + display: block; + border: 0px; + border-top: 0.25em solid #ffd000; + border-image: url(images/tile-y.jpg) 30 0 repeat; + + .tablewrapper { + max-width: 60em; + margin: 0 auto; + background: $base_bg; + ul { + list-style: none; + padding: 0px; + margin: 0px; + float:left; + li { + list-style: none; + display: inline; + margin: 0px; + padding: 0px; + float:left; + a, + span { + display: block; + color: $nav_fg; + background: none; + border-bottom: none; + padding: 0.75em; + font-size: 0.9em; + } + } + } + #footer-main-nav { + display: block; + } + #footer-help-nav { + float: right; + } + } +} + +/* hide the footer on the alert page as the interaction with the + * photo sidebar is awkward to fix */ +body.alertindex { + #footer-nav { + display: none; + } +} diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index dee92d404..df44a3af2 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -500,7 +500,8 @@ p.label-valid { color: $primary_text; background: $primary; &#mysoc-logo { - background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII='); + background-position: 20px 13px; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHQAAAAYCAYAAAArrNkGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABBtJREFUaN7tmT2u1DAQx/cIPgBCQUJCICH5BuQIPkIq6hzBB0AyiAP4ABQ5ghtEm54mEtVrICUNkpmsJjBvdvyR1S7hPa2lv1aJs5PEP894xjkc/tMWY+xADhRQA8iC9I7PtD6PP9xa9aC1oCnmm9lpgtHW3WiVB03HuqYeA9DlPZbJuXj8o5wgGM5os+ixLb74MeTt+Hz+kiGXva99jEDjJV7w+5Pn3aIHNoEvB/Tu7s6iejzuQAEUQRPIgxT2KTwesX+5rkvYs7yP2KDXLN7XXCKkAUgHiii3MaQuideI9x/x2GB/gxFjVZMIoY6AmtBGJ+QJluUKgdheI1LpfveuoQMciTw7XrUAbEFzot8Re4GcnwWghv23Ezx0PiejBYiBAA0/Pz7VoOV3AKnEup1LwhyBQFsr2Jkzdjy51hZyBIuwaOuFZ6fPPaaA5jQX+hvi4fS8YUC9BBzXqJOB4INXAGpAM8oAxBEUUbYSQiCD1ZWACnZGhDJIUacGaBbY34ghAxfAdHheCxBHAs6yvp7YpP/zDOgk9WHIGhMvOZ5TrjCgfUUSptigqQqg1M7A7kHhTVvWUAF8Q/r6ZObPQy4bfMf62wycoeSFOEmoPS2sQ74mdFUC1RhuHQ25QonkKurjE6CCpzTC+9CmNwBNeiHz/oGvabnweG+9E9ZDul6GDDiD53tybsoMYIMJhhQSjy/28YVzoAgKoGRt+uvHMwUaQRHkS7N/I1AjhGuuGs+2ifsOPOwKk6TLAeUe2J4DFPtG7vnsnK3MQPngTwg0ErUZoC3CPEqyWbmDJQG1cVvbCpRPmIadm6Wy5VpAeXKkpCRqQ1F/DwBAnAlQnQHaEKDzlYGGgvQWoEJy1LOx8P8SqOLJEU2uNhbhvQC0AVn76n3/9vWHpIe++/Km/fxVL17aL3ATSYU5E2h77rbkBqA2kYFHsbS7FlAhOTrJpIXwkirYRynMAEgDiignwHSgiGozCceUg5EBqs5N2hhQX8gnpDaldoquCVQn6lmV2foLbJdkSmWkANESoNPLT98UyKMUgbnIFsqWGRMxQ0JbW1G2eCHsdmQferWlMwlPxHuLnwiFa9NefU2gQiJ0UholBixm6lGV8lAEGVFDykMr6l5e5OeA1tg5ASB8wcmVMEa4rtkLqM3VnqQuDJnBmHnhT6A2oKPNBSIFuq6hoCbzCatY91Zs/ZXspED5Ws+rDu0IbZUSEps//YmQuvbrCg8NFd8I1zBl8bd66w8galBA6Q3rmWKb3YZlpIqE0Da13pLrVjtd6flxMtP7qorvse1hjyYkRfs8yMP/8E83WMIeII2wdrobnk0gG6HOnUu7WteAqRKf39QN0yagTlhf9/lwz9fNG8yzgBrmmWa3h8Ftv0HaQLi1TYlaSGX3UvsNzdBKw+waoEEAAAAASUVORK5CYII='); background-repeat:no-repeat; text-indent:-999999px; } @@ -677,14 +678,13 @@ footer { } p { font-size:0.75em; - margin-bottom: 0; + margin-bottom: 0; } } } } - /*BUTTONS*/ // Default style set for buttons, inputs and .btn class. Red and green class available. diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 781832609..64b5dcdff 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -141,6 +141,9 @@ h1 { background: none; border-bottom: none; } + &#top-nav-privacy { + display: none; + } } &#main-menu{ li{ @@ -181,7 +184,8 @@ h1 { &#mysoc-logo { width:84px; height:16px; - background-position: -20px -5px; + background-size: 100px auto; + background-position: 0px 10px; opacity: 0.8; &:hover { opacity: 1; @@ -195,6 +199,9 @@ h1 { } } } +.ie8 #main-nav ul#mysoc-menu li a#mysoc-logo { + width: 100px; +} .ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { background-position: -260px -43px; } @@ -431,7 +438,6 @@ body.twothirdswidthpage { } } - // map box (fallback for non js really as most users // will have fullscreen map) #map_box{ diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 535edac21..059a5e67e 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -66,8 +66,8 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { if (z >= 16 && in_uk) { copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2010'; } else { - logo = '<a href="http://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; - copyrights = '© 2011 <a href="http://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; + copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; } this.attribution = OpenLayers.String.format(this.attributionTemplate, { logo: logo, |
