added django-markup integration

basic/blog/templates/blog/category_detail.html

@@ -12,13 +12,12 @@ <h2>Posts for {{ category.title }}</h2>
 
 
 {% block content %}
-  {% load markup %}
   <div class="post_list">
     {% for post in object_list %}
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
     </div>
     {% endfor %}
   </div>

basic/blog/templates/blog/category_list.html

@@ -11,7 +11,6 @@ <h2>Post categories</h2>
 
 
 {% block content %}
-  {% load markup %}
   <ul class="link_list">
     {% for category in object_list %}
     <li><a href="{{ category.get_absolute_url }}">{{ category }}</a></li>

basic/blog/templates/blog/post_archive_day.html

@@ -16,7 +16,7 @@ <h2>Post archive for {{ day|date:"d F Y" }}</h2>
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
     </div>
     {% endfor %}
   </div>

basic/blog/templates/blog/post_archive_month.html

@@ -16,7 +16,7 @@ <h2>Post archive for {{ month|date:"F Y" }}</h2>
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
     </div>
     {% endfor %}
   </div>

basic/blog/templates/blog/post_archive_year.html

@@ -10,9 +10,7 @@ <h2>Post archive for {{ year }}</h2>
 {% endblock %}
 
 
-{% block content %}
-  {% load markup %}
-
+{% block content %}  
   <ul class="link_list">
     {% for month in date_list %}
     <li><a href="{% url blog_index %}{{ year }}/{{ month|date:"b" }}/">{{ month|date:"F" }}</a></li>

basic/blog/templates/blog/post_detail.html

@@ -20,12 +20,12 @@ <h2>{{ object.title }}</h2>
 
 
 {% block content %}
-  {% load blog markup comments tagging_tags inlines %}
+  {% load blog comments tagging_tags inlines %}
 
   <p class="date">{{ object.publish|date:"j F Y" }}</p>
 
   <div class="body">
-    {{ object.body|render_inlines|markdown:"safe" }}
+    {{ object.body_markup|render_inlines|safe }}
   </div>
 
   {% tags_for_object object as tag_list %}

basic/blog/templates/blog/post_list.html

@@ -16,7 +16,7 @@ <h2>Post archive</h2>
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
     </div>
     {% endfor %}
   </div>

basic/blog/templates/blog/post_search.html

@@ -28,7 +28,7 @@ <h2>Search</h2>
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
       <p class="comments">{% if comment_count %}{{ comment_count }} comment{{ comment_count|pluralize }}{% endif %}</p>
     </div>
     {% endfor %}

basic/blog/templates/blog/tag_detail.html

@@ -17,7 +17,7 @@ <h2>Posts for {{ tag.name }}</h2>
     <div>
       <h3 class="title"><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
       <p class="date">{{ post.publish|date:"Y F d" }}</p>
-      <p class="tease">{{ post.tease }}</p>
+      <p class="tease">{{ post.tease_markup }}</p>
     </div>
     {% endfor %}
   </div>

basic/blog/templates/feeds/posts_description.html

@@ -1,2 +1 @@
-{% load markup %}
-{{ obj.body|markdown }}
+{{ obj.body_markup }}