Remove usages of 'django.contrib.markup'

Switch to the news model being able to spit out the HTML version of the
content, and don't use the markup contrib module. This is deprecated as
of Django 1.5 so we can move off it now to save trouble down the road
when it is fully removed.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index 762433a..686fbdd 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load markup cache %}
+{% load cache %}
 {% load url from future %}
 {% load static from staticfiles %}
 
@@ -53,8 +53,8 @@
     </h4>
     <p class="timestamp">{{ news.postdate|date }}</p>
     <div class="article-content">
-        {% if forloop.counter0 == 0 %}{{ news.content|markdown:'safe'|truncatewords_html:300 }}
-        {% else %}{{ news.content|markdown:'safe'|truncatewords_html:100 }}{% endif %}
+        {% if forloop.counter0 == 0 %}{{ news.html|truncatewords_html:300 }}
+        {% else %}{{ news.html|truncatewords_html:100 }}{% endif %}
     </div>
     {% else %}
     {% if forloop.counter0 == 5 %}