diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-27 19:13:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-27 19:13:12 +0100 |
| commit | f5a4e1ba6a72ce003c896524be3a0c8179e91c36 (patch) | |
| tree | ee1556f7fd1108d79cc2190bef6d93c5e1764f12 /chimere/templates | |
| parent | e7ee53e3367e0e8b93cae286212e1a4346081127 (diff) | |
| parent | 9938ec566e87fe66cd8e91576fefbfbcadddd9c3 (diff) | |
| download | Chimère-f5a4e1ba6a72ce003c896524be3a0c8179e91c36.tar.bz2 Chimère-f5a4e1ba6a72ce003c896524be3a0c8179e91c36.zip | |
Merge branch 'master' into carte-ouverte
Diffstat (limited to 'chimere/templates')
| -rw-r--r-- | chimere/templates/detail.html | 6 | ||||
| -rw-r--r-- | chimere/templates/welcome.html | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chimere/templates/detail.html b/chimere/templates/detail.html index d7084db..baa13b4 100644 --- a/chimere/templates/detail.html +++ b/chimere/templates/detail.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load sanitize %} <h2>{{ marker.name }}</h2> <div id='detail_content'> {% if marker.picture %}<img src='{{media_path}}{{marker.picture}}' alt='{{marker.name}}'/>{%endif%} @@ -8,8 +9,9 @@ {% 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|safe }}</p> -{% endfor %}</div>{% if share_networks %} +<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b 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 %} <a href='{{share_network.1}}'>{{share_network.0}}</a> {% endfor %}{%else%} diff --git a/chimere/templates/welcome.html b/chimere/templates/welcome.html index 2a09d77..f17478b 100644 --- a/chimere/templates/welcome.html +++ b/chimere/templates/welcome.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load sanitize %} <div id='welcome' {% if not display %}style='display:None'{%endif%}> <h2>Bienvenue sur la Carte OuVerte rennaise !</h2> <div id='detail_content'> @@ -11,7 +12,7 @@ {% else %} <h3>{{news.name}} – {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h3> {% for property in news.getProperties %} - <p id='{{news.propertymodel.getNamedId}}'>{{ property.value|safe }}</p> + <p id='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b 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 %} |