diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 12:50:56 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-12-13 12:50:56 +0100 |
| commit | b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2 (patch) | |
| tree | 4e3a62ab9577dbd5ce6c790fcf76d3ebd11babb4 | |
| parent | c5e865bc70b824db3c547c3da2f559d6c78cfbec (diff) | |
| parent | 6039e8b31fefc499499f82b5e5f31caea1f55be6 (diff) | |
| download | Chimère-b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2.tar.bz2 Chimère-b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
chimere/templates/404.html
chimere/templates/500.html
| -rw-r--r-- | chimere/rss/templates/rss_descr.html | 2 | ||||
| -rw-r--r-- | chimere/templates/500.html | 1 | ||||
| -rw-r--r-- | chimere/templates/detail.html | 2 | ||||
| -rw-r--r-- | chimere/templates/welcome.html | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/chimere/rss/templates/rss_descr.html b/chimere/rss/templates/rss_descr.html index 97a9c50..4f75ac6 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 hr strong em span:style 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:target ul li ol h1 h2 h3 h4"|safe }}</p> {% endfor %}</div> </div> diff --git a/chimere/templates/500.html b/chimere/templates/500.html index e84408e..4f9afa1 100644 --- a/chimere/templates/500.html +++ b/chimere/templates/500.html @@ -13,4 +13,3 @@ </div> </body> </html> - diff --git a/chimere/templates/detail.html b/chimere/templates/detail.html index cfde67f..a1b61b6 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 hr strong em span:style 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:target 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 e74df4f..2597224 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 i br hr strong em span:style 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:target 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 %} |