Add Markdown support for bugs and comments.

portnov [2008-06-11 08:14:31]
Add Markdown support for bugs and comments.
Filename
media/css/main.css
mgmt/templatetags/prj_filters.py
templates/bug_body.html
templates/comments.html
diff --git a/media/css/main.css b/media/css/main.css
index e2b090f..27fd725 100644
--- a/media/css/main.css
+++ b/media/css/main.css
@@ -1,6 +1,6 @@

 body {
-  font-family: Helvetica,Arial,sans-serif;
+  font-family: Arial,Helvetica,sans-serif;
   padding: 0;
   margin: 0;
 }
@@ -135,19 +135,24 @@ p.date {
 }

 div.pager {
+  border-top: 1px #888 solid;
   text-align: center;
+  padding-top: 0.5ex;
 }

 span.pager {
-  padding: 1ex;
+  padding: 0.5ex 0.5em;
 }

 .pager-other {
   border: 1px #091 solid;
+  background: #eee;
 }

 .pager-current {
   border: 1px #888 solid;
+  border-top: 1px white solid;
+  background: white;
 }

 .bug {
diff --git a/mgmt/templatetags/prj_filters.py b/mgmt/templatetags/prj_filters.py
index f215fdb..bd27254 100644
--- a/mgmt/templatetags/prj_filters.py
+++ b/mgmt/templatetags/prj_filters.py
@@ -1,6 +1,12 @@
+from markdown import Markdown
 from django import template
 register = template.Library()

 @register.filter('link')
 def link(obj,type='projects'):
   return "<a href='/%s/%s/'>%s</a>" % (type,obj.id,obj.name)
+
+@register.filter
+def markdown(value):
+  md = Markdown(value,safe_mode='escape')
+  return md.convert()
diff --git a/templates/bug_body.html b/templates/bug_body.html
index 432f8cf..21afe73 100644
--- a/templates/bug_body.html
+++ b/templates/bug_body.html
@@ -5,5 +5,5 @@
         {% if edit_link %}
           <div class='links'><a href='{{edit_link}}'>Изменить</a></div>
         {% endif %}
-        <p>{{bug.text}}</p>
+        <p>{{bug.text|markdown|safe}}</p>
       </div>
diff --git a/templates/comments.html b/templates/comments.html
index 87369c3..a224e08 100644
--- a/templates/comments.html
+++ b/templates/comments.html
@@ -1,3 +1,4 @@
+{% load prj_filters %}
 {% if comments %}
   <h3>Комментарии</h3>
   <div class='comments'>
@@ -6,7 +7,7 @@
         <p class='comment-title'>
           <a name='comment-{{comment.id}}'>{{ comment.title }} от {{ comment.author }}, {{ comment.created }}</a>
         </p>
-        <p>{{ comment.text }}</p>
+        <p>{{ comment.text|markdown|safe }}</p>
       </div>
     {% endfor %}
   </div>
ViewGit