From 9b0613f27f4634dc4a63319259c700263747df76 Mon Sep 17 00:00:00 2001
From: Albert Bartok-Partay <apbartok@gmail.com>
Date: Thu, 4 Oct 2018 13:47:38 +0100
Subject: [PATCH 1/2] added markdown parsing to textarea labels, in the spirit
 of f19a65b7dfa2e369d9e20ef07816ed6ad5497495

---
 templates/forms/fields/textarea/textarea.html.twig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig
index e9c08039..87be3383 100644
--- a/templates/forms/fields/textarea/textarea.html.twig
+++ b/templates/forms/fields/textarea/textarea.html.twig
@@ -1,7 +1,19 @@
 {% extends "forms/field.html.twig" %}
 
+{% block label %}
+{% endblock %}
+
 {% block input %}
+    {% set id = field.id|default(field.name) ~ '-' ~ key %}
     <div class="{{ form_field_wrapper_classes ?: 'form-textarea-wrapper' }} {{ field.size }} {{ field.wrapper_classes }}">
+        <label style="display:inline;" class="inline" for="{{ id|e }}">
+            {% if field.markdown %}
+                {{ field.label|t|markdown(false) }}
+            {% else %}
+                {{ field.label|t|e }}
+            {% endif %}
+            {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
+        </label>
         <textarea
             {# required attribute structures #}
             name="{{ (scope ~ field.name)|fieldName }}"

From c4fd8e6cd96eed6fcc681e35d48e08495f73b940 Mon Sep 17 00:00:00 2001
From: Albert Bartok <albert.bartok-partay@stfc.ac.uk>
Date: Tue, 27 Nov 2018 14:04:14 +0000
Subject: [PATCH 2/2] rearranged code in label block

---
 .../forms/fields/checkbox/checkbox.html.twig   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig
index 64cad540..bda581e6 100644
--- a/templates/forms/fields/checkbox/checkbox.html.twig
+++ b/templates/forms/fields/checkbox/checkbox.html.twig
@@ -1,10 +1,18 @@
 {% extends "forms/field.html.twig" %}
 
 {% block label %}
+    {% set id = field.id|default(field.name) ~ '-' ~ key %}
+        <label style="display:inline;" class="inline" for="{{ id|e }}">
+            {% if field.markdown %}
+                {{ field.label|t|markdown(false) }}
+            {% else %}
+                {{ field.label|t|e }}
+            {% endif %}
+            {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
+        </label>
 {% endblock %}
 
 {% block input %}
-    {% set id = field.id|default(field.name) ~ '-' ~ key %}
     <div class="{{ form_field_wrapper_classes ?: 'form-input-wrapper' }} {{ field.size }} {{ field.wrapper_classes }}">
         <input
             {# required attribute structures #}
@@ -24,13 +32,5 @@
                 {% if required %}required="required"{% endif %}
             {% endblock %}
             />
-        <label style="display:inline;" class="inline" for="{{ id|e }}">
-            {% if field.markdown %}
-                {{ field.label|t|markdown(false) }}
-            {% else %}
-                {{ field.label|t|e }}
-            {% endif %}
-            {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
-        </label>
     </div>
 {% endblock %}