From 62bb3db8ada68a22c7a58f32b2e6bed63f19e53c Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 26 Oct 2012 17:36:12 -0500
Subject: 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>
---
 templates/feeds/news_description.html | 3 +--
 templates/news/view.html              | 3 +--
 templates/public/index.html           | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html
index 77830367..d3cacebc 100644
--- a/templates/feeds/news_description.html
+++ b/templates/feeds/news_description.html
@@ -1,3 +1,2 @@
-{% load markup %}
 <p>{{obj.author.get_full_name}} wrote:</p>
-{{ obj.content|markdown:'safe' }}
+{{ obj.content.html }}
diff --git a/templates/news/view.html b/templates/news/view.html
index b6c06b28..8f49fb1f 100644
--- a/templates/news/view.html
+++ b/templates/news/view.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 {% block title %}Arch Linux - News: {{ news.title }}{% endblock %}
 
 {% block content %}
@@ -28,6 +27,6 @@
 
     <p class="article-info">{{ news.postdate|date }} - {{ news.author.get_full_name }}</p>
 
-    <div class="article-content" itemprop="articleBody">{{ news.content|markdown:'safe' }}</div>
+    <div class="article-content" itemprop="articleBody">{{ news.html }}</div>
 </div>
 {% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index 762433a4..686fbdda 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 %}
-- 
cgit v1.2.3-2-g168b