X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=templates%2Finfluences%2Finfluence_comments_block.html;h=6b0dd51597ca693c5e83293a5b41fd06bc077042;hb=60cf2b9beceddc413d686541c4c4f207bc8cd3a2;hp=255482ae2ec5811f41c318b1ae20c85b955163b7;hpb=f607c7e7d713bc79c40523e0ed061c0ee1c3b3bb;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/templates/influences/influence_comments_block.html b/templates/influences/influence_comments_block.html
index 255482a..6b0dd51 100644
--- a/templates/influences/influence_comments_block.html
+++ b/templates/influences/influence_comments_block.html
@@ -1,23 +1,23 @@
 {% load i18n %}
 {% load threadedcommentstags %}
 
-{% if comments %}
-    <script type="text/javascript">
-        function showReply(comment_id) {
-            YAHOO.util.Dom.setStyle('replyForm' + comment_id, 'display', 'block');
-            YAHOO.util.Dom.setStyle('replyLink' + comment_id, 'display', 'none');
-        }
+<script type="text/javascript">
+    function showReply(comment_id) {
+        YAHOO.util.Dom.setStyle('replyForm' + comment_id, 'display', 'block');
+        YAHOO.util.Dom.setStyle('replyLink' + comment_id, 'display', 'none');
+    }
 
-        function hideReply(comment_id) {
-            YAHOO.util.Dom.setStyle('replyForm' + comment_id, 'display', 'none');
-            YAHOO.util.Dom.setStyle('replyLink' + comment_id, 'display', 'block');
-        }
-    </script>
+    function hideReply(comment_id) {
+        YAHOO.util.Dom.setStyle('replyForm' + comment_id, 'display', 'none');
+        YAHOO.util.Dom.setStyle('replyLink' + comment_id, 'display', 'block');
+    }
+</script>
 
+{% 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,10 +25,15 @@
 				<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 }}
+                    {{ 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>
@@ -36,3 +41,21 @@
 {% else %}
     {% trans "No comments were added yet" %}
 {% endif %}
+
+<p style="display:none;" id="replyLink"><a href="javascript:showReply('')">Add comment</a></p>
+<div id="replyForm">
+<script type="text/javascript">hideReply('')</script>
+<h3>{% trans "Add comment" %}</h3>
+<form method="post" action="{% url influences_influence_comment object.id %}">
+	<p><a href="javascript:hideReply('')">Cancel comment</a></p>
+    {{ 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>