From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 26 Sep 2016 13:52:37 +0000 (+0200)
Subject: Add event location room
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f0943d3edb2d2ce07df04738c4749d81602ee85b;p=mezzo.git

Add event location room
---

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 93283342..7329338a 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -64,6 +64,7 @@
         <a href="{% url 'location-detail' event.location.slug %}">{{ event.location }}</a>
         <p>
             <p>{{ event.location }} {{ event.location.address|linebreaksbr }}</p>
+            <p>{% trans "Room" %} {{ event.location.room }}</p>
             <a href="{{ event|google_nav_url }}" target="_blank">
                 Get Directions
             </a>
diff --git a/app/templates/agenda/includes/event_location.html b/app/templates/agenda/includes/event_location.html
index 488dd0a5..2ce09ec0 100644
--- a/app/templates/agenda/includes/event_location.html
+++ b/app/templates/agenda/includes/event_location.html
@@ -4,6 +4,7 @@
     <h3 class="location__title">{% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %}</h3>
         {% block event_detail_location %}
         <p>{{ location.address }}</p>
+        <p>{% trans "Room" %} {{ event.location.room }}</p>
         <p><a href="{{ location.link }}" target="_blank">{{ location.link }}</a></p>
         <p>{{ location.description|safe }}</p>
         <a href="{{ location|google_nav_url }}" target="_blank" class="location__map">
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index f2923e06..a64294ee 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit f2923e06d3a52dbbcfe82ffe695256511afbfba6
+Subproject commit a64294ee8edcc74375992f2e46857f3d10abc452