diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-27 18:23:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-27 18:23:53 +0100 |
| commit | 6ade14301af349f70332d758c8d9ca6af4d8432e (patch) | |
| tree | bd6dad4e81b10ff98efc0dbbdb508d871b6f3bec /chimere/templates/welcome.html | |
| parent | 611a649f3dcd26b04b6c1f9f7eb4984075ab411c (diff) | |
| parent | 7d05508460d6113d1c865661b0148677880c52da (diff) | |
| download | Chimère-6ade14301af349f70332d758c8d9ca6af4d8432e.tar.bz2 Chimère-6ade14301af349f70332d758c8d9ca6af4d8432e.zip | |
Merge branch 'master' into carte-ouverte
Diffstat (limited to 'chimere/templates/welcome.html')
| -rw-r--r-- | chimere/templates/welcome.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chimere/templates/welcome.html b/chimere/templates/welcome.html index 5be6bcd..0d51f27 100644 --- a/chimere/templates/welcome.html +++ b/chimere/templates/welcome.html @@ -42,8 +42,16 @@ notamment sur les critères de sélection, n'hésitez pas à lire la <a href='ch </div> {% if news_lst %}{% for news in news_lst %} <div class='info'> - <h3>{{news.title}} - {% trans news.date %}</h3> + {% if news.title %} + <h3>{{news.title}} – {{ news.date }}</h3> <p>{{news.content|safe}}</p> + {% 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> + {% endfor %} + <p class='marker_link'><a href='{{ news.get_absolute_url }}'>{% trans "See it on the map"%}</a></p> + {% endif %} </div> {%endfor%}{%endif%}</div> </div> |