From 1326d1eae40a1cec48dfded3f4b16323894be709 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Mon, 5 Dec 2011 18:36:14 +0530
Subject: [PATCH] add markdown to festival templates

---
 itf/templates/modules/festival/meeting.html     | 9 +++++----
 itf/templates/modules/festival/participant.html | 2 +-
 itf/templates/modules/festival/project.html     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/itf/templates/modules/festival/meeting.html b/itf/templates/modules/festival/meeting.html
index 2d29207..cf5bce1 100755
--- a/itf/templates/modules/festival/meeting.html
+++ b/itf/templates/modules/festival/meeting.html
@@ -1,3 +1,4 @@
+{% load markup %}
 <link rel="stylesheet" href="/static/css/modules/tabsinnerright.css" type="text/css" />
 
 <ul class="tabsInnerRight">
@@ -28,7 +29,7 @@
 
 <div class="tab_container">
     <div id="synopsis" class="tab_content">
-        {{ meeting.intro|safe|linebreaksbr }}      
+        {{ meeting.intro|markdown }}      
          <!--Content-->
     </div>
 
@@ -43,7 +44,7 @@
             </div>
             <div class="sessionChild">
             <div class="sessionIntro">
-              {{ s.intro|linebreaksbr }}
+              {{ s.intro|markdown }}
             </div>
             {% ifnotequal s.talks|length 0 %}
             <ul class="talks">
@@ -94,7 +95,7 @@
                 <a href="/static/{{d.file}}">{{d.title}}</a>
               </div>
               <div class="intro">
-                {{ d.intro|safe }}
+                {{ d.intro|markdown }}
               </div>
             </div>
           {% endfor %}
@@ -130,7 +131,7 @@
             <a href="Javascript:return false;">{{ p.name }}</a>
           </div>
           <div class="pBio">
-            {{ p.short_bio }}
+            {{ p.short_bio|markdown }}
           </div>
         </div>
         {% endfor %}
diff --git a/itf/templates/modules/festival/participant.html b/itf/templates/modules/festival/participant.html
index b000e8d..0fdba86 100755
--- a/itf/templates/modules/festival/participant.html
+++ b/itf/templates/modules/festival/participant.html
@@ -1,3 +1,3 @@
 
-<div class="orange">{{ name }}:</div> {{ short_bio }}
+<div class="orange">{{ name }}:</div> {{ short_bio|markdown }}
 
diff --git a/itf/templates/modules/festival/project.html b/itf/templates/modules/festival/project.html
index 4c9137f..90c8b2c 100755
--- a/itf/templates/modules/festival/project.html
+++ b/itf/templates/modules/festival/project.html
@@ -1,2 +1,2 @@
 <div class="orange">{{ title }}</div>
-<div>{{ intro|linebreaksbr }}</div>
+<div>{{ intro|markdown }}</div>