much work; comments working for photos, static content moved, more

1 files changed, 6 insertions, 11 deletions

diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index 0d5398d..9a7c290 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -100,20 +100,15 @@
 {% block commentary %}
 <div class="content" id="commentary">
 {% load comments %}
-
+<h3>Post a comment</h3>
 {% if user.is_authenticated %}
-{% comment_form for photos.photo photo.id with is_public yes %}
-comment form:<br />
-{% include "comments/form.html" %}
+{% comment_form for photos.photo object.id with is_public yes %}
 {% else %}
-{% free_comment_form for photos.photo photo.id with is_public yes %}
-free comment form:<br />
-{% include "comments/freeform.html" %}
+{% free_comment_form for photos.photo object.id with is_public yes %}
 {% endif %}
-
-comment list:<br />
-{% get_comment_list for photos.photo photo.id as comments %}
-{% get_free_comment_list for photos.photo photo.id as free_comments %}
+<br />
+{% get_comment_list for photos.photo object.id as comments %}
+{% get_free_comment_list for photos.photo object.id as free_comments %}
 {% include "comment_list" %}
 </div>
 {% endblock %}