From 400400e17b0d15c35e671ee44505321c690a89a4 Mon Sep 17 00:00:00 2001
From: Yann Kaiser <kaiser.yann@gmail.com>
Date: Tue, 11 Jul 2017 19:01:02 -0700
Subject: [PATCH] parse schedule description

---
 pybay/settings.py                      | 1 +
 pybay/templates/frontend/schedule.html | 3 ++-
 requirements.txt                       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pybay/settings.py b/pybay/settings.py
index 519439a2..f0b13473 100644
--- a/pybay/settings.py
+++ b/pybay/settings.py
@@ -140,6 +140,7 @@
     "account",
     "easy_thumbnails",
     "eventlog",
+    "django_markup",
     "markitup",
     "metron",
     "ordered_model",
diff --git a/pybay/templates/frontend/schedule.html b/pybay/templates/frontend/schedule.html
index d1c7cc62..7780b7eb 100644
--- a/pybay/templates/frontend/schedule.html
+++ b/pybay/templates/frontend/schedule.html
@@ -3,6 +3,7 @@
 {% load staticfiles %}
 {% load thumbnail %}
 {% load value_from_list_or_default %}
+{% load markup_tags %}
 
 {% block content %}
 <section class="code_of_conduct">
@@ -46,7 +47,7 @@ <h3 class="sch-timeslot-time">{{ time }}</h3>
                             <h4><a href="{% url 'pybay_speakers_detail' talk.speaker.name_slug %}">{{ talk.title }}</a></h4>
                             <p class="sch-speaker">{{ talk.speaker.name }}</p>
                             {% if talk.speaker.photo %}<p class="sch-speaker-photo"><img src="{% thumbnail talk.speaker.photo '50x50' %}" alt="{{ talk.speaker.name }}" /></p>{% endif %}
-                            <p class="sch-description">{{ talk.description }}</p>
+                            <div class="sch-description">{{ talk.description|apply_markup:"markdown" }}</div>
                             <p class="sch-room">{{ slot.rooms|join:', ' }}</p>
                             <p class="sch-duration">{{ slot.length_in_minutes }} mins</p>
                           </div>
diff --git a/requirements.txt b/requirements.txt
index 3a1ca31f..86134c75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ django-appconf==1.0.1
 django-bootstrap-form==3.2.1
 django-crispy-forms==1.6.1
 django-jsonfield==1.0.1
+django-markup==1.2
 django-markitup==2.2.2
 django-model-utils==2.4
 django-ordered-model==1.4.1