summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-19 01:13:53 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-19 01:13:53 +0100
commitf19d83a2ea0c6fce6e5da8f637a68dc4a758270b (patch)
tree9e764f83de4ca0cdfdff25ab9f9e1bdad401e812
parent005b59d77fbb07900209afacc31c0f39f4f40d0d (diff)
downloadChimère-f19d83a2ea0c6fce6e5da8f637a68dc4a758270b.tar.bz2
Chimère-f19d83a2ea0c6fce6e5da8f637a68dc4a758270b.zip
Update detail template with dates (refs #270)
-rw-r--r--chimere/main/views.py1
-rw-r--r--chimere/templates/detail.html7
2 files changed, 7 insertions, 1 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py
index fce17d7..3092eb9 100644
--- a/chimere/main/views.py
+++ b/chimere/main/views.py
@@ -253,6 +253,7 @@ def getDetail(request, area_name, marker_id):
for network in settings.SHARE_NETWORKS:
share_networks.append((network[0], network[1] % net_dct, network[2]))
response_dct['share_networks'] = share_networks
+ response_dct['dated'] = settings.DAYS_BEFORE_EVENT and marker.start_date
return render_to_response('detail.html', response_dct)
def getDescriptionDetail(request, area_name, category_id):
diff --git a/chimere/templates/detail.html b/chimere/templates/detail.html
index 94f8eae..d7084db 100644
--- a/chimere/templates/detail.html
+++ b/chimere/templates/detail.html
@@ -2,7 +2,12 @@
<h2>{{ marker.name }}</h2>
<div id='detail_content'>
{% if marker.picture %}<img src='{{media_path}}{{marker.picture}}' alt='{{marker.name}}'/>{%endif%}
-<div>{% for property in marker.getProperties %}
+<div>
+{% if dated %}
+<p id='detail_start_date'><label>{% trans "Date:" %}</label> <span>{{marker.start_date|date:"D d M Y"}}
+{% 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 %}
{% if simple %}{% trans "Share on"%}{% for share_network in share_networks %}