From 325a94338f1c1afb6d1ea41bcbac6bf5216c4adf Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Wed, 26 Oct 2011 01:05:59 +0100
Subject: [PATCH] markdown

---
 itf/settings.py                                       |  1 +
 itf/static/js/insidepage.js                           |  1 +
 itf/templates/modules/bestpractices/bestpractice.html | 11 ++++++-----
 itf/templates/noel/insidepage.html                    |  2 +-
 requirements.txt                                      |  1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/itf/settings.py b/itf/settings.py
index d4a5bb7..d29736e 100755
--- a/itf/settings.py
+++ b/itf/settings.py
@@ -145,6 +145,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.comments',
+    'django.contrib.markup',
     'registration',
 #    'itfcore',
     'festival',
diff --git a/itf/static/js/insidepage.js b/itf/static/js/insidepage.js
index 6146a6c..fa07ce7 100755
--- a/itf/static/js/insidepage.js
+++ b/itf/static/js/insidepage.js
@@ -21,6 +21,7 @@ $('#listLeft ul li a').live("click", function() {
         var url = location.protocol + "//" + location.hostname + location.pathname + "?tab=" + $('.innerSelected').attr("data-slug") + "&object_id=" + objId;
         var fb_url = url.replace("&", "&amp;");
         $('#fb_like').attr("data-href", fb_url);
+        $('#permalinkBtn').attr("href", url);
         var searchTerm = $('.searchListField').val();
         var html = data.html;
         if (searchTerm != '') {
diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html
index 251b1af..45f2f8b 100755
--- a/itf/templates/modules/bestpractices/bestpractice.html
+++ b/itf/templates/modules/bestpractices/bestpractice.html
@@ -1,7 +1,8 @@
 {% load thumbnail %}
+{% load markup %}
 <div class="itfInfo">
   {% for s in stories %}
-  <span class="orange">Situation: </span><span class="ifInfoInfo">{{ s.text|safe|linebreaksbr }}</span>
+  <span class="orange">Situation: </span><span class="ifInfoInfo">{{ s.text|safe|markdown }}</span>
     {% if s.image %}
         {% thumbnail s.image "164x114" crop="center" as im %}
             <img class="itfInfoImg" src="{{ im.url }}" />
@@ -18,7 +19,7 @@
   </div>
 
 
-  <span class="orange">Law: </span><span class="itfInfoInfo">{{ law }}</span>
+  <span class="orange">Law: </span><span class="itfInfoInfo">{{ law|markdown }}</span>
   {% if law_image %}
   {% thumbnail law_image "164x114" crop="center" as im %}
     <img class="itfInfoImg" src="{{ im.url }}" />
@@ -26,17 +27,17 @@
   {% endif %}
   <br /><br />
   {% if theatre %}
-  <span class="orange">Spotlight on Theatre: </span><span class="itfInfoInfo">{{ theatre|safe|linebreaksbr }}</span> <br /><br />
+  <span class="orange">Spotlight on Theatre: </span><span class="itfInfoInfo">{{ theatre|safe|markdown }}</span> <br /><br />
   {% endif %}
   {% if quick_howto %}
-  <span class="orange">Best Practices or Quick, Tell Me How to Avoid Conflict! </span><span class="itfInfoInfo">{{ quick_howto|safe|linebreaksbr }}</span><br /><br />
+  <span class="orange">Best Practices or Quick, Tell Me How to Avoid Conflict! </span><span class="itfInfoInfo">{{ quick_howto|safe|markdown }}</span><br /><br />
   {% endif %}
 
   {% if links %}
   <span class="orange">Links:</span><br />
       {% for l in links %}
       <a href="{{ l.url }}" class="bpRelated">{{ l.url }}</a> <br />
-        {{ l.text|linebreaksbr }}
+        {{ l.text|markdown }}
       <br /><br />
       {% endfor %}  
   {% endif %}
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html
index c0c0388..7b021d2 100755
--- a/itf/templates/noel/insidepage.html
+++ b/itf/templates/noel/insidepage.html
@@ -183,7 +183,7 @@
                    <!-- <img src="/static/images/noel/facebook.png" width="18" height="18" alt="facebook" class="iconImages"> -->  
    <!-- <iframe src="http://www.facebook.com/plugins/like.php?href=www.theatreforum.in&amp;send=false&amp;layout=button_count&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=arial&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:21px;" allowTransparency="true"></iframe>-->
                 
-                    <img src="/static/images/noel/download.jpg" width="18" height="18" alt="download" title="Download" class="iconImages">
+                    <a href="" id="permalinkBtn" title="Permalink"><img src="/static/images/noel/download.jpg" width="18" height="18" alt="permalink" title="Permalink" class="iconImages"></a>
           	</div>
     	</div>
         
diff --git a/requirements.txt b/requirements.txt
index 6a24189..35f5d9a 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,4 @@ django-ckeditor
 django-registration
 Whoosh
 django-haystack
+Markdown