aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/alert/_list.html1
-rw-r--r--templates/web/base/alert/updates.html2
-rw-r--r--templates/web/base/auth/form_extra.html0
-rw-r--r--templates/web/base/report/display_tools.html1
-rw-r--r--templates/web/base/report/form/user_loggedout_by_email.html2
-rwxr-xr-xtemplates/web/fixmystreet.com/about/privacy.html6
-rw-r--r--templates/web/fixmystreet.com/auth/form_extra.html4
-rw-r--r--templates/web/tfl/front/pre-steps.html5
8 files changed, 17 insertions, 4 deletions
diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html
index 782989a5c..e6c5183e4 100644
--- a/templates/web/base/alert/_list.html
+++ b/templates/web/base/alert/_list.html
@@ -62,6 +62,7 @@
</div>
[% END %]
+ [% PROCESS 'auth/form_extra.html' %]
<div class="alerts__cta-box">
<h3>[% loc('Subscribe by email') %]</h3>
diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html
index 0fbed2254..40380849f 100644
--- a/templates/web/base/alert/updates.html
+++ b/templates/web/base/alert/updates.html
@@ -15,6 +15,8 @@
</p>
<form action="/alert/subscribe" method="post">
+ [% PROCESS 'auth/form_extra.html' %]
+
<fieldset>
[% IF c.user_exists %]
[% IF c.user.has_permission_to("contribute_as_another_user", problem.bodies_str_ids) %]
diff --git a/templates/web/base/auth/form_extra.html b/templates/web/base/auth/form_extra.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/base/auth/form_extra.html
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index 4c79e4b71..532c78ec8 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -44,6 +44,7 @@
<img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0">
</a>
[% loc('Receive email when updates are left on this problem.' ) %]</p>
+ [% PROCESS 'auth/form_extra.html' %]
<fieldset>
[% IF c.user_exists %]
[% IF permissions.contribute_as_another_user %]
diff --git a/templates/web/base/report/form/user_loggedout_by_email.html b/templates/web/base/report/form/user_loggedout_by_email.html
index 33526cc46..459428059 100644
--- a/templates/web/base/report/form/user_loggedout_by_email.html
+++ b/templates/web/base/report/form/user_loggedout_by_email.html
@@ -62,6 +62,8 @@
<input class="form-control js-password-validate" type="password" name="password_register" id="password_register" aria-describedby="password_register_hint" value="">
+ [% PROCESS 'auth/form_extra.html' %]
+
<input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
</div>
diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html
index 8ed953cc9..665b0968b 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.
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/tfl/front/pre-steps.html b/templates/web/tfl/front/pre-steps.html
index ee22f4978..1dead5c89 100644
--- a/templates/web/tfl/front/pre-steps.html
+++ b/templates/web/tfl/front/pre-steps.html
@@ -6,6 +6,7 @@
safety critical issues.
</strong>
<br>
- We will continue to serve you the best that we can but urge everyone not to
- make journeys unless absolutely necessary.
+ If you are concerned about pavement overcrowding during social distancing
+ on the Transport for London Road Network, you can now report that to us
+ here.
</p>