summaryrefslogtreecommitdiffstats
path: root/templates/agenda/wishlist.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/agenda/wishlist.html')
-rwxr-xr-xtemplates/agenda/wishlist.html36
1 files changed, 23 insertions, 13 deletions
diff --git a/templates/agenda/wishlist.html b/templates/agenda/wishlist.html
index 26f6e50..e361b7f 100755
--- a/templates/agenda/wishlist.html
+++ b/templates/agenda/wishlist.html
@@ -28,30 +28,28 @@
{% endfor %}
{% endif %}
- {% if user.is_staff %} - <a href="/admin/agenda/wish/{{ object.id }}" class="changelink">{% trans 'Modify' %}</a> - <a href="/admin/agenda/wish/{{ object.id }}/delete" class="deletelink">{% trans 'Delete' %}</a>
+ {% if user.is_staff %} - <a href="/admin/agenda/wish/{{ object.id }}" class="changelink">{% trans 'Modify' %}</a> - <a href="{% url agenda.views.closewishitem object.id %}" class="deletelink">{% trans 'Close' %}</a>
{% endif %}
- {% if object.comment_set.all %}{% trans 'Comments' %}: {{ object.comment_set.count }}{% endif %}
-
{% get_comment_list for object as comment_list %}
-{% if comment_list %}
-<div class="module">
-<h4>{% trans 'Comments about this item' %}:</h4>
-{% 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 %}
+ {% if comment_list %}
+ <div class="module">
+ <h4>{% trans 'Comments about this item' %}:</h4>
+ {% for comment in comment_list %}
+ {% if comment.is_public %}
+ <p>{{ comment.headline }} {{ comment.comment|linebreaks }} <i>{% trans 'Posted by' %} {{ comment.user }} on {{ comment.submit_date|date }}</i>{% if user.is_authenticated %} <a href="/admin/comments/comment/{{ comment.id }}/delete" class="deletelink">{% trans 'Delete' %}</a> {% endif %}
{% endif %}
{% endfor %}
</div>
{% endif %}
+ {% if user.is_staff %}
<a href="#" onClick="toggleDisplay('comment-{{ object.id }}');return false;">
-Add a comment</a>
+Add a comment</a>{% endif %}
+
<div id="comment-{{ object.id }}" class="invisible">
<form action="{% comment_form_target %}" method="POST">
{% render_comment_form for object %}
+<input type="hidden" name="next" value="{% url agenda.views.wishlist %}" />
</div>
@@ -60,6 +58,7 @@ Add a comment</a>
</li>
{% endfor %}
</ul>
+<p><a href="/admin/agenda/wish/add" class="actionlink">{% trans 'Add another item' %}</a>
{% else %}
<p>{% trans 'There are no items on the wishlist! Do you want to add one?' %}<a href="/admin/agenda/wish/add" class="actionlink">{% trans ' Click here.' %}</a>
</div>
@@ -67,6 +66,17 @@ Add a comment</a>
{% endblock %}
{% block sidebar %}
{{ block.super }}
+{% if done %}
+ <div class="module">
+ <h2>{% trans 'Already gotten' %}</h2>
+ <ul>
+ {% for object in done %}
+ <li><h3>{{ object.title|title }}</h3>
+ <p>{{ object.description }}</p>
+ {% endfor %}
+ </div>
+ {% endif %}
+
{% endblock %}
{% block info %}
template: "agenda/wishlist.html"