Fix location room

diff --git a/app/templates/agenda/event_location_list.html b/app/templates/agenda/event_location_list.html
index 6766dcaa4f70a2c8c17a8efc7f525502e68dcb8b..012bd2b1b9ef9e0d09c03955d2372860b3df0620 100644 (file)
--- a/app/templates/agenda/event_location_list.html
+++ b/app/templates/agenda/event_location_list.html
@@ -31,7 +31,7 @@
   <div class="c-tabs-nav">
     {% for location in object_list %}
         <a href="#" class="c-tabs-nav__link {% if forloop.first %}is-active{% endif %}">
-            {% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %}</a>
+            {{ location.title }}{% if location.room %} - {{ location.room }}{% endif %}</a>
         <hr/>
     {% endfor %}
   </div>

diff --git a/app/templates/agenda/includes/event_location.html b/app/templates/agenda/includes/event_location.html
index 2ce09ec023289fa77fcb46861974ce564b2a442f..41c3ed5c5ba33b5d0aefe6b44039f9c422e1256b 100644 (file)
--- a/app/templates/agenda/includes/event_location.html
+++ b/app/templates/agenda/includes/event_location.html
@@ -1,7 +1,7 @@
 {% load i18n future mezzanine_tags event_tags %}
 
 <div class="c-tab__content">
-    <h3 class="location__title">{% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %}</h3>
+    <h3 class="location__title">{{ location.title }}{% if location.room %} - {{ location.room }}{% endif %}</h3>
         {% block event_detail_location %}
         <p>{{ location.address }}</p>
         <p>{% trans "Room" %} {{ event.location.room }}</p>

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index a64294ee8edcc74375992f2e46857f3d10abc452..7ccf0f70d2d9a1e99a8cdc5be3f3c467452a5719 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit a64294ee8edcc74375992f2e46857f3d10abc452
+Subproject commit 7ccf0f70d2d9a1e99a8cdc5be3f3c467452a5719