From d73730bfc9730a330f327c3d4c382b30c90e9eb1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Fri, 10 Dec 2010 19:25:03 +0100
Subject: Allow more tag (<span style>, <strong>, <em>, <hr>) in the
 sanitisation (refs #288)

---
 chimere/rss/templates/rss_descr.html | 2 +-
 chimere/templates/detail.html        | 2 +-
 chimere/templates/welcome.html       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chimere/rss/templates/rss_descr.html b/chimere/rss/templates/rss_descr.html
index f425e01..97a9c50 100644
--- a/chimere/rss/templates/rss_descr.html
+++ b/chimere/rss/templates/rss_descr.html
@@ -3,6 +3,6 @@
 <div id='detail_content'>
 {% if obj.picture %}<img src='{{obj.picture.url}}' alt="{{obj.name}}"/>{%endif%}
 <div>{% for property in obj.getProperties %}
-<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br a:href ul li ol h1 h2 h3 h4"|safe }}</p>
+<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href ul li ol h1 h2 h3 h4"|safe }}</p>
 {% endfor %}</div>
 </div>
diff --git a/chimere/templates/detail.html b/chimere/templates/detail.html
index 6df7e76..cfde67f 100644
--- a/chimere/templates/detail.html
+++ b/chimere/templates/detail.html
@@ -9,7 +9,7 @@
 {% if marker.end_date %} - {{marker.end_date|date:"D d M Y"}}</p>{% endif %}</span>
 {% endif %}
 {% for property in marker.getProperties %}
-<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br a:href ul li ol h1 h2 h3 h4"|safe}}</p>
+<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href ul li ol h1 h2 h3 h4"|safe}}</p>
 {% endfor %}
 </div>{% if share_networks %}
 {% if simple %}{% trans "Share on"%}{% for share_network in share_networks %}
diff --git a/chimere/templates/welcome.html b/chimere/templates/welcome.html
index 448a92d..36a0b71 100644
--- a/chimere/templates/welcome.html
+++ b/chimere/templates/welcome.html
@@ -13,7 +13,7 @@
    {% else %}
    <h3>{{news.name}} &ndash; {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h3>
    {% for property in news.getProperties %}
-   <p id='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br a:href ul li ol h1 h2 h3 h4"|safe }}</p>
+   <p id='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br hr strong em span:style a:href ul li ol h1 h2 h3 h4"|safe }}</p>
    {% endfor %}
    <p class='marker_link'><a href='{{ news.get_absolute_url }}'>{% trans "See it on the map"%}</a></p>
    {% endif %}
-- 
cgit v1.2.3