6 files changed, 2 insertions, 165 deletions
diff --git a/bn_django/templates/comments/form.html b/bn_django/templates/comments/form.html
deleted file mode 100644
index a2af1be..0000000
--- a/bn_django/templates/comments/form.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load i18n %}
-<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post">
-
-<p><textarea name="comment" id="id_comment"></textarea></p>
-<input class="submit" type="submit" name="preview" value="{% trans "Preview comment" %}" /> 
-{% if user.is_authenticated %}
-<p>&nbsp;{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)
-{% 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>)
-{% endif %}
-</p>
-
-{% 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>
-<input type="hidden" name="options" value="{{ options }}" />
-<input type="hidden" name="target" value="{{ target }}" />
-<input type="hidden" name="gonzo" value="{{ hash }}" />
-</p>
-</form>
diff --git a/bn_django/templates/comments/free_preview.html b/bn_django/templates/comments/free_preview.html
deleted file mode 100644
index 3c212c0..0000000
--- a/bn_django/templates/comments/free_preview.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "base.html" %}
-
-
-{% block title %}Preview your comment{% endblock %}
-
-{% block content %}
-
-<form action="../postfree/" method="post">
-    {% if comment_form.has_errors %}
-        <p><strong style="color: red;">Please correct the following errors.</strong></p>
-    {% else %}
-        <div class="comment">
-        {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
-        <p class="date small">Posted by <strong>{{ comment.person_name }}</strong></p>
-        </div>
-
-        <p><input type="submit" name="post" value="Post public comment" /></p>
-
-        <h1>Or edit it again</h1>
-    {% endif %}
-
-    {% if comment_form.person_name.errors %}
-        {{ comment_form.person_name.html_error_list }}
-    {% endif %}
-
-    <p><label for="id_person_name">Your name:</label> {{ comment_form.person_name }}</p>
-
-    {% if comment_form.comment.errors %}
-        {{ comment_form.comment.error_list }}
-    {% endif %}
-
-    <p>
-        <label for="id_comment">Comment:</label>
-        <br />
-        {{ comment_form.comment }}
-    </p>
-    
-    <input type="hidden" name="options" value="{{ options }}" />
-    <input type="hidden" name="target" value="{{ target }}" />
-    <input type="hidden" name="gonzo" value="{{ hash }}" />
-    
-    <p>
-        <input type="submit" name="preview" value="Preview revised comment" />
-    </p>
-</form>
-{% endblock %}
diff --git a/bn_django/templates/comments/freeform.html b/bn_django/templates/comments/freeform.html
deleted file mode 100644
index 3d3678e..0000000
--- a/bn_django/templates/comments/freeform.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% load i18n %}
-<form action="/comments/postfree/" method="post">
-<p><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
-<input class="submit" type="submit" name="preview" value="{% trans "Preview comment" %}" />
-<p>&nbsp;<label for="id_person_name">{% trans "Your name:" %}</label> <input type="text" id="id_person_name" name="person_name" />
-<input type="hidden" name="options" value="{{ options }}" />
-<input type="hidden" name="target" value="{{ target }}" />
-<input type="hidden" name="gonzo" value="{{ hash }}" />
-</p>
-</form>
diff --git a/bn_django/templates/comments/posted.html b/bn_django/templates/comments/posted.html
deleted file mode 100644
index 07bdb67..0000000
--- a/bn_django/templates/comments/posted.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Comment posted successfully{% endblock %}
-
-{% block content %}
-<p>Thanks for contributing.</p>
-
-{% if object %}
-    <ul>
-        <li><a href="{{ object.get_absolute_url }}">View your comment</a></li>
-    </ul>
-{% endif %}
-{% endblock %}
diff --git a/bn_django/templates/comments/preview.html b/bn_django/templates/comments/preview.html
deleted file mode 100644
index 052b373..0000000
--- a/bn_django/templates/comments/preview.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "base.html" %}
-
-
-{% block title %}Preview your comment{% endblock %}
-
-{% block content %}
-
-<form action="../post/" method="post">
-    {% if comment_form.has_errors %}
-        <p><strong style="color: red;">Please correct the following errors.</strong></p>
-    {% else %}
-        <div class="comment">
-        {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
-        <p class="date small">Posted by <strong>{{ comment.person_name }}</strong></p>
-        </div>
-
-        <p><input type="submit" name="post" value="Post public comment" /></p>
-
-        <h1>Or edit it again</h1>
-    {% endif %}
-
-    {% if comment_form.person_name.errors %}
-        {{ comment_form.person_name.html_error_list }}
-    {% endif %}
-
-    <p><label for="id_person_name">Your name:</label> {{ comment_form.person_name }}</p>
-
-    {% if comment_form.comment.errors %}
-        {{ comment_form.comment.html_error_list }}
-    {% endif %}
-
-    <p>
-        <label for="id_comment">Comment:</label>
-        <br />
-        {{ comment_form.comment }}
-    </p>
-    
-    <input type="hidden" name="options" value="{{ options }}" />
-    <input type="hidden" name="target" value="{{ target }}" />
-    <input type="hidden" name="gonzo" value="{{ hash }}" />
-    
-    <p>
-        <input type="submit" name="preview" value="Preview revised comment" />
-    </p>
-</form>
-{% endblock %}
diff --git a/bn_django/templates/newcomments_table b/bn_django/templates/newcomments_table
index 6c38d10..ab50b7c 100644
--- a/bn_django/templates/newcomments_table
+++ b/bn_django/templates/newcomments_table
@@ -5,21 +5,9 @@
         {{ c.submit_date|date:"F jS" }}</td>
     <td class="description">
         {% if c.user.username %}{{ c.user.username }}
-        {% else %}anonymous{% endif%} </td>
+        {% else %}c.user_name{% endif%} </td>
     <td class="description">
-        <a href="{{c.get_content_object.get_absolute_url}}">
-        {{ c.content_type.name }}</a></td>
-        </tr>
-{% endfor %}
-{% for c in latest_freecomments %}
-<tr>
-    <td class="date">
-        {{ c.submit_date|date:"F jS" }}</td>
-    <td class="description">
-        {% if c.person_name %}{{c.person_name}}{% else %}anonymous{% endif %}
-        </td>
-    <td class="description">
-        <a href="{{c.get_content_object.get_absolute_url}}">
+        <a href="{{c.get_content_object_url}}">
         {{ c.content_type.name }}</a></td>
         </tr>
 {% endfor %}