diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2019-08-30 15:39:56 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2019-09-05 11:59:58 +0100 |
| commit | cd405cc208bd1efa36c0ab6e7d5af7e4e56be733 (patch) | |
| tree | bb185693345fe70a0852e371cb37d56a39be6c70 | |
| parent | 0430d26eaab142a324206e6444f93d069e56b906 (diff) | |
Remove HTML required email restriction.
In non-JS scenario, this means you must enter email in both boxes to
continue. JS still makes it required appropriately when available.
4 files changed, 2 insertions, 12 deletions
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 4ae3db868..33526cc46 100644 --- a/templates/web/base/report/form/user_loggedout_by_email.html +++ b/templates/web/base/report/form/user_loggedout_by_email.html @@ -25,11 +25,7 @@ </div> [% END %] - [% IF c.cobrand.social_auth_enabled AND NOT email_required %] - [% PROCESS 'report/form/user_loggedout_email.html' name='username_register' required=0 %] - [% ELSE %] - [% PROCESS 'report/form/user_loggedout_email.html' name='username_register' required=1 %] - [% END %] + [% PROCESS 'report/form/user_loggedout_email.html' name='username_register' %] [% IF type != 'update' AND c.config.SMS_AUTHENTICATION %] [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %] diff --git a/templates/web/base/report/form/user_loggedout_email.html b/templates/web/base/report/form/user_loggedout_email.html index c32691eb4..9f631987b 100644 --- a/templates/web/base/report/form/user_loggedout_email.html +++ b/templates/web/base/report/form/user_loggedout_email.html @@ -15,6 +15,5 @@ [% END %] <input type="[% username_type %]" name="username" id="form_[% name %]" value="[% username_value | html %]" - [% IF required %]required[% END %] class="form-control required"> <!-- /user_loggedout_email.html --> diff --git a/templates/web/base/report/form/user_loggedout_password.html b/templates/web/base/report/form/user_loggedout_password.html index 02cfc9525..40a028b24 100644 --- a/templates/web/base/report/form/user_loggedout_password.html +++ b/templates/web/base/report/form/user_loggedout_password.html @@ -8,11 +8,7 @@ <a class="js-new-report-hide-sign-in" href="#">[% loc('Fill in your details manually.') %]</a> </p> - [% IF c.cobrand.social_auth_enabled %] - [% PROCESS 'report/form/user_loggedout_email.html' name='username_sign_in' required=0 %] - [% ELSE %] - [% PROCESS 'report/form/user_loggedout_email.html' name='username_sign_in' required=1 %] - [% END %] + [% PROCESS 'report/form/user_loggedout_email.html' name='username_sign_in' %] <label for="password_sign_in">[% loc('Your password') %]</label> [% IF field_errors.password %] diff --git a/templates/web/bromley/report/form/user_loggedout_email.html b/templates/web/bromley/report/form/user_loggedout_email.html index 78b4a0044..8aad16289 100644 --- a/templates/web/bromley/report/form/user_loggedout_email.html +++ b/templates/web/bromley/report/form/user_loggedout_email.html @@ -18,5 +18,4 @@ [% END %] <input type="[% username_type %]" name="username" id="form_[% name %]" value="[% username_value | html %]" - [% IF required %]required[% END %] class="form-control required"> |