Remove unnecessary fieldsets.

mysociety · Feb 8, 2023 · 21c6958 · 21c6958
1 parent 132131f
commit 21c6958
Show file tree

Hide file tree

Showing 27 changed files with 478 additions and 526 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@
         - Add missing label to alert distance input.
         - Give generated map tiles blank alt attribute.
         - Add fieldset to alert list and improve sort order.
+        - Remove unnecessary fieldsets.
         - Improve fancybox accessibility (text and focus).
     - Admin improvements:
         - Admin 'add user' form now always creates staff users

diff --git a/templates/web/base/alert/_updates.html b/templates/web/base/alert/_updates.html
@@ -13,30 +13,26 @@
 
     [% PROCESS 'auth/form_extra.html' %]
 
-    <fieldset>
-      [% IF c.user_exists %]
-        [% IF permissions.contribute_as_another_user %]
-          <label for="alert_rznvy">[% loc('Email') %]</label>
-          <div class="form-txt-submit-box">
-              <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
-              <input class="green-btn" type="submit" name="alert" value="[% loc('Subscribe') %]">
-          </div>
-        [% ELSE %]
+  [% IF c.user_exists %]
+    [% IF permissions.contribute_as_another_user %]
+      <label for="alert_rznvy">[% loc('Email') %]</label>
+      <div class="form-txt-submit-box">
+          <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
           <input class="green-btn" type="submit" name="alert" value="[% loc('Subscribe') %]">
-        [% END %]
-      [% ELSE %]
-        <label for="alert_rznvy">[% loc('Your email') %]</label>
-
-        <div class="form-txt-submit-box">
-            <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
-            <input class="green-btn" type="submit" name="alert" value="[% loc('Subscribe') %]">
-        </div>
-      [% END %]
-
-        <input type="hidden" name="token" value="[% csrf_token %]">
-        <input type="hidden" name="id" value="[% problem.id %]">
-        <input type="hidden" name="type" value="updates">
-    </fieldset>
+      </div>
+    [% ELSE %]
+      <input class="green-btn" type="submit" name="alert" value="[% loc('Subscribe') %]">
+    [% END %]
+  [% ELSE %]
+    <label for="alert_rznvy">[% loc('Your email') %]</label>
+
+    <div class="form-txt-submit-box">
+        <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
+        <input class="green-btn" type="submit" name="alert" value="[% loc('Subscribe') %]">
+    </div>
+  [% END %]
+
+    <input type="hidden" name="token" value="[% csrf_token %]">
+    <input type="hidden" name="id" value="[% problem.id %]">
+    <input type="hidden" name="type" value="updates">
 </form>
-
-
diff --git a/templates/web/base/auth/change_email.html b/templates/web/base/auth/change_email.html
@@ -20,7 +20,6 @@ <h1>[% title %]</h1>
 <form method="post" name="change_email">
     <input type="hidden" name="token" value="[% csrf_token %]">
 
