Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion templates/forms/default/data.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
{% block field %}
<div>
{% block field_label %}
<strong>{{ field.label|t|e }}</strong>:
{% if field.markdown %}
<strong>{{ field.label|t|markdown(false) }}</strong>:
{% else %}
<strong>{{ field.label|t|e }}</strong>:
{% endif %}
{% endblock %}

{% block field_value %}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/checkboxes/checkboxes.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/date/date.html.twig
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/display/display.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
{% set content = field.content %}
{% endif %}

{% use "forms/fields/label/label.html.twig" %}

{% block input %}
<div class="form-display-wrapper {{ field.size }} {{ field.classes }}" {% if field.id is defined %}id="{{ field.id|e }}" {% endif %}>
{% if field.markdown %}
Expand Down
4 changes: 3 additions & 1 deletion templates/forms/fields/email/email.html.twig
Original file line number Diff line number Diff line change
@@ -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 %}
{% endblock %}
2 changes: 2 additions & 0 deletions templates/forms/fields/file/file.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
7 changes: 7 additions & 0 deletions templates/forms/fields/label/label.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% block label %}
{% if field.markdown %}
{{ field.label|t|markdown(false) }}
{% else %}
{{ field.label|t|e }}
{% endif %}
{% endblock %}
2 changes: 2 additions & 0 deletions templates/forms/fields/month/month.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block input_attributes %}
type="month"
{{ parent() }}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/password/password.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block input_attributes %}
type="password"
{{ parent() }}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/radio/radio.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/range/range.html.twig
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/select/select.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
{{ parent() }}
{% endblock %}

{% use "forms/fields/label/label.html.twig" %}

{% block input %}
<div class="{{ form_field_wrapper_classes ?: 'form-select-wrapper' }} {{ field.size }} {{ field.wrapper_classes }}">
<select name="{{ (scope ~ field.name)|fieldName ~ (field.multiple ? '[]' : '') }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
{{ parent() }}
{% endblock %}

{% use "forms/fields/label/label.html.twig" %}

{% block input %}
<div class="{{ form_field_wrapper_classes ?: 'form-select-wrapper' }} {{ field.size }} {{ field.wrapper_classes }}">
<select name="{{ (scope ~ field.name)|fieldName ~ (field.multiple ? '[]' : '') }}"
Expand Down
4 changes: 3 additions & 1 deletion templates/forms/fields/tel/tel.html.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block input_attributes %}
type="tel"
{{ parent() }}
{% endblock %}
{% endblock %}
2 changes: 2 additions & 0 deletions templates/forms/fields/text/text.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block prepend %}
{% if field.prepend %}
<div class="form-input-addon form-input-prepend">
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/textarea/textarea.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block input %}
<div class="{{ form_field_wrapper_classes ?: 'form-textarea-wrapper' }} {{ field.size }} {{ field.wrapper_classes }}">
{% block prepend %}{% endblock prepend %}
Expand Down
2 changes: 2 additions & 0 deletions templates/forms/fields/time/time.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "forms/field.html.twig" %}

{% use "forms/fields/label/label.html.twig" %}

{% block input_attributes %}
type="time"
{{ parent() }}
Expand Down