diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 0563e2541..f30c42eda 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -1,65 +1,55 @@ {% extends "ChillMainBundle::layout.html.twig" %} {% block css %} - {% stylesheets output="css/all.css" filter="cssrewrite" - "bundles/clchillperson/css/person.css" + "bundles/chillperson/css/person.css" %} {% endstylesheets %} - - {% endblock %} {% block content %} -
-

- {{ person.surname }} - {{ person.name }} {% spaceless %} - {% if person.isOpen == false %} - - {% endif %} - {% endspaceless %} -

+

+ {{ person.surname }} + {{ person.name }} {% spaceless %} + {% if person.isOpen == false %} + + {% endif %} + {% endspaceless %} +

-

{% spaceless %} - {% if person.dateOfBirth == null %} - {{ 'person.without_date_of_birth'|trans }}, {{ ('person.gender.' ~ - person.genre)|trans }} +

{% spaceless %} + {% if person.dateOfBirth == null %} + {{ 'person.without_date_of_birth'|trans }}, {{ ('person.gender.' ~ + person.genre)|trans }} + {% else %} + {% transchoice person.genreNumeric + with {'%date%' : person.dateOfBirth.format('d-m-Y')} %}views.layout.born{% endtranschoice %} + + {% endif %} + {% endspaceless %}

+ {% if person.nationality is not null %} +

{{ person.nationality.label }}

{% else %} - {% transchoice person.genreNumeric - with {'%date%' : person.dateOfBirth.format('d-m-Y')} %}views.layout.born{% endtranschoice %} - - {% endif %} - {% endspaceless %}

- {% if person.nationality is not null %} -

{{ person.nationality.label }}

- {% else %} -

{% trans %}views.layout.without_nationality{% endtrans %}

- {% endif %} +

{% trans %}views.layout.without_nationality{% endtrans %}

+ {% endif %}
+
- - -
- {# Note: activeRouteKey should be defined in Controller or child layout #} - {{ chill_menu('person', { - 'layout': 'ChillPersonBundle::menu.html.twig', - 'args' : {'person_id': person.id }, - 'activeRouteKey': activeRouteKey - }) }} +
+ {# Note: activeRouteKey should be defined in Controller or child layout #} + {{ chill_menu('person', { + 'layout': 'ChillPersonBundle::menu.html.twig', + 'args' : {'person_id': person.id }, + 'activeRouteKey': activeRouteKey + }) }} -
- - {% block personcontent %}{%endblock%} - -
+
+ {% block personcontent %}{%endblock%} +
-
- - - {% endblock %} +{% endblock %} \ No newline at end of file diff --git a/Resources/views/menu.html.twig b/Resources/views/menu.html.twig index f47d98440..0524f3a42 100644 --- a/Resources/views/menu.html.twig +++ b/Resources/views/menu.html.twig @@ -1,15 +1,13 @@ -
+
-
\ No newline at end of file