Merge branch add-location-period into 'master'

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -27,6 +27,11 @@
                 </a>
             </span>
         </div>
+        {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+            <div class="alert alert-danger">
+                {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
+            </div>
+        {% endif %}
     {% endif %}
 
     <h1>{{ 'Resume Accompanying Course'|trans }}</h1>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig

@@ -6,9 +6,9 @@
 {% block content %}
 <div class="accompanying_course_work-edit">
 
-            <h1>{{ block('title') }}</h1>
+    <h1>{{ block('title') }}</h1>
 
-            <div id="accompanying_course_work_edit"></div>
+    <div id="accompanying_course_work_edit"></div>
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -58,6 +58,15 @@
                 (person.gender == 'man') ? 'man' : 'neuter' %}
             <p class="moreinfo">
                 <i class="fa fa-fw {{ gender }}" title="{{ genderTitle|trans }}"></i>
+
+            {%- if person.deathdate is not null -%}
+
+                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'Deathdate'|trans }}">
+                    {{ 'Date of death'|trans({'deathdate': person.deathdate|format_date("medium") }) }}
+                </time>
+
+
+            {%- else -%}
                 <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                 {{ 'Born the date'|trans({'gender': person.gender,
                     'birthdate': person.birthdate|format_date("medium") }) }}
@@ -67,6 +76,8 @@
                         {{ 'years_old'|trans({ 'age': person.age }) }}
                     </span>
                 {%- endif -%}
+
+            {%- endif -%}
             </p>
         {%- endif -%}
     {#- tricks to remove easily whitespace after template -#}