From f8dd08d194dcc71e6f08353808b7385fbd656e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 13 Nov 2016 21:02:10 +0100 Subject: [PATCH] adding div around title Those div are required to solve ref Chill-project/Chill-Person#12 --- .../views/CustomFieldsGroup/render.html.twig | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/Resources/views/CustomFieldsGroup/render.html.twig b/Resources/views/CustomFieldsGroup/render.html.twig index f726aa51d..78b7cdfcc 100644 --- a/Resources/views/CustomFieldsGroup/render.html.twig +++ b/Resources/views/CustomFieldsGroup/render.html.twig @@ -7,9 +7,30 @@ {%- set type_title = constant('Chill\\CustomFieldsBundle\\CustomFields\\CustomFieldTitle::TYPE_TITLE') -%} {# a variable to store that "something has been printed #} {%- set something_has_been_printed = false -%} +{%- set title_div_opened = false -%} +{%- set subtitle_div_opened = false -%} {% for customField in cFGroup.activeCustomFields %} {% if customField.type == 'title' %} {%- if show_empty == true %} + {%- if customField.options[type] == type_title -%} + {%- if title_div_opened == false -%} +
+ {%- set title_div_opened = true -%} + {%- else -%} + {%- if subtitle_div_opened == true -%} +
+ {%- set title_div_opened = false -%} + {%- endif -%} +
+ {%- endif -%} + {%- else -%} + {%- if subtitle_div_opened == false -%} +
+ {%- set subtitle_div_opened = true -%} + {%- else -%} +
+ {%- endif -%} + {%- endif -%} {{ chill_custom_field_widget(cFData , customField) }} {%- else -%} {# we keep the customfield in memory, and print it only if 'something' has been filled after the title #} @@ -24,10 +45,26 @@ {% else %} {%- if show_empty == true or (chill_custom_field_is_empty(cFData, customField) == false) -%} {%- if title is not empty -%} + {%- if title_div_opened == false -%} +
+ {%- set title_div_opened = true -%} + {%- else -%} + {%- if subtitle_div_opened == true -%} +
+ {%- set title_div_opened = false -%} + {%- endif -%} +
+ {%- endif -%} {{ chill_custom_field_widget(cFData, title) }} {%- set title = null -%} {%- endif -%} {%- if subtitle is not empty -%} + {%- if subtitle_div_opened == false -%} +
+ {%- set subtitle_div_opened = true -%} + {%- else -%} +
+ {%- endif -%} {{ chill_custom_field_widget(cFData, subtitle) }} {%- set subtitle = null -%} {%- endif -%} @@ -37,6 +74,12 @@ {%- endif -%} {%- endif -%} {% endfor %} +{%- if subtitle_div_opened == true -%} +
+{%- endif -%} +{%- if title_div_opened == true -%} +
+{%- endif -%} {% if something_has_been_printed == false %}
{{ 'Empty data'|trans }}
{{ 'No data to show' | trans }}