From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 7 Oct 2016 07:53:54 +0000 (+0200)
Subject: Continue on event date display, fix projet lead organization display
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dafd7b2b1bd3c12a430f352ac4012148b9a346d2;p=mezzo.git

Continue on event date display, fix projet lead organization display
---

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 63320f4e..1e9193f6 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -2,10 +2,9 @@
 
 <!-- Start date only  -->
 {% if event.start and not event.end %}
-    {{ event.start|date:"l j F" }}
+    {{ event.start|date:"l j F" }}<br>
     <!-- Start date with hour  -->
-    {% if event.start|date:"H:i" != "00:00" %}
-        {% trans "at" %}
+    {% if event.start|date:"H:i" != "23:59" %}
         {{ event.start|date:"H\hi" }}
     {% endif %}
 
@@ -14,22 +13,22 @@
     <!-- Start and end date is the same day  -->
     {% if event.start|date:"d.m.y" == event.end|date:"d.m.y" %}
         {% if not event.periods.all %}
-            {{ event.start|date:"l j F" }}
+            {{ event.start|date:"l j F" }}<br>
             <!-- Start date with hour  -->
-            {% if event.start|date:"H:i" != "00:00" %}
-                {% if event.end|date:"H:i" != "00:00" %}
-                    {% trans "from" %} {{ event.start|date:"H\hi" }} {% trans "to" %} {{ event.end|date:"H\hi" }}
+            {% if event.start|date:"H:i" != "23:59" %}
+                {% if event.end|date:"H:i" != "23:59" %}
+                    {{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
                 {% else %}
-                    {% trans "at" %} {{ event.start|date:"H\hi" }}
+                    {{ event.start|date:"H\hi" }}
                 {% endif %}
             {% endif %}
         {% else %}
             {{ event.start|date:"j F" }}<br>
             {% for period in event.periods.all %}
-                {% if period.date_to|date:"H:i" != "00:00" %}
-                    {% trans "from" %} {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
+                {% if period.date_to|date:"H:i" != "23:59" %}
+                    {{ period.date_from|date:"H\hi" }} - {{ period.date_to|date:"H\hi" }}<br>
                 {% else %}
-                    {% trans "at" %} {{ period.date_from|date:"H\hi" }}<br>
+                    {{ period.date_from|date:"H\hi" }}<br>
                 {% endif %}
             {% endfor %}
         {% endif %}
@@ -37,7 +36,7 @@
     <!-- Start and end date are the same month  -->
     {% elif event.start|date:"m.y" == event.end|date:"m.y" %}
         {% for period in event.periods.all %}
-            {% if period.date_to and period.date_to|date:"H:i" != "00:00" %}
+            {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
                 {{ period.date_from|date:"j F" }} {% trans "from" %} {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
             {% else %}
                 {{ period.date_from|date:"j F" }} {% trans "at" %} {{ period.date_from|date:"H\hi" }}<br>
@@ -46,7 +45,7 @@
 
     <!-- Start and end date are completely different  -->
     {% else %}
-        {{ event.start|date:"j F" }} {% if event.end|date:"H:i" != "00:00" %} {% trans "to" %} {{ event.end|date:"j F" }} {% endif %}
+        {{ event.start|date:"j F" }} {% if event.end|date:"H:i" != "23:59" %} {% trans "to" %} {{ event.end|date:"j F" }}<br>{{ event.start|date:"H\hi" }} {% endif %}
     {% endif %}
 
 {% endif %}
diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index bb843a3b..2c9d607d 100644
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -204,7 +204,7 @@
 
                                         <div>
 
-                                            {% if project.lead_team %}
+                                            {% if project.lead_team or project.lead_organization %}
                                                 <div class="project-details__item">
                                                   {% if project.lead_team %}
                                                     <div class="project-details__item-title">