-    <fieldset>
     [% IF username_error;
         errors = {
             missing_email = loc('Please enter your email'),
@@ -45,8 +44,6 @@ <h1>[% title %]</h1>
         <input type="submit" class="btn" value="[% title %]">
     </div>
 
-    </fieldset>
 </form>
 
-
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html
@@ -20,7 +20,6 @@ <h1>[% title %]</h1>
 <form action="[% c.uri_for_action('/auth/profile/change_password') %]" method="post" name="change_password" class="fieldset">
     <input type="hidden" name="token" value="[% csrf_token %]">
 
-    <fieldset>
     [% IF password_error == 'failed' %]
         <div class="form-error">[% field_errors.password_register %]</div>
     [% ELSIF password_error;
@@ -55,7 +54,6 @@ <h1>[% title %]</h1>
         <input type="submit" class="btn" value="[% title %]">
     </div>
 
-    </fieldset>
 </form>
 
 [% END %]

diff --git a/templates/web/base/auth/change_phone.html b/templates/web/base/auth/change_phone.html
@@ -24,7 +24,6 @@ <h1>[% title %]</h1>
 <form method="post" name="change_phone">
     <input type="hidden" name="token" value="[% csrf_token %]">
 
-    <fieldset>
     [% loc_username_error = INCLUDE 'auth/_username_error.html' default='phone' %]
     [% IF loc_username_error  %]
     <div class="form-error">[% loc_username_error %]</div>
@@ -44,8 +43,6 @@ <h1>[% title %]</h1>
         <input type="submit" class="btn" value="[% title %]">
     </div>
 
-    </fieldset>
 </form>
 
-
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/auth/create.html b/templates/web/base/auth/create.html
@@ -36,43 +36,41 @@ <h1>
 [% END %]
 
 <form action="/auth/[% expired_password ? 'expired' : forgotten ? 'forgot' : 'create' %]" method="post" name="general_auth" class="validate">
-    <fieldset>
 
-        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
+    <input type="hidden" name="r" value="[% c.req.params.r | html %]">
 
-    [% IF NOT expired_password %]
+  [% IF NOT expired_password %]
 
-        [% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]
+    [% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]
 
-        [% IF c.cobrand.sms_authentication %]
-            [% SET username_label = loc('Your email or mobile') %]
-        [% ELSE %]
-            [% SET username_label = loc('Your email') %]
-        [% END %]
+    [% IF c.cobrand.sms_authentication %]
+        [% SET username_label = loc('Your email or mobile') %]
+    [% ELSE %]
+        [% SET username_label = loc('Your email') %]
+    [% END %]
 
-        <label class="n" for="username">[% username_label %]</label>
-      [% IF loc_username_error %]
-        <div class="form-error">[% loc_username_error %]</div>
-      [% END %]
-        <input type="text" class="form-control required" id="username" name="username" value="[% username | html %]" autofocus autocomplete="username">
+    <label class="n" for="username">[% username_label %]</label>
+  [% IF loc_username_error %]
+    <div class="form-error">[% loc_username_error %]</div>
+  [% END %]
+    <input type="text" class="form-control required" id="username" name="username" value="[% username | html %]" autofocus autocomplete="username">
 
   [% END %]
 
-      [% IF field_errors.password_register %]
-        <p class='form-error'>[% field_errors.password_register %]</p>
-      [% END %]
-        <label for="password_register">[% forgotten ? loc('New password:') : loc('Your password') %]</label>
+  [% IF field_errors.password_register %]
+    <p class='form-error'>[% field_errors.password_register %]</p>
+  [% END %]
+    <label for="password_register">[% forgotten ? loc('New password:') : loc('Your password') %]</label>
 
-        <div class="general-notes">
-            <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
-        </div>
+    <div class="general-notes">
+        <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
+    </div>
 
-        <div class="form-txt-submit-box">
-            <input class="required form-control js-password-validate" type="password" name="password_register" id="password_register" value="" autocomplete="new-password">
-            <input class="green-btn" type="submit" name="sign_in_by_code" value="[% expired_password ? loc('Reset') : loc('Sign in') %]">
-        </div>
+    <div class="form-txt-submit-box">
+        <input class="required form-control js-password-validate" type="password" name="password_register" id="password_register" value="" autocomplete="new-password">
+        <input class="green-btn" type="submit" name="sign_in_by_code" value="[% expired_password ? loc('Reset') : loc('Sign in') %]">
+    </div>
 
-    </fieldset>
 </form>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html
@@ -17,9 +17,8 @@ <h1>
 [% END %]
 
 <form action="/auth" method="post" name="general_auth" class="validate">
-    <fieldset>
 
-        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
+    <input type="hidden" name="r" value="[% c.req.params.r | html %]">
 
 [% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %]
     [% IF c.config.FACEBOOK_APP_ID %]
@@ -77,7 +76,6 @@ <h1>
       </div>
 [% END %]
 
-    </fieldset>
 </form>
 
 [% INCLUDE 'footer.html' %]

diff --git a/templates/web/base/contact/enquiry/index.html b/templates/web/base/contact/enquiry/index.html
@@ -6,75 +6,75 @@
 <form method="post" action="/contact/enquiry/submit" class="validate" enctype="multipart/form-data">
     <input type="hidden" name="token" value="[% csrf_token %]">
     <input type="hidden" name="submit_problem" value="1">
-    <fieldset>
-        [% INCLUDE 'errors.html' %]
 
-        <label for="form_name">[% loc('Your name') %]</label>
-        [% IF field_errors.name %]
-           <div class="form-error">[% field_errors.name %]</div>
-        [% END %]
-        <input type="text" class="form-control required" name="name" id="form_name" value="[% ( form_name OR c.user.name ) | html %]" size="30">
+    [% INCLUDE 'errors.html' %]
 
-        <label for="form_email">[% loc('Your email') %]</label>
-        [% IF field_errors.username_register %]
-           <div class="form-error">[% field_errors.username_register %]</div>
-        [% END %]
-        <input type="text" class="form-control required email" name="username_register" id="form_email" [% "disabled" IF c.user.email %] value="[% ( email OR c.user.email ) | html %]" size="30">
+    <label for="form_name">[% loc('Your name') %]</label>
+    [% IF field_errors.name %]
+       <div class="form-error">[% field_errors.name %]</div>
+    [% END %]
+    <input type="text" class="form-control required" name="name" id="form_name" value="[% ( form_name OR c.user.name ) | html %]" size="30">
 
-        <div class="form-group">
-          <label for="form_phone">[% loc('Your phone number') %]</label>
-          <span class="required-text required-text--optional">[% loc('optional') %]</span>
-          <input type="text" class="form-control extra.phone" name="extra.phone" id="form_phone" value="[% report.user.phone | html %]" size="30">
-        </div>
+    <label for="form_email">[% loc('Your email') %]</label>
+    [% IF field_errors.username_register %]
+       <div class="form-error">[% field_errors.username_register %]</div>
+    [% END %]
+    <input type="text" class="form-control required email" name="username_register" id="form_email" [% "disabled" IF c.user.email %] value="[% ( email OR c.user.email ) | html %]" size="30">
 
-        <label for="form_category">[% loc('Subject') %]</label>
-        [% IF field_errors.category %]
-           <div class="form-error">[% field_errors.category %]</div>
-        [% END %]
-        <select class="form-control required" name="category" id="category">
-         <option value="">[% loc('-- Please select --') %]</option>
-        [% FOREACH contact IN contacts %]
-         [% NEXT IF contact.get_extra_field(, 'code', '_fms_disable_').disable_form == 'true' %]
-         <option value="[% contact.category | html %]" [% "selected" IF report.category == contact.category %]>[% contact.category | html %]</option>
-        [% END %]
-        </select>
+    <div class="form-group">
+      <label for="form_phone">[% loc('Your phone number') %]</label>
+      <span class="required-text required-text--optional">[% loc('optional') %]</span>
+      <input type="text" class="form-control extra.phone" name="extra.phone" id="form_phone" value="[% report.user.phone | html %]" size="30">
+    </div>
 
-        <label for="form_detail">[% loc('Message') %]</label>
-        [% IF field_errors.detail %]
-           <div class="form-error">[% field_errors.detail %]</div>
-        [% END %]
-        <textarea class="form-control required" name="detail" id="form_detail" rows="7" cols="50">[% report.detail | html %]</textarea>
+    <label for="form_category">[% loc('Subject') %]</label>
+    [% IF field_errors.category %]
+       <div class="form-error">[% field_errors.category %]</div>
+    [% END %]
+    <select class="form-control required" name="category" id="category">
+     <option value="">[% loc('-- Please select --') %]</option>
+    [% FOREACH contact IN contacts %]
+     [% NEXT IF contact.get_extra_field(, 'code', '_fms_disable_').disable_form == 'true' %]
+     <option value="[% contact.category | html %]" [% "selected" IF report.category == contact.category %]>[% contact.category | html %]</option>
+    [% END %]
+    </select>
+
+    <label for="form_detail">[% loc('Message') %]</label>
+    [% IF field_errors.detail %]
+       <div class="form-error">[% field_errors.detail %]</div>
+    [% END %]
+    <textarea class="form-control required" name="detail" id="form_detail" rows="7" cols="50">[% report.detail | html %]</textarea>
 
-         <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-         <label for="form_photo">
-            [% loc('Photos/Documents') %]
-         </label>
+     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
+     <label for="form_photo">
+        [% loc('Photos/Documents') %]
+     </label>
 
-         [% IF field_errors.photo %]
-            <p class='form-error'>[% field_errors.photo %]</p>
-         [% END %]
+     [% IF field_errors.photo %]
+        <p class='form-error'>[% field_errors.photo %]</p>
+     [% END %]
 
-         <div id="form_photos">
-            [% IF upload_fileid OR report.get_extra_metadata('enquiry_files').keys.count %]
-               <p>[% loc('You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
-               [% FOREACH id IN upload_fileid.split(',') %]
-                  <img align="right" src="/photo/temp.[% id %]" alt="">
-               [% END %]
+     <div id="form_photos">
+        [% IF upload_fileid OR report.get_extra_metadata('enquiry_files').keys.count %]
+           <p>[% loc('You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
+           [% FOREACH id IN upload_fileid.split(',') %]
+              <img align="right" src="/photo/temp.[% id %]" alt="">
+           [% END %]
 
-               [% IF report.get_extra_metadata('enquiry_files') %]
-                  [% FOREACH id IN report.get_extra_metadata('enquiry_files').values %]
-                     [% id %]<br />
-                  [% END %]
-                  <input type="hidden" name="enquiry_files" value="[% enquiry_files | html %]" />
-               [% END %]
-            [% END %]
-            <p><input type="file" name="photo1" id="form_photo"></p>
-            <p><input type="file" name="photo2" id="form_photo2"></p>
-            <p><input type="file" name="photo3" id="form_photo3"></p>
-         </div>
+           [% IF report.get_extra_metadata('enquiry_files') %]
+              [% FOREACH id IN report.get_extra_metadata('enquiry_files').values %]
+                 [% id %]<br />
+              [% END %]
+              <input type="hidden" name="enquiry_files" value="[% enquiry_files | html %]" />
+           [% END %]
+        [% END %]
+        <p><input type="file" name="photo1" id="form_photo"></p>
+        <p><input type="file" name="photo2" id="form_photo2"></p>
+        <p><input type="file" name="photo3" id="form_photo3"></p>
+     </div>
 
-        <input class="final-submit green-btn" type="submit" value="[% loc('Send') %]">
+    <input class="final-submit green-btn" type="submit" value="[% loc('Send') %]">
 
-    </fieldset></form>
+</form>
 
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]