Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix test failures

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-07-30 21:44:57 +02:00
parent 65fe9ab784
commit 949366cf7b
5 changed files with 32 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
View File

@ -53,31 +53,23 @@
{% block sublayout_content %} {% block sublayout_content %}
<div class="row justify-content-center my-5"> <div class="row justify-content-center my-5">
{# Flash messages ! #} {% for flashMessage in app.session.flashbag.get('success') %}
{% if app.session.flashbag.keys()|length > 0 %} <div class="col-8 mb-5 alert alert-success flash_message">
<div class="col-8 mb-5 flash_message"> <span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="col-8 mb-5 alert alert-danger flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('success') %} {% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-success flash_message"> <div class="col-8 mb-5 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span> <span>{{ flashMessage|raw }}</span>
</div> </div>
{% endfor %} {% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="col-8 alert alert-danger flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
</div>
{% endif %}
{% block content %} {% block content %}
<div class="col-8 main_search"> <div class="col-8 main_search">

37
src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
View File

@ -27,30 +27,23 @@
<div class="row"> <div class="row">
<div class="col-md-9 my-5"> <div class="col-md-9 my-5">
{# Flash messages ! #} {% for flashMessage in app.session.flashbag.get('success') %}
{% if app.session.flashbag.keys()|length > 0 %} <div class="col-8 mb-5 alert alert-success flash_message">
<div class="row justify-content-center mb-5"> <span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('success') %} {% for flashMessage in app.session.flashbag.get('error') %}
<div class="col-8 alert alert-success flash_message"> <div class="col-8 mb-5 alert alert-danger flash_message">
<span>{{ flashMessage|raw }}</span> <span>{{ flashMessage|raw }}</span>
</div> </div>
{% endfor %} {% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %} {% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-danger flash_message"> <div class="col-8 mb-5 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span> <span>{{ flashMessage|raw }}</span>
</div> </div>
{% endfor %} {% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="col-8 alert alert-warning flash_message">
<span>{{ flashMessage|raw }}</span>
</div>
{% endfor %}
</div>
{% endif %}
{% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty --> {% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
{% endblock %} {% endblock %}

3
src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
View File

@ -45,12 +45,13 @@
</span> </span>
{% endif %} {% endif %}
{% set address = null %}
{%- if person.currentHouseholdAddress is not empty -%} {%- if person.currentHouseholdAddress is not empty -%}
{% set address = person.currentHouseholdAddress %} {% set address = person.currentHouseholdAddress %}
{%- elseif person.lastAddress is not empty -%} {%- elseif person.lastAddress is not empty -%}
{% set address = person.lastAddress %} {% set address = person.lastAddress %}
{%- endif -%} {%- endif -%}
{%- if address -%} {%- if address is not null -%}
<span class=" d-block d-sm-inline-block"> <span class=" d-block d-sm-inline-block">
{{ address|chill_entity_render_box({ {{ address|chill_entity_render_box({
'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true 'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true

2
src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
View File

@ -36,8 +36,6 @@
{{ form_row(form.gender, { 'label' : 'Gender'|trans }) }} {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
{{ form_row(form.creation_date, { 'label' : 'Creation date'|trans }) }}
{{ form_rest(form) }} {{ form_rest(form) }}
<button class="btn btn-create" type="submit" alt="add a person"> <button class="btn btn-create" type="submit" alt="add a person">

3
src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
View File

@ -77,9 +77,6 @@
<dt>{{ 'Gender'|trans }}</dt> <dt>{{ 'Gender'|trans }}</dt>
<dd>{{ gender|trans }}</dd> <dd>{{ gender|trans }}</dd>
<dt>{{ 'Creation date'|trans }}</dt>
<dd>{{ creation_date|format_date('long') }}</dd>
{% if form.altNames is defined %} {% if form.altNames is defined %}
{# mark as rendered #} {# mark as rendered #}
{{ form_widget(form.altNames) }} {{ form_widget(form.altNames) }}