From 3f41090a9428934bef480baceb07b4eae8a84fd4 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 13 Feb 2017 09:50:26 +0000
Subject: [PATCH] Fix duplicate labels on form inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s invalid HTML to have multiple labels nested within each other. This
was happening by accident because WTForms tries to be clever – when you
put `{{ field.label }}` in a template it prints a `<label>` tag for you,
not just the text of the label. But we put our own `<label>` tags in the
HTML to have more control of them.

This commit stops WTForms being so clever.
---
 app/templates/components/checkbox.html    | 4 ++--
 app/templates/components/file-upload.html | 2 +-
 app/templates/components/list-entry.html  | 2 +-
 app/templates/components/radios.html      | 6 +++---
 app/templates/components/textbox.html     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/components/checkbox.html b/app/templates/components/checkbox.html
index 5ae251520..3e71a949c 100644
--- a/app/templates/components/checkbox.html
+++ b/app/templates/components/checkbox.html
@@ -9,7 +9,7 @@
 ) %}
     <label class="{% if block %}block-label{% endif %}" for="{{ field.name }}">
         {{ field()}}
-        {{ field.label }}
+        {{ field.label.text }}
         {% if hint %}
             <span class="form-hint">
                 {{ hint }}
@@ -26,4 +26,4 @@
             </p>
         {% endif %}
     </label>
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/app/templates/components/file-upload.html b/app/templates/components/file-upload.html
index 89f4ea25d..f6ade8216 100644
--- a/app/templates/components/file-upload.html
+++ b/app/templates/components/file-upload.html
@@ -1,7 +1,7 @@
 {% macro file_upload(field, button_text="Choose file", alternate_link=None, alternate_link_text=None) %}
   <form method="post" enctype="multipart/form-data" class="{% if field.errors %}error{% endif %}" data-module="file-upload">
     <label class="file-upload-label" for="{{ field.name }}">
-      <span class="visually-hidden">{{ field.label }}</span>
+      <span class="visually-hidden">{{ field.label.text }}</span>
       {% if hint %}
         <span class="form-hint">
           {{ hint }}
diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html
index 4bf239b5d..2b72d26e1 100644
--- a/app/templates/components/list-entry.html
+++ b/app/templates/components/list-entry.html
@@ -11,7 +11,7 @@
     <fieldset class="form-group{% if field.errors %} error{% endif %}" id="{{ field.name }}">
       <legend>
         <span class="form-label">
-          {{ field.label }}
+          {{ field.label.text }}
           {% if hint %}
             <span class="form-hint">
               {{ hint }}
diff --git a/app/templates/components/radios.html b/app/templates/components/radios.html
index a24c49d1c..946dff22b 100644
--- a/app/templates/components/radios.html
+++ b/app/templates/components/radios.html
@@ -7,7 +7,7 @@
   <div class="form-group {% if field.errors %} error{% endif %}">
     <fieldset>
       <legend class="form-label">
-        {{ field.label }}
+        {{ field.label.text }}
         {% if field.errors %}
           <span class="error-message">
             {{ field.errors[0] }}
@@ -46,7 +46,7 @@
  <div class="{{ wrapping_class }} {% if field.errors %} error{% endif %}">
    <fieldset>
      <legend class="form-label">
-       {{ field.label }}
+       {{ field.label.text }}
        {% if field.errors %}
          <span class="error-message">
            {{ field.errors[0] }}
@@ -80,7 +80,7 @@
   <div class="form-group {% if field.errors %} error{% endif %}">
     <fieldset>
       <legend class="form-label">
-        {{ field.label }}
+        {{ field.label.text }}
         {% if field.errors %}
           <span class="error-message">
             {{ field.errors[0] }}
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index 40d141072..450059b59 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -16,7 +16,7 @@
       {% if label %}
         {{ label }}
       {% else %}
-        {{ field.label }}
+        {{ field.label.text }}
       {% endif %}
       {% if hint %}
         <span class="form-hint">