From: Jérémy Fabre <Jeremy@iMac-de-Jeremy-2.fritz.box>
Date: Tue, 14 Feb 2017 13:55:04 +0000 (+0100)
Subject: Update times on event line card
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2e043dfadbe4153dee9e87e488052bd34fdf5ae4;p=mezzo.git

Update times on event line card
---

diff --git a/app/static/src/sass/modules/boxes/_event-line-box.scss b/app/static/src/sass/modules/boxes/_event-line-box.scss
index e5ba26b1..db0fae7e 100644
--- a/app/static/src/sass/modules/boxes/_event-line-box.scss
+++ b/app/static/src/sass/modules/boxes/_event-line-box.scss
@@ -229,7 +229,7 @@ $module: ".event-line-box";
 
     &__date {
 
-        @include font-size(m);
+        @include font-size(l);
         @include line-height(1.25);
         @include typeface(sans-serif);
         font-weight: weight(regular);
@@ -238,6 +238,11 @@ $module: ".event-line-box";
 
         @include margin-top(1);
 
+        span {
+            display: block;
+            @include font-size(m);
+        }
+
     }
 
     &__desc {
diff --git a/app/templates/agenda/includes/event_date_line.html b/app/templates/agenda/includes/event_date_line.html
index cf071131..fa29a3db 100644
--- a/app/templates/agenda/includes/event_date_line.html
+++ b/app/templates/agenda/includes/event_date_line.html
@@ -2,31 +2,31 @@
 {% with event.periods.all as periods %}
     <!-- Start date only  -->
     {% if event.start and not event.end %}
-        {{ event.start|date:"DATE_EVENT_FORMAT" }},<br>
+        {{ event.start|date:"DATE_EVENT_FORMAT" }}
         <!-- Start date with hour  -->
         {% if event.start and event.start|date:"H:i" != "23:59" %}
-            {{ event.start|time:"TIME_FORMAT" }}
+            <span>{{ event.start|time:"TIME_FORMAT" }}</span>
         {% endif %}
     <!-- Start and end date  -->
     {% else %}
         <!-- Start and end date is the same day  -->
         {% if event.start|date:"d.m.y" == event.end|date:"d.m.y" %}
             {% if not periods %}
-                {{ event.start|date:"DATE_EVENT_FORMAT" }},<br>
+                {{ event.start|date:"DATE_EVENT_FORMAT" }}
                 <!-- Start date with hour  -->
                 {% if event.end and event.end|date:"H:i" != "23:59" %}
-                    {{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}
+                    <span>{{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}</span>
                 {% else %}
-                    {{ event.start|time:"TIME_FORMAT" }}
+                    <span>{{ event.start|time:"TIME_FORMAT" }}</span>
                 {% endif %}
             {% else %}
-                {{ event.start|date:"DATE_EVENT_FORMAT" }},<br>
+                {{ event.start|date:"DATE_EVENT_FORMAT" }}
                 {% for period in periods %}
                     {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
-                        {{ period.date_from|time:"TIME_FORMAT" }} - {{ period.date_to|time:"TIME_FORMAT" }}
+                        <span>{{ period.date_from|time:"TIME_FORMAT" }} - {{ period.date_to|time:"TIME_FORMAT" }}</span>
                     {% else %}
-                        {% if forloop.last or periods|length == 2 %} {% trans "and"%} {% elif not forloop.first %}, {% endif %}
-                        {{ period.date_from|time:"TIME_FORMAT" }}
+                        <span>{% if forloop.last or periods|length == 2 %} {% trans "and"%} {% elif not forloop.first %}, {% endif %}
+                        {{ period.date_from|time:"TIME_FORMAT" }}</span>
                     {% endif %}
                 {% endfor %}
             {% endif %}
@@ -38,20 +38,20 @@
             {% else %}
                 {% trans "and" %}
             {% endif %}
-            {{ event.end|date:"DATE_EVENT_FORMAT" }},
+            {{ event.end|date:"DATE_EVENT_FORMAT" }}
             {% if event.end and event.end|date:"H:i" != "23:59" %}
-                <br />{{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}
+                <span>{{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}</span>
             {% else %}
-                <br />{{ event.start|time:"TIME_FORMAT" }}
+                <span>{{ event.start|time:"TIME_FORMAT" }}</span>
             {% endif %}
         <!-- Start and end date are completely different  -->
         {% else %}
-            {{ event.start|date:"DATE_EVENT_FORMAT" }} {% trans "through" %} {{ event.end|date:"DATE_EVENT_FORMAT" }},<br>
+            {{ event.start|date:"DATE_EVENT_FORMAT" }} {% trans "through" %} {{ event.end|date:"DATE_EVENT_FORMAT" }}
             <!-- Start date with hour  -->
             {% if event.end and event.end|date:"H:i" != "23:59" %}
-                {{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}
+                <span>{{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}</span>
             {% else %}
-                {{ event.start|time:"TIME_FORMAT" }}
+                <span>{{ event.start|time:"TIME_FORMAT" }}</span>
             {% endif %}
         {% endif %}