summaryrefslogtreecommitdiff
path: root/chimere/templates/welcome.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-27 18:20:27 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-27 18:20:27 +0100
commit7d05508460d6113d1c865661b0148677880c52da (patch)
tree9714f6cfe7ba3931317152360fa386b4e26e1926 /chimere/templates/welcome.html
parentcf38c77cd7aa1e6031d694f792626a7ccfb95cd8 (diff)
downloadChimère-7d05508460d6113d1c865661b0148677880c52da.tar.bz2
Chimère-7d05508460d6113d1c865661b0148677880c52da.zip
Display curret events on the welcome page (closes #282)
Diffstat (limited to 'chimere/templates/welcome.html')
-rw-r--r--chimere/templates/welcome.html10
1 files changed, 9 insertions, 1 deletions
diff --git a/chimere/templates/welcome.html b/chimere/templates/welcome.html
index 463f880..8206c18 100644
--- a/chimere/templates/welcome.html
+++ b/chimere/templates/welcome.html
@@ -6,8 +6,16 @@
{% if news_lst %}<div class='news'>
{% for news in news_lst %}
<div class='info'>
- <h3>{{news.title}} - {% trans news.date %}</h3>
+ {% if news.title %}
+ <h3>{{news.title}} &ndash; {{ news.date }}</h3>
<p>{{news.content|safe}}</p>
+ {% 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|safe }}</p>
+ {% endfor %}
+ <p class='marker_link'><a href='{{ news.get_absolute_url }}'>{% trans "See it on the map"%}</a></p>
+ {% endif %}
</div>
{%endfor%}
</div>{%endif%}