diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-10 12:07:39 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-10 12:07:39 +0100 |
| commit | 1460cc1884f293d8e4aec0f7a3b730392fe0f087 (patch) | |
| tree | 33f140343dd05179b0bf6c56e7b1b23585f409f2 | |
| parent | 6238ccee60c079aaccb67e9af7e7acaae01dc563 (diff) | |
| parent | 96bdff60f069be30fa0d720bc305936ccb70a677 (diff) | |
| download | Chimère-1460cc1884f293d8e4aec0f7a3b730392fe0f087.tar.bz2 Chimère-1460cc1884f293d8e4aec0f7a3b730392fe0f087.zip | |
Merge branch 'master' into carte-ouverte
| -rw-r--r-- | chimere/rss/templates/rss_descr.html | 2 | ||||
| -rw-r--r-- | chimere/templates/detail.html | 2 | ||||
| -rw-r--r-- | 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 7915383..f425e01 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 a:href ul li ol h1 h2 h3 h4"|safe }}</p> +<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br 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 baa13b4..6df7e76 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 a:href ul li ol h1 h2 h3 h4"|safe}}</p> +<p id='{{property.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br 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 f17478b..10034a4 100644 --- a/chimere/templates/welcome.html +++ b/chimere/templates/welcome.html @@ -12,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|sanitize:"p b a:href ul li ol h1 h2 h3 h4"|safe }}</p> + <p id='{{news.propertymodel.getNamedId}}'>{{ property.value|sanitize:"p b i br 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 %} |