work on integrating comments universally

6 files changed, 90 insertions, 1 deletions

diff --git a/bn_django/photos/templates/photos/photo_detail.html b/bn_django/photos/templates/photos/photo_detail.html
index 10bf8ba..0d5398d 100644
--- a/bn_django/photos/templates/photos/photo_detail.html
+++ b/bn_django/photos/templates/photos/photo_detail.html
@@ -1,5 +1,6 @@
 {% extends "photos/base.html" %}
 {# {% load markup %} #}
+{% load comments %}
 
 {% block path %}
   {{ block.super }}
@@ -94,6 +95,25 @@
 {% else %}
 <p>This is not the photo you are looking for.</p>
 {% endif %}
+{% endblock %}
 
+{% block commentary %}
+<div class="content" id="commentary">
+{% load comments %}
 
+{% if user.is_authenticated %}
+{% comment_form for photos.photo photo.id with is_public yes %}
+comment form:<br />
+{% include "comments/form.html" %}
+{% else %}
+{% free_comment_form for photos.photo photo.id with is_public yes %}
+free comment form:<br />
+{% include "comments/freeform.html" %}
+{% 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 %}
+{% include "comment_list" %}
+</div>
 {% endblock %}
diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html
index 0df7a36..ad46a37 100644
--- a/bn_django/templates/base.html
+++ b/bn_django/templates/base.html
@@ -55,6 +55,7 @@
 Here lies content!
 {% endblock %}
 </div>
+{% block commentary %} {% endblock %}
 <div class="content_footer" id="footer" name="footer">
 <b>
 &nbsp;
diff --git a/bn_django/templates/comment_list b/bn_django/templates/comment_list
new file mode 100644
index 0000000..8ed411d
--- /dev/null
+++ b/bn_django/templates/comment_list
@@ -0,0 +1,16 @@
+
+{% if comments %}
+<table class="comments">
+{% for c in comments %}
+<tr><td class="comment_info">
+    <span class="comment_user">{{ c.user }}</span>
+    <span class="comment_date">{{ c.submit_date }}</span>
+    </td><td class="comment_content">
+    <span class="comment_headline">{{ c.headline|escape|wordwrap:80 }}</span>
+    <span class="comment_content">{{ c.content|escape|wordwrap:80 }}</span>
+</td</tr>
+{% endfor %}
+</table>
+{% else %}
+<h3>No comments yet!</h3>
+{% endif %}
diff --git a/bn_django/templates/comments/form.html b/bn_django/templates/comments/form.html
new file mode 100644
index 0000000..316d6a1
--- /dev/null
+++ b/bn_django/templates/comments/form.html
@@ -0,0 +1,36 @@
+{% load i18n %}
+<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post">
+
+{% if user.is_authenticated %}
+<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p>
+{% else %}
+<p><label for="id_username">{% trans "Username:" %}</label> <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p>
+{% endif %}
+
+{% if ratings_optional or ratings_required %}
+<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p>
+<table>
+<tr><th>&nbsp;</th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr>
+{% for rating in rating_choices %}
+<tr><th>{{ rating }}</th>{% for value in rating_range %}<th><input type="radio" name="rating{{ forloop.parentloop.counter }}" value="{{ value }}" /></th>{% endfor %}</tr>
+{% endfor %}
+</table>
+<input type="hidden" name="rating_options" value="{{ rating_options }}" />
+{% endif %}
+
+{% if photos_optional or photos_required %}
+<p><label for="id_photo">{% trans "Post a photo" %}</label> ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):
+<input type="file" name="photo" id="id_photo" /></p>
+<input type="hidden" name="photo_options" value="{{ photo_options }}" />
+{% endif %}
+
+<p><label for="id_comment">{% trans "Comment:" %}</label><br />
+<textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+
+<p>
+<input type="hidden" name="options" value="{{ options }}" />
+<input type="hidden" name="target" value="{{ target }}" />
+<input type="hidden" name="gonzo" value="{{ hash }}" />
+<input type="submit" name="preview" value="{% trans "Preview comment" %}" />
+</p>
+</form>
diff --git a/bn_django/templates/comments/freeform.html b/bn_django/templates/comments/freeform.html
new file mode 100644
index 0000000..f0d00b9
--- /dev/null
+++ b/bn_django/templates/comments/freeform.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+{% if display_form %}
+<form action="/comments/postfree/" method="post">
+<p><label for="id_person_name">{% trans "Your name:" %}</label> <input type="text" id="id_person_name" name="person_name" /></p>
+<p><label for="id_comment">{% trans "Comment:" %}</label><br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+<p>
+<input type="hidden" name="options" value="{{ options }}" />
+<input type="hidden" name="target" value="{{ target }}" />
+<input type="hidden" name="gonzo" value="{{ hash }}" />
+<input type="submit" name="preview" value="{% trans "Preview comment" %}" />
+</p>
+</form>
+{% endif %}
diff --git a/static/style/default.css b/static/style/default.css
index 2c63d93..35373c7 100644
--- a/static/style/default.css
+++ b/static/style/default.css
@@ -156,7 +156,6 @@ pre.large {
     border: 1px solid black; }
 .content_footer {
     margin-left: 4%;
-    width: 685px;
     font-size: 10px;
     font-style: italic;
     font-family: sans-serif;
@@ -191,6 +190,10 @@ pre.large {
     width: 160px;
     height: 180px; }
 
+#commentary {
+    background-color: #a9afdc;
+    background-color: #c7c6ff;
+    border-top: 2px solid #000000; }
 #top_bar {
     height: 22px;
     background-color: #993333;