summaryrefslogtreecommitdiffstats
path: root/templates/agenda/one_group.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/agenda/one_group.html')
-rwxr-xr-xtemplates/agenda/one_group.html46
1 files changed, 26 insertions, 20 deletions
diff --git a/templates/agenda/one_group.html b/templates/agenda/one_group.html
index 6f0adfb..cccd0ae 100755
--- a/templates/agenda/one_group.html
+++ b/templates/agenda/one_group.html
@@ -1,33 +1,41 @@
{% extends "agenda/base.html" %}
{% load i18n %}
{% load comments %}
-{% block title %}{{ group.name }}{% endblock %}
+{% block title %}{{ group.title }}{% endblock %}
{% block branding %}{{ group.name }}{% endblock %}
{% block content_title %} <h1>{{ group.name }}</h1> {% endblock %}
-{% block map %}
-<div class="map" style="float: right;">
- {% include "agenda/group_map_view.html" %}
-</div>
-{% endblock %}
-
{% block content %}
<div id="content-main">
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
- {% if group.networkevent.count %}
+ {% if group_events %}
<div class="module">
<h2>{% trans 'Events' %}</h2>
- {% for event_link in group.networkevent.all %}
- <h4><a href="/agenda/{{ event_link.event.id }}">{{ event_link.event }}</a> {{ event_link.event.start_date|date }}</h4>
- <p>{{ event_link.event.description }}
+ {% for event_link in group_events %}
+ <h4><a href="/agenda/{{ event_link.id }}">{{ event_link.title }}</a> {{ event_link.start_date|date:"D" }} - {{ event_link.start_date|date }}</h4>
+ <p>{{ event_link.description|linebreaks }}
{% endfor %}
</div>
{% endif %}
<div class="module">
<h2>{% trans 'Comments' %}</h2>
+
+{% get_comment_list for group as comment_list %}
+{% if comment_list %}
+<h2>{% trans 'Comments for this group' %}:</h2>
+{% for comment in comment_list %}
+{% if comment.is_public %}
+<h3>{{ comment.headline }}</h3>
+<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 %}
<h4>{% trans 'Leave comment' %}:</h4>
- {% render_comment_form for auth.group group.id %}
+ <form action="{% comment_form_target %}" method="POST">
+
+ {% render_comment_form for group %}
-</div>
</div>
</div>
</div>
@@ -36,11 +44,9 @@
<div class="module">
<h2>{% trans 'To do' %}</h2>
-<form action="todo/add/" class="collapse" method="POST">
-<ul class="actionlist">
-{{ newtodo.as_ul }}
-<li><input type="submit" name="submit" class="submit-post" value="Post"></li>
-</ul>
+<form action="{% url agenda.views.savegrouptodo group.id %}" class="collapse" method="POST">
+{{ newtodo.as_p }}
+<p><input type="submit" name="submit" class="submit-post" value="Post"></p>
<input type="hidden" name="network" value="{{ group.id }}" id="id_group" />
<input type="hidden" name="creator" value="{{ user.id }}" id="id_creator" />
</form>
@@ -53,9 +59,9 @@
{% endfor %}
{% endif %}
</div>
-<div class="module">
{% get_comment_list for auth.group group.id as comment_list %}
{% if comment_list %}
+<div class="module">
<h2>{% trans 'Comments for this group' %}</h2>
<ul class="actionlist">
{% for comment in comment_list %}
@@ -68,6 +74,6 @@
{% endfor %}
</ul>
-{% endif %}
</div>
+{% endif %}
{% endblock %}