diff options
| -rw-r--r-- | news/models.py | 7 | ||||
| -rw-r--r-- | news/views.py | 2 | ||||
| -rw-r--r-- | settings.py | 1 | ||||
| -rw-r--r-- | templates/feeds/news_description.html | 3 | ||||
| -rw-r--r-- | templates/news/view.html | 3 | ||||
| -rw-r--r-- | templates/public/index.html | 6 |
6 files changed, 13 insertions, 9 deletions
diff --git a/news/models.py b/news/models.py index 9123270..40238cd 100644 --- a/news/models.py +++ b/news/models.py @@ -1,6 +1,9 @@ +import markdown + from django.db import models from django.contrib.auth.models import User from django.contrib.sites.models import Site +from django.utils.safestring import mark_safe from django.utils.timezone import now @@ -17,6 +20,10 @@ class News(models.Model): def get_absolute_url(self): return '/news/%s/' % self.slug + def html(self): + return mark_safe(markdown.markdown( + self.content, safe_mode=True, enable_attributes=False)) + def __unicode__(self): return self.title diff --git a/news/views.py b/news/views.py index c0230f1..74bec05 100644 --- a/news/views.py +++ b/news/views.py @@ -76,7 +76,7 @@ def view_redirect(request, object_id): @require_POST def preview(request): data = request.POST.get('data', '') - markup = markdown.markdown(data, safe_mode=True) + markup = markdown.markdown(data, safe_mode=True, enable_attributes=False) return HttpResponse(markup) # vim: set ts=4 sw=4 et: diff --git a/settings.py b/settings.py index 80df6f4..7038a71 100644 --- a/settings.py +++ b/settings.py @@ -107,7 +107,6 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.sitemaps', 'django.contrib.admin', - 'django.contrib.markup', 'django.contrib.staticfiles', 'south', 'django_countries', diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index 7783036..d3caceb 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 b6c06b2..8f49fb1 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 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 %} |