From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 22 Mar 2016 17:08:27 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fc90ae095af117ac7e4d7e0a3faf330eb40b4cdf;p=mezzo.git

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

Conflicts:
	app/templates/agenda/includes/event_metainfo.html
---

fc90ae095af117ac7e4d7e0a3faf330eb40b4cdf
diff --cc app/templates/agenda/includes/event_metainfo.html
index 3f9384a3,f707360f..d995e08c
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@@ -1,15 -1,20 +1,20 @@@
  {% load i18n mezzanine_tags event_tags %}
  {% editable event.start event.end event.location %}
- <p class="event__meta">
-     <span>
-         {{ event.start }}
-         {% if event.end %}
-         {% trans "-" %} {% if event.end|date == event.start|date %}{{ event.end|time:"TIME_FORMAT" }}{% else %}{{ event.end }}{% endif %}
-         {% endif %}
-         {% if event.location %}
-         <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>
-         {% endif %}
-     </span>
- </p>
- {# <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a> #}
+ <div class="event__meta">
+         <div class="event__meta__inner split-container">
+             <div class="split-left">
+                 {{ event.start }}
+                 {% if event.end %}
+                 <br>
+                 {% if event.end|date == event.start|date %}{{ event.end|time:"TIME_FORMAT" }}{% else %}{{ event.end }}{% endif %}
+                 {% endif %}
+                 {% if event.location %}
+                 <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>
++                {% endif %}
+             </div>
+             <div class="split-right">
+                 <a href="{{ event.get_absolute_url }}" class="event__meta__cta">Réserver</a>
+             </div>
+         </div>
 -    {% endif %}
+ </div>
  {% endeditable %}