From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 8 Nov 2016 14:41:22 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4ac3d1ed4d0ba757b3510a695950aa92d3ede41c;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
	app/templates/network/person_detail.html
---

4ac3d1ed4d0ba757b3510a695950aa92d3ede41c
diff --cc app/templates/network/person_detail.html
index 898cc5ab,ed0620d6..dad16000
--- a/app/templates/network/person_detail.html
+++ b/app/templates/network/person_detail.html
@@@ -32,44 -32,33 +32,45 @@@
      {% endeditable %}
  
      <p>{% trans 'Email' %} : {{ person_email }}</p>
-     <br>
-     <p>
-         {% trans 'Activities' %}:
-         <ul>
+ 
+     {% if person.activities.all|length > 0 %}
+         <h2 class="dotted">{% trans 'Activities' %}</h2>
+         <ul class="unstyled-list">
              {% for activity in person.activities.all %}
-             <li>
+             <li class="mb1">
                  {% if activity.function %}
-                     {% trans 'Function'%} : {{ activity.function }}<br>
 -                    <strong>{% trans 'Functions'%}:</strong> {{ activity.function }}<br>
++                    <strong>{% trans 'Function'%} :</strong> {{ activity.function }}<br>
                  {% endif %}
 -                {% with activity.teams.all as actvities %}
 -                    {% if actvities %}
 -                        <strong>{% trans 'Teams' %}:</strong>
 -                        {% for team in actvities %}
 +                {% if activity.status %}
-                     {% trans 'Status'%} : {{ activity.status }}<br>
++                    <strong>{% trans 'Status'%} :</strong> {{ activity.status }}<br>
 +                {% endif %}
 +                {% with activity.teams.all as teams %}
 +                    {% if teams %}
-                         {% trans 'Team' %} :
++                        <strong>{% trans 'Team' %} :</strong>
 +                        {% for team in teams %}
-                             {{ team.name }}<br>
+                             {{ team.name }}{% if not forloop.last %}, {% endif %}
                          {% endfor %}
+                         <br />
                      {% endif %}
                  {% endwith %}
                  {% with activity.organizations.all as organizations %}
                      {% if organizations %}
-                         {% trans 'Organization' %} :
+                         <strong>{% trans 'Organization' %}:</strong>
                          {% for organization in organizations %}
-                         {{ organization.name }}<br>
+                             {{ organization.name }}{% if not forloop.last %}, {% endif %}
                          {% endfor %}
+                         <br />
                      {% endif %}
                  {% endwith %}
 +                {% if activity.date_from or activity.date_to %}
 +                  {% if not activity.date_from and not activity.date_to|date_year_higher_than:10 %}
-                     {% trans 'Period' %} : {% trans 'to' %} {{ activity.date_to }}<br>
++                    <strong>{% trans 'Period' %}</strong> : {% trans 'to' %} {{ activity.date_to }}<br>
 +                  {% elif not activity.date_to %}
-                     {% trans 'Period'%} : {% trans 'from' %} {{ activity.date_from }}<br>
++                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }}<br>
 +                  {% else %}
-                     {% trans 'Period'%} : {% trans 'from' %} {{ activity.date_from }} {% if not activity.date_to|date_year_higher_than:10 %}{% trans 'to' %} {{ activity.date_to }}{% endif %}<br>
++                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }} {% if not activity.date_to|date_year_higher_than:10 %}{% trans 'to' %} {{ activity.date_to }}{% endif %}<br>
 +                  {% endif %}
 +                {% endif %}
- 
              </li>
              {% endfor %}
          </ul>