summaryrefslogtreecommitdiffstats
path: root/templates/public
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-10-27 00:36:12 +0200
committerDan McGee <dan@archlinux.org>2012-10-27 00:36:12 +0200
commit62bb3db8ada68a22c7a58f32b2e6bed63f19e53c (patch)
treef2239c8c288f9364527e53bb8a5bf6dde39f67af /templates/public
parentbdee24b9d1279de67dd238e3644c2efff314bd7b (diff)
downloadarchweb-62bb3db8ada68a22c7a58f32b2e6bed63f19e53c.tar.gz
archweb-62bb3db8ada68a22c7a58f32b2e6bed63f19e53c.tar.xz
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>
Diffstat (limited to 'templates/public')
-rw-r--r--templates/public/index.html6
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 %}