From f0943d3edb2d2ce07df04738c4749d81602ee85b Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 26 Sep 2016 15:52:37 +0200 Subject: [PATCH] Add event location room --- app/templates/agenda/event_detail.html | 1 + app/templates/agenda/includes/event_location.html | 1 + lib/mezzanine-agenda | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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 @@ {{ event.location }}

{{ event.location }} {{ event.location.address|linebreaksbr }}

+

{% trans "Room" %} {{ event.location.room }}

Get Directions 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 @@

{% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %}

{% block event_detail_location %}

{{ location.address }}

+

{% trans "Room" %} {{ event.location.room }}

{{ location.link }}

{{ location.description|safe }}

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 -- 2.39.5