Remove form-focus-trigger/hidden behaviour.

5 files changed, 22 insertions, 39 deletions

diff --git a/templates/web/base/report/new/extra_name.html b/templates/web/base/report/new/extra_name.html
index bad03e37f..ac926b1e7 100644
--- a/templates/web/base/report/new/extra_name.html
+++ b/templates/web/base/report/new/extra_name.html
@@ -6,7 +6,7 @@
 [% title = '' %]
 [% IF fms_extra_title %][% title = fms_extra_title | upper %]
 [% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %]
-<select class="form-control form-focus-trigger required js-form-name" id="form_fms_extra_title"
+<select class="form-control required js-form-name" id="form_fms_extra_title"
     name="fms_extra_title">
     <option></option>
     <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option>
diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html
index a67e6e61e..135372bb7 100644
--- a/templates/web/base/report/new/form_user_loggedout_by_email.html
+++ b/templates/web/base/report/new/form_user_loggedout_by_email.html
@@ -7,39 +7,39 @@
 
     [% INCLUDE 'report/new/extra_name.html' %]
     [% PROCESS 'user/_anonymity.html' anonymous = report.anonymous %]
-    [% INCLUDE 'report/new/form_user_name.html' extra_class='form-focus-trigger' %]
+    [% INCLUDE 'report/new/form_user_name.html' %]
     [% INCLUDE 'report/_show_name_label.html' %]
 
     [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
         <div id="js-hide-if-username-phone">
-            <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
+            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
             [% IF field_errors.phone %]
               <p class='form-error'>[% field_errors.phone %]</p>
             [% END %]
-            <input class="form-control form-focus-hidden" type="text" value="[% phone | html %]" name="phone" id="form_phone">
+            <input class="form-control" type="text" value="[% phone | html %]" name="phone" id="form_phone">
         </div>
     [% END %]
     [% IF c.config.SMS_AUTHENTICATION %]
     <div id="js-hide-if-username-email">
-        <label class="form-focus-hidden" for="form_email">[% loc('Email address (optional)') %]</label>
-        <input class="form-control form-focus-hidden" type="text" value="[% email | html %]" name="email" id="form_email">
+        <label for="form_email">[% loc('Email address (optional)') %]</label>
+        <input class="form-control" type="text" value="[% email | html %]" name="email" id="form_email">
     </div>
     [% END %]
 
-    <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
+    <label for="password_register">[% loc('Password (optional)') %]</label>
   [% IF field_errors.password_register %]
     <p class='form-error'>[% field_errors.password_register %]</p>
   [% END %]
-    <div class="general-notes form-focus-hidden" id="password_register_hint">
+    <div class="general-notes" id="password_register_hint">
         <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
     </div>
 
-    <div class="form-txt-submit-box form-focus-hidden">
+    <div class="form-txt-submit-box">
         <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" aria-describedby="password_register_hint" value="">
         <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
     </div>
 
-    <div class="general-notes form-focus-hidden">
+    <div class="general-notes">
         <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
     </div>
 
diff --git a/templates/web/bromley/report/new/form_user_loggedout_by_email.html b/templates/web/bromley/report/new/form_user_loggedout_by_email.html
index 8c772ac53..e9ebee7f7 100644
--- a/templates/web/bromley/report/new/form_user_loggedout_by_email.html
+++ b/templates/web/bromley/report/new/form_user_loggedout_by_email.html
@@ -3,37 +3,37 @@
 
     [% INCLUDE 'report/new/extra_name.html' %]
     [% PROCESS 'user/_anonymity.html' anonymous = report.anonymous %]
-    [% INCLUDE 'report/new/form_user_name.html' extra_class='form-focus-trigger' %]
+    [% INCLUDE 'report/new/form_user_name.html' %]
     [% INCLUDE 'report/_show_name_label.html' %]
 
     [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
         <div id="js-hide-if-username-phone">
-            <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
+            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
             [% IF field_errors.phone %]
               <p class='form-error'>[% field_errors.phone %]</p>
             [% END %]
-            <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone">
+            <input class="form-control" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone">
         </div>
     [% END %]
     <div id="js-hide-if-username-email">
-        <label class="form-focus-hidden" for="form_email">[% loc('Email address (optional)') %]</label>
-        <input class="form-control form-focus-hidden" type="text" value="[% report.user.email | html %]" name="email" id="form_email">
+        <label for="form_email">[% loc('Email address (optional)') %]</label>
+        <input class="form-control" type="text" value="[% report.user.email | html %]" name="email" id="form_email">
     </div>
 
-    <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
+    <label for="password_register">[% loc('Password (optional)') %]</label>
   [% IF field_errors.password_register %]
     <p class='form-error'>[% field_errors.password_register %]</p>
   [% END %]
-    <div class="general-notes form-focus-hidden" id="password_register_hint">
+    <div class="general-notes" id="password_register_hint">
         <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
     </div>
 
-    <div class="form-txt-submit-box form-focus-hidden">
+    <div class="form-txt-submit-box">
         <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" aria-describedby="password_register_hint">
         <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
     </div>
 
-    <div class="general-notes form-focus-hidden">
+    <div class="general-notes">
         <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
     </div>
 
diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html
index 7dd539126..838b21bdb 100644
--- a/templates/web/fixamingata/report/new/form_user_loggedout.html
+++ b/templates/web/fixamingata/report/new/form_user_loggedout.html
@@ -18,7 +18,7 @@
             <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">
+        <input type="text" class="form-control validName js-form-name" value="[% report.name | html %]" name="name" id="form_name">
 
         [%# if there is nothing in the name field then set check box as default on form %]
         <div class="checkbox-group">
@@ -29,7 +29,7 @@
         <label for="form_phone">[% loc('Phone number (optional)') %]</label>
         <input type="text" class="form-control" value="[% report.user.phone_display | html %]" name="phone" id="form_phone">
 
-        <div class="general-notes form-focus-hidden">
+        <div class="general-notes">
             <p>Vi visar inte din e-postadress eller ditt telefonnummer publikt.</p>
         </div>
 
@@ -38,7 +38,7 @@
         <p class='form-error'>[% field_errors.password_register %]</p>
       [% END %]
 
-        <div class="general-notes form-focus-hidden" id="password_register_hint">
+        <div class="general-notes" id="password_register_hint">
             <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
         </div>
 
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 15cc6b26a..e2f72be94 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -897,22 +897,6 @@ $.extend(fixmystreet.set_up, {
     }
   },
 
-  form_focus_triggers: function() {
-    // If all of the form-focus-triggers are empty, hide form-focus-hidden.
-    // (If the triggers aren't empty, then chances are we're being re-shown
-    // the form after a validation error, so don't hide form-focus-hidden.)
-    // Unhide form-focus-hidden when any of the triggers are focussed.
-    var form_focus_data = $('.form-focus-trigger').map(function() {
-        return $(this).val();
-    }).get().join('');
-    if (!form_focus_data) {
-        $('.form-focus-hidden').hide();
-        $('.form-focus-trigger').on('focus', function() {
-            $('.form-focus-hidden').fadeIn(500);
-        });
-    }
-  },
-
   alert_page_buttons: function() {
     // Go directly to RSS feed if RSS button clicked on alert page
     // (due to not wanting around form to submit, though good thing anyway)
@@ -1332,7 +1316,6 @@ fixmystreet.display = {
             fixmystreet.set_up.email_login_form();
             fixmystreet.set_up.fancybox_images();
             fixmystreet.set_up.dropzone($sideReport);
-            fixmystreet.set_up.form_focus_triggers();
             fixmystreet.run(fixmystreet.set_up.moderation);
             fixmystreet.run(fixmystreet.set_up.response_templates);