Improve CSSability of comments.

[matthijs/projects/xerxes.git] / templates / influences / influence_comments_block.html

diff --git a/templates/influences/influence_comments_block.html b/templates/influences/influence_comments_block.html
index 19695917e4363b80a8b1011d22c7c1b7e21fbb09..e2d6b91c8cbcb7af9dcdf026f1e0b196b65004f7 100644 (file)
--- a/templates/influences/influence_comments_block.html
+++ b/templates/influences/influence_comments_block.html
@@ -16,8 +16,8 @@
 {% if comments %}
     {% for comment in comments %}
         <div style="margin-left: {{ comment.depth }}em;" class="comment{% if not comment.is_public %} private{% endif %}">
-            {{ comment.user }} said:<br/>
-            {% auto_transform_markup comment %}
+            <span class="commenter">{{ comment.user }} said:</span>
+            <div class="comment-body">{% auto_transform_markup comment %}</div>
                        <p style="display:none;" id="replyLink{{comment.id}}">
                                <a href="javascript:showReply('{{comment.id}}');">{% trans "Reply to this comment" %}</a>
                        </p>
@@ -25,16 +25,23 @@
                                <script type="text/javascript">hideReply('{{comment.id}}');</script>
                                <form method="post" action="{% url influences_influence_comment_parent object.id,comment.id %}">
                                        <p><a href="javascript:hideReply('{{comment.id}}');">{% trans "Cancel reply" %}</a></p>
-                                       <table>
-                                       {{ comment.reply_form.as_table }}
-                                       </table>
-                                       <div><input type="submit" value="{% trans "Reply to this comment" %}" /></div>
+                    {{ comment.reply_form.comment.label_tag }}<br/>
+                    {{ comment.reply_form.comment }}<br/>
+                                       {{ comment.reply_form.is_public }}
+                                       {{ comment.reply_form.is_public.label_tag }}
+                                       <div>
+                    <input type="hidden" name="next" value="{{ request.path }}" />
+                    <input type="submit" value="{% trans "Reply to this comment" %}" />
+                    <input type="submit" name="preview" value="{% trans "Preview" %}" />
+                    </div>
                                </form>
                        </div>
         </div>
     {% endfor %}
 {% else %}
+       <p class="nocomments">
     {% trans "No comments were added yet" %}
+       </p>
 {% endif %}
 
 <p style="display:none;" id="replyLink"><a href="javascript:showReply('')">Add comment</a></p>
@@ -43,10 +50,14 @@
 <h3>{% trans "Add comment" %}</h3>
 <form method="post" action="{% url influences_influence_comment object.id %}">
        <p><a href="javascript:hideReply('')">Cancel comment</a></p>
-    <table>
-    {{ comment_form.as_table }}
-    </table>
-    <div><input type="submit" value="{% trans "Add comment" %}" /></div>
-    {# <input type="submit" name="preview" value="{% trans "Preview comment" %}" /></li> #}
+    {{ comment_form.comment.label_tag }}
+    {{ comment_form.comment }}<br/>
+    {{ comment_form.is_public }}
+    {{ comment_form.is_public.label_tag }}
+    <div>
+    <input type="hidden" name="next" value="{{ request.path }}" />
+    <input type="submit" value="{% trans "Add comment" %}" />
+    <input type="submit" name="preview" value="{% trans "Preview" %}" />
+    </div>
 </form>
 </div>