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

Merge branch 'master' into 'master'

Browse Source 
change in view.html.twig (Ressources/views/Person) line 195 blockquote for email

See merge request !6
This commit is contained in:
Julien Fastré 2017-04-06 16:21:16 +02:00
commit 0fec548ff2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Resources/views/Person/view.html.twig
View File

@ -32,20 +32,20 @@ This view should receive those arguments:
the page the page
#} #}
{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig' %} {% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig' %}
{% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id }, {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
'form_path_key' : 'chill_person_general_edit' } %} 'form_path_key' : 'chill_person_general_edit' } %}
{% block personcontent %} {% block personcontent %}
<div class="person-view"> <div class="person-view">
<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent"> <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
{% if person.memo is not empty %} {% if person.memo is not empty %}
<div class="grid-12"> <div class="grid-12">
<figure class="person-details"> <figure class="person-details">
<h2 class="chill-red">{{ 'Memo'|trans }}</h2> <h2 class="chill-red">{{ 'Memo'|trans }}</h2>
<p> <p>
<blockquote>{{ person.memo|nl2br }}</blockquote> <blockquote>{{ person.memo|nl2br }}</blockquote>
</p> </p>
@ -55,14 +55,14 @@ This view should receive those arguments:
<div class="grid-6"> <div class="grid-6">
<figure class="person-details"> <figure class="person-details">
<h2 class="chill-red">{{ 'General information'|trans }}</h2> <h2 class="chill-red">{{ 'General information'|trans }}</h2>
<dl> <dl>
<dt>{{ 'First name'|trans }}&nbsp;:</dt> <dt>{{ 'First name'|trans }}&nbsp;:</dt>
<dd>{{ person.firstName }}</dd> <dd>{{ person.firstName }}</dd>
<dt>{{ 'Last name'|trans }}&nbsp;:</dt> <dt>{{ 'Last name'|trans }}&nbsp;:</dt>
<dd>{{ person.lastName }}</dd> <dd>{{ person.lastName }}</dd>
<dt>{{ 'Gender'|trans }}&nbsp;:</dt> <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
<dd>{{ ( person.gender|default('Not given'))|trans }}</dd> <dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
</dl> </dl>
@ -87,14 +87,14 @@ This view should receive those arguments:
<span class="chill-no-data-statement">{{ 'Unknown date of birth'|trans }}</span> <span class="chill-no-data-statement">{{ 'Unknown date of birth'|trans }}</span>
{%- endif -%} {%- endif -%}
</dd> </dd>
{%- if chill_person.fields.place_of_birth == 'visible' -%} {%- if chill_person.fields.place_of_birth == 'visible' -%}
<dt>{{ 'Place of birth'|trans }}&nbsp;:</dt> <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
<dd>{{ person.placeOfBirth }}</dd> <dd>{{ person.placeOfBirth }}</dd>
{%- endif -%} {%- endif -%}
{%- if chill_person.fields.country_of_birth == 'visible' -%} {%- if chill_person.fields.country_of_birth == 'visible' -%}
<dt>{{ 'Country of birth'|trans }}&nbsp;:</dt> <dt>{{ 'Country of birth'|trans }}&nbsp;:</dt>
<dd>{% spaceless %} <dd>{% spaceless %}
{% if person.countryOfBirth is not null %} {% if person.countryOfBirth is not null %}
{{ person.countryOfBirth.name|localize_translatable_string }} {{ person.countryOfBirth.name|localize_translatable_string }}
{% else %} {% else %}
@ -126,7 +126,7 @@ This view should receive those arguments:
{% else %} {% else %}
<span class="chill-no-data-statement">{{ 'Without nationality'|trans }}</span> <span class="chill-no-data-statement">{{ 'Without nationality'|trans }}</span>
{% endif %} {% endif %}
</dd> </dd>
</dl> </dl>
{%- endif -%} {%- endif -%}
{%- if chill_person.fields.spoken_languages == 'visible' -%} {%- if chill_person.fields.spoken_languages == 'visible' -%}
@ -180,7 +180,7 @@ This view should receive those arguments:
{{ 'Addresses\'history'|trans }} {{ 'Addresses\'history'|trans }}
</a> </a>
{%- else -%} {%- else -%}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span> <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
<a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class=""> <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="">
{{ 'Add an address'|trans }} {{ 'Add an address'|trans }}
</a> </a>
@ -188,11 +188,11 @@ This view should receive those arguments:
</dd> </dd>
</dl> </dl>
{%- endif -%} {%- endif -%}
{%- if chill_person.fields.email == 'visible' -%} {%- if chill_person.fields.email == 'visible' -%}
<dl> <dl>
<dt>{{ 'Email'|trans }}&nbsp;:</dt> <dt>{{ 'Email'|trans }}&nbsp;:</dt>
<dd>{% if person.email is not empty %}<pre>{{ person.email}}</pre>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd> <dd>{% if person.email is not empty %}<blockquote class="chill-user-quote">{{ person.email|nl2br }}</blockquote>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
</dl> </dl>
{%- endif -%} {%- endif -%}
{%- if chill_person.fields.phonenumber == 'visible' -%} {%- if chill_person.fields.phonenumber == 'visible' -%}
@ -216,7 +216,7 @@ This view should receive those arguments:
<div class="grid-12 custom-fields"> <div class="grid-12 custom-fields">
<figure class="person-details"> <figure class="person-details">
{{ chill_custom_fields_group_widget(person.cFData, cFGroup) }} {{ chill_custom_fields_group_widget(person.cFData, cFGroup) }}
</figure> </figure>
</div> </div>
</div> </div>