summaryrefslogtreecommitdiffstats
path: root/templates/agenda/location_events.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/agenda/location_events.html')
-rwxr-xr-xtemplates/agenda/location_events.html38
1 files changed, 16 insertions, 22 deletions
diff --git a/templates/agenda/location_events.html b/templates/agenda/location_events.html
index d8fd595..8b1fa2f 100755
--- a/templates/agenda/location_events.html
+++ b/templates/agenda/location_events.html
@@ -1,32 +1,27 @@
{% extends "agenda/base.html" %}
{% load i18n %}
{% block info %}{% endblock %}
-{% block map %}
-<div class="map" style="float: right;">
- {% include "agenda/location_map_view.html" %}
-</div>
-{% endblock %}
{% block branding %}{{ location.title }} {% endblock %}
{% block title %}{{ location.title }} {% endblock %}
{% block sidebar %}{{ block.super }}
-<div class="module">
{% load comments %}
-{% get_comment_list for agenda.location location.id as comment_list %}
+{% get_comment_list for location as comment_list %}
{% if comment_list %}
+<div class="module">
<h2>{% trans 'Comments about this location' %}:</h2>
{% for comment in comment_list %}
{% if comment.is_public %}
<h3>{{ comment.headline }}</h3>
-<p>{{ comment.comment }}
+<p>{{ comment.comment|linebreaks }}
<p>{% trans 'Posted by' %} {{ comment.user }} on {{ comment.submit_date|date }}
{% if user.is_authenticated %} <a href="/admin/comments/comment/{{ comment.id }}/delete" class="deletelink">{% trans 'Delete' %}</a>{% endif %}
{% endif %}
{% endfor %}
-{% endif %}
</div>
+{% endif %}
{% endblock %}
{% block content %}
@@ -35,27 +30,26 @@
<div class="module">
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-<img src="/media/{{ location.picture }}" width="450px"><br>
+{% if location.picture %}
+ <img src="{{ location.picture.url }}" width="450px"><br>
+{% endif %}
+
{% if location.description %}
-{% trans 'Description' %}:<br>{{ location.description }}{% endif %}
+<p>{% trans 'Description' %}:<br>{{ location.description|linebreaks }}{% endif %}
</div>
<div class="module">
-<h2>{% trans 'Events for this location' %}</h2>
-{% for id in location.event_set.all %}
-
-<h3><a href="/agenda/{{ id.id }}">{{ id.title }}</a></h3>
-{% trans 'When' %}: {{ id.start_date|date }}
-{% if user.is_authenticated %} <a href="/admin/agenda/event/{{ id.id }}" class="changelink">{% trans 'Change' %}</a>{% endif %}
+{% with location_events as event %}
+{% include "agenda/events_tag.html" %}
+{% endwith %}
+</div>
-{% if id.group.count %}{% trans 'Groups' %}:
+{% if id.group.count %}- {% trans 'groups' %}:
{% for network in id.group.all %} <a href="/group/{{ network.group.id }}">{{ network.group }}</a> {% endfor %}
<br> {% endif %}
-{% endfor %}
</div>
<div class="module">
<h2>{% trans 'Leave a comment on this location' %}</h2>
-{% render_comment_form for agenda.location location.id %}
-
-
+<form action="{% comment_form_target %}" method="POST">
+{% render_comment_form for location %}
</div>
{% endblock %}