From eef1ee7051093b9f6e74ab5669af8c57983872d9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 May 2012 16:32:17 -0500 Subject: Add RSS links to /news/ and /packages/ URLs These were available only from the home page, but it makes sense to advertise them on the corresponding index pages too. Signed-off-by: Dan McGee --- templates/news/list.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates/news') diff --git a/templates/news/list.html b/templates/news/list.html index a72a2dda..e85ceced 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,6 +1,10 @@ {% extends "base.html" %} {% block title %}Arch Linux - News{% endblock %} +{% block head %} + +{% endblock %} + {% block content %}
-- cgit v1.2.3-54-g00ecf From 97595b7a26f09f89905e893b8be56b1424d0584b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 15 Sep 2012 09:44:55 -0500 Subject: Add structured data markup from schema.org to news items We use the 'Article' type since this isn't print media. Signed-off-by: Dan McGee --- templates/news/view.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'templates/news') diff --git a/templates/news/view.html b/templates/news/view.html index 7788dece..8a4d8122 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -3,9 +3,19 @@ {% block title %}Arch Linux - News: {{ news.title }}{% endblock %} {% block content %} -
+
-

News: {{ news.title }}

+

{{ news.title }}

+ + + + + +
+ +
{% if perms.news.change_news %}
    -- cgit v1.2.3-54-g00ecf From 6c8413172506b5cce4f39e17f09803efea753be7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 Sep 2012 20:47:33 -0500 Subject: More structured data markup for news articles Signed-off-by: Dan McGee --- templates/news/view.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'templates/news') diff --git a/templates/news/view.html b/templates/news/view.html index 8a4d8122..445f0398 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -4,12 +4,12 @@ {% block content %}
    -

    {{ news.title }}

    + @@ -28,7 +28,6 @@

    {{ news.title }}

    {{ news.postdate|date }} - {{ news.author.get_full_name }}

    -
    {{ news.content|markdown }}
    - +
    {{ news.content|markdown }}
    {% endblock %} -- cgit v1.2.3-54-g00ecf From 0b97d52351fc2bdcae16f1a1e7c56afd4ed476ad Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 26 Oct 2012 16:49:58 -0500 Subject: Enable safe mode for markdown parsing Although we don't allow unauthenticated users to post content, we should still cover our bases here and ensure people can't inject stuff into the production website via an inadvertent XSS. Signed-off-by: Dan McGee --- news/views.py | 2 +- templates/feeds/news_description.html | 2 +- templates/news/view.html | 2 +- templates/public/index.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'templates/news') diff --git a/news/views.py b/news/views.py index 03f3b0ac..c0230f1e 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) + markup = markdown.markdown(data, safe_mode=True) return HttpResponse(markup) # vim: set ts=4 sw=4 et: diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html index e75d0af7..77830367 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,3 +1,3 @@ {% load markup %}

    {{obj.author.get_full_name}} wrote:

    -{{ obj.content|markdown }} \ No newline at end of file +{{ obj.content|markdown:'safe' }} diff --git a/templates/news/view.html b/templates/news/view.html index 445f0398..b6c06b28 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -28,6 +28,6 @@

    {{ news.title }}

    {{ news.postdate|date }} - {{ news.author.get_full_name }}

    -
    {{ news.content|markdown }}
    +
    {{ news.content|markdown:'safe' }}
{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 000a527b..762433a4 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -53,8 +53,8 @@

{{ news.postdate|date }}

- {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }} - {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %} + {% if forloop.counter0 == 0 %}{{ news.content|markdown:'safe'|truncatewords_html:300 }} + {% else %}{{ news.content|markdown:'safe'|truncatewords_html:100 }}{% endif %}
{% else %} {% if forloop.counter0 == 5 %} -- cgit v1.2.3-54-g00ecf From 62bb3db8ada68a22c7a58f32b2e6bed63f19e53c Mon Sep 17 00:00:00 2001 From: Dan McGee 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 --- news/models.py | 7 +++++++ news/views.py | 2 +- settings.py | 1 - templates/feeds/news_description.html | 3 +-- templates/news/view.html | 3 +-- templates/public/index.html | 6 +++--- 6 files changed, 13 insertions(+), 9 deletions(-) (limited to 'templates/news') diff --git a/news/models.py b/news/models.py index 91232706..40238cde 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 c0230f1e..74bec058 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 80df6f43..7038a71b 100644 --- a/settings.py +++ b/settings.py @@ -107,7 +107,6 @@ '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 77830367..d3cacebc 100644 --- a/templates/feeds/news_description.html +++ b/templates/feeds/news_description.html @@ -1,3 +1,2 @@ -{% load markup %}

{{obj.author.get_full_name}} wrote:

-{{ 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 @@

{{ news.title }}

{{ news.postdate|date }} - {{ news.author.get_full_name }}

-
{{ news.content|markdown:'safe' }}
+
{{ news.html }}
{% 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 @@

{{ news.postdate|date }}

- {% 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 %}
{% else %} {% if forloop.counter0 == 5 %} -- cgit v1.2.3-54-g00ecf From adc27750593aadb57f85f7b6817e4300f5ee180e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 16 Feb 2013 15:04:50 -0600 Subject: Paginator template cleanup --- templates/news/paginator.html | 10 +++++----- templates/packages/search_paginator.html | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'templates/news') diff --git a/templates/news/paginator.html b/templates/news/paginator.html index fbd0546b..57fbeb15 100644 --- a/templates/news/paginator.html +++ b/templates/news/paginator.html @@ -1,20 +1,20 @@ {% if is_paginated %}