Skip to content

added markdown parsing to textarea labels, in the spirit of f19a65b7d… #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albapa wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

added markdown parsing to textarea labels, in the spirit of f19a65b7d… #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b0613f
added markdown parsing to textarea labels, in the spirit of f19a65b7d…
albapa Oct 4, 2018
c4fd8e6
rearranged code in label block
Nov 27, 2018
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
18 changes: 9 additions & 9 deletions templates/forms/fields/checkbox/checkbox.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 #}
Expand All @@ -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 %}
12 changes: 12 additions & 0 deletions templates/forms/fields/textarea/textarea.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}">
Copy link
Member

@rhukster rhukster Nov 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of putting the label in this input block and not the label block? This will change the display on all forms with textarea as the div/class structure is changed.

Copy link
Author

@albapa albapa Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's right. I've rearranged the code now. Let me know if that looks better!

{% 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 }}"
Expand Down