diff --git a/templates/forms/default/data.html.twig b/templates/forms/default/data.html.twig index 0b394c75..c1cfbc14 100644 --- a/templates/forms/default/data.html.twig +++ b/templates/forms/default/data.html.twig @@ -10,7 +10,11 @@ {% block field %}
{% block field_label %} - {{ field.label|t|e }}: + {% if field.markdown %} + {{ field.label|t|markdown(false) }}: + {% else %} + {{ field.label|t|e }}: + {% endif %} {% endblock %} {% block field_value %} diff --git a/templates/forms/fields/checkboxes/checkboxes.html.twig b/templates/forms/fields/checkboxes/checkboxes.html.twig index d9b6b020..6c38130b 100644 --- a/templates/forms/fields/checkboxes/checkboxes.html.twig +++ b/templates/forms/fields/checkboxes/checkboxes.html.twig @@ -12,6 +12,8 @@ data-grav-field-name="{{ (scope ~ field.name)|fieldName }}" {% endblock %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %} {% for key, text in field.options %} diff --git a/templates/forms/fields/date/date.html.twig b/templates/forms/fields/date/date.html.twig index 4e42985c..b875b4d2 100644 --- a/templates/forms/fields/date/date.html.twig +++ b/templates/forms/fields/date/date.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="date" {% if field.validate.min %}min="{{ field.validate.min }}"{% endif %} diff --git a/templates/forms/fields/display/display.html.twig b/templates/forms/fields/display/display.html.twig index 37d7382e..62566f5d 100644 --- a/templates/forms/fields/display/display.html.twig +++ b/templates/forms/fields/display/display.html.twig @@ -6,6 +6,8 @@ {% set content = field.content %} {% endif %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %}
{% if field.markdown %} diff --git a/templates/forms/fields/email/email.html.twig b/templates/forms/fields/email/email.html.twig index aa33dcf8..362243bf 100644 --- a/templates/forms/fields/email/email.html.twig +++ b/templates/forms/fields/email/email.html.twig @@ -1,7 +1,9 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="email" {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %} {{ parent() }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/forms/fields/file/file.html.twig b/templates/forms/fields/file/file.html.twig index 8476eed1..bd5b7c93 100644 --- a/templates/forms/fields/file/file.html.twig +++ b/templates/forms/fields/file/file.html.twig @@ -58,6 +58,8 @@ {% do config.set('forms.dropzone.enabled', true) %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %} {% set page_can_upload = exists or (type == 'page' and not exists and not (field.destination starts with '@self' or field.destination starts with 'self@')) %} {% set max_filesize = (field.filesize > form_max_filesize or field.filesize == 0) ? form_max_filesize : field.filesize %} diff --git a/templates/forms/fields/label/label.html.twig b/templates/forms/fields/label/label.html.twig new file mode 100644 index 00000000..409efd8a --- /dev/null +++ b/templates/forms/fields/label/label.html.twig @@ -0,0 +1,7 @@ +{% block label %} + {% if field.markdown %} + {{ field.label|t|markdown(false) }} + {% else %} + {{ field.label|t|e }} + {% endif %} +{% endblock %} diff --git a/templates/forms/fields/month/month.html.twig b/templates/forms/fields/month/month.html.twig index 36c0fc23..ae253f18 100644 --- a/templates/forms/fields/month/month.html.twig +++ b/templates/forms/fields/month/month.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="month" {{ parent() }} diff --git a/templates/forms/fields/password/password.html.twig b/templates/forms/fields/password/password.html.twig index 937eb2a6..82a24f2d 100644 --- a/templates/forms/fields/password/password.html.twig +++ b/templates/forms/fields/password/password.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="password" {{ parent() }} diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig index 23b0df47..c898073a 100644 --- a/templates/forms/fields/radio/radio.html.twig +++ b/templates/forms/fields/radio/radio.html.twig @@ -3,6 +3,8 @@ {% set originalValue = value %} {% set value = (value is null ? field.default : value) %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %} {% for key, text in field.options %} {% set id = field.id|default(field.name) ~ '-' ~ key %} diff --git a/templates/forms/fields/range/range.html.twig b/templates/forms/fields/range/range.html.twig index 3b04284d..d4e75ebe 100644 --- a/templates/forms/fields/range/range.html.twig +++ b/templates/forms/fields/range/range.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="range" {% if field.validate.min %}min="{{ field.validate.min }}"{% endif %} diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig index b2b55f6d..f40358b2 100644 --- a/templates/forms/fields/select/select.html.twig +++ b/templates/forms/fields/select/select.html.twig @@ -5,6 +5,8 @@ {{ parent() }} {% endblock %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %}
diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig index 6ff616a0..6e9f595a 100644 --- a/templates/forms/fields/textarea/textarea.html.twig +++ b/templates/forms/fields/textarea/textarea.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input %}
{% block prepend %}{% endblock prepend %} diff --git a/templates/forms/fields/time/time.html.twig b/templates/forms/fields/time/time.html.twig index b6bb10ec..bf119983 100644 --- a/templates/forms/fields/time/time.html.twig +++ b/templates/forms/fields/time/time.html.twig @@ -1,5 +1,7 @@ {% extends "forms/field.html.twig" %} +{% use "forms/fields/label/label.html.twig" %} + {% block input_attributes %} type="time" {{ parent() }}