diff options
Diffstat (limited to 'templates/web/fixmystreet.com')
9 files changed, 53 insertions, 8 deletions
diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html index 8ed953cc9..9e1316819 100755 --- a/templates/web/fixmystreet.com/about/privacy.html +++ b/templates/web/fixmystreet.com/about/privacy.html @@ -287,8 +287,10 @@ When you make a report </p> <p> + Personal details will automatically be removed from our database after two + years of inactivity of the associated account. Please <a href="/contact">contact us</a> if you would like your details to be removed from our admin - database. + database sooner than that. </p> <h3> @@ -297,7 +299,7 @@ When you make a report <p> If you contact FixMyStreet via our support email address we keep your message for two - years at which point they will be automatically deleted.. This is to aid continuity + years at which point it will be automatically deleted. This is to aid continuity and so that we can view any historic context which may have bearing on subsequent support mail, even if members of the support staff change. Support staff adhere to internal privacy policies which may be viewed on request. @@ -383,7 +385,7 @@ the cookies and services that this site can use. <tr> <td>fixmystreet_app_session</td> <td nowrap>A random unique identifier</td> - <td>When browser is closed, or four weeks if “Keep me signed in” is ticked</td> + <td>When browser is closed</td> </tr> </table> diff --git a/templates/web/fixmystreet.com/around/location_error.html b/templates/web/fixmystreet.com/around/location_error.html new file mode 100644 index 000000000..4e4ac8736 --- /dev/null +++ b/templates/web/fixmystreet.com/around/location_error.html @@ -0,0 +1,31 @@ +[% IF location_error_pc_lookup %] + + <div class="search-help"> + <h2 class="search-help__header" role="alert"> + [% location_error | safe %] + </h2> + + <div class="search-help__tips"> + <div class="search-help__tips__category"> + <h3>[% loc('Searching by postcode?') %]</h3> + <ul> + <li>[% loc('Check you <strong>haven’t swapped numbers and letters</strong>. <code>O</code>, <code>0</code>, <code>I</code> and <code>1</code> aren’t the same.') %]</li> + <li>[% loc('<strong>Don’t forget the space</strong> in your postcode.') %]</li> + <li>[% loc('<strong>Don’t mix postcodes and street names.</strong>') %]</li> + </ul> + </div> + <div class="search-help__tips__category"> + <h3>[% loc('Searching by street name?') %]</h3> + <ul> + <li>[% loc('<strong>One at a time!</strong> Multiple street names in a single search can confuse us.') %]</li> + <li>[% loc('If you’re <strong>not sure on the spelling</strong>, try another nearby street you <em>are</em> sure about, then trace your way back on our map.') %]</li> + </ul> + </div> + </div> + </div> + +[% ELSE %] + + <p class="form-error">[% location_error | safe %]</p> + +[% END %] diff --git a/templates/web/fixmystreet.com/auth/form_extra.html b/templates/web/fixmystreet.com/auth/form_extra.html new file mode 100644 index 000000000..92cc31050 --- /dev/null +++ b/templates/web/fixmystreet.com/auth/form_extra.html @@ -0,0 +1,4 @@ +[% IF c.cobrand.requires_recaptcha %] + <script nonce="[% csp_nonce %]" src="https://www.google.com/recaptcha/api.js" async defer></script> + <div class="g-recaptcha" data-sitekey="[% c.config.RECAPTCHA.site_key %]"></div> +[% END %] diff --git a/templates/web/fixmystreet.com/contact/address.html b/templates/web/fixmystreet.com/contact/address.html index 2cea59684..c1d61d24f 100644 --- a/templates/web/fixmystreet.com/contact/address.html +++ b/templates/web/fixmystreet.com/contact/address.html @@ -1,7 +1,7 @@ <hr> -<p>FixMyStreet is a service provided by mySociety, which is the project of a -registered charity, UK Citizens Online Democracy, charity number 1076346.</p> +<p>FixMyStreet is a service provided by mySociety, which is a +registered charity, charity number 1076346.</p> <p>If you wish to contact us by post, our address is <address>mySociety, 483 Green Lanes, London, N13 4BS, UK.</address></p> diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index 699d7de8b..b1cb0572e 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -70,7 +70,12 @@ <div class="col-sm-4"> <div class="mysoc-footer__legal"> - <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p> + <p> + <a href="https://www.societyworks.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">SocietyWorks</a> + is a limited company (05798215). It is a trading subsidiary of + <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mySociety</a>, + a registered charity in England and Wales (1076346). + </p> </div> </div> diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html index 289e230e7..2a4f9ed9c 100644 --- a/templates/web/fixmystreet.com/footer_extra_js.html +++ b/templates/web/fixmystreet.com/footer_extra_js.html @@ -16,6 +16,7 @@ IF bodyclass.match('mappage'); scripts.push( version('/cobrands/lincolnshire/assets.js') ); scripts.push( version('/cobrands/northamptonshire/assets.js') ); scripts.push( version('/cobrands/hounslow/assets.js') ); + scripts.push( version('/cobrands/oxfordshire/assets.js') ); scripts.push( version('/cobrands/westminster/assets.js') ); scripts.push( version('/cobrands/peterborough/assets.js') ); scripts.push( version('/cobrands/tfl/assets.js') ); diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html index 2eab84c9e..82d4b289a 100644 --- a/templates/web/fixmystreet.com/report/_report_meta_info.html +++ b/templates/web/fixmystreet.com/report/_report_meta_info.html @@ -1,4 +1,4 @@ -[% problem.meta_line(c) | html %] +[% problem.meta_line(c.user) | html %] [% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %] using <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a> [% END %] diff --git a/templates/web/fixmystreet.com/report/_updates_disallowed_message.html b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html index d2d9cf83b..d7b3d383a 100644 --- a/templates/web/fixmystreet.com/report/_updates_disallowed_message.html +++ b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html @@ -1,4 +1,4 @@ -[% cfg = c.cobrand.updates_disallowed_config(problem).0 ~%] +[% cfg = c.cobrand.per_body_config('updates_allowed', problem).0 ~%] [% IF cfg.match('reporter') AND (NOT cfg.match('open') OR problem.is_open) %] <p> Only the original reporter may leave updates. diff --git a/templates/web/fixmystreet.com/report/update/form_state_checkbox.html b/templates/web/fixmystreet.com/report/update/form_state_checkbox.html index 16ae59bc8..41b8c4897 100644 --- a/templates/web/fixmystreet.com/report/update/form_state_checkbox.html +++ b/templates/web/fixmystreet.com/report/update/form_state_checkbox.html @@ -2,6 +2,8 @@ [% IF (problem.is_fixed OR problem.is_closed) AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] + [% RETURN IF c.cobrand.reopening_disallowed(problem) ~%] + <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF (update.mark_open || c.req.params.reopen) %]> [% IF problem.is_closed %] <label class="inline" for="form_reopen">[% loc('This problem is still ongoing') %]</label> |