Added:
/trunk/pirate-politics/new_templates/_commentform.html
/trunk/pirate-politics/new_templates/_commentleaf.html
/trunk/pirate-politics/new_templates/_comments.html
/trunk/pirate-politics/new_templates/_tutorial.html
/trunk/pirate-politics/new_templates/edit_issue.html
Modified:
/trunk/pirate-politics/new_templates/argument_detail.html
/trunk/pirate-politics/new_templates/solution_detail.html
=======================================
--- /dev/null
+++ /trunk/pirate-politics/new_templates/_commentform.html Wed Jan 26
19:21:55 2011
@@ -0,0 +1,23 @@
+{% load commenttags %}
+{% load markup %}
+{% load pp_url %}
+
+
+{% if request.user.is_authenticated %}
+<a href="javascript:;" onmousedown="toggleSlide('add_comment');"><h3>add
comment</h3></a>
+<div id="add_comment" style="display:none; overflow:hidden; height:250px;">
+ {% pp_comment_form POST=request.POST path=request.path
user=request.user object=request.object%}
+ {{ pp_comment.form.errors }}
+ <form method="post" action="">
+ {{ pp_comment.form.text}}
+ {{ pp_comment.form.parent}}
+ {{pp_comment.form.form_id}}
+ {% csrf_token %}
+ <input type="submit" class='button green' value="Submit
Comment">
+ </form>
+ {% endpp_comment_form %}
+</div>
+
+{% else %}
+<a href="/register.html"><h3>add_comment</h3></a>
+{% endif %}
=======================================
--- /dev/null
+++ /trunk/pirate-politics/new_templates/_commentleaf.html Wed Jan 26
19:21:55 2011
@@ -0,0 +1,37 @@
+{% load commenttags %}
+{% load markup %}
+{% load pp_url %}
+
+<div style="margin-left: {{ node.get_depth }}em;" class="comment"
+ id="comment_{{ node.id }}">
+ <div>
+ {{ node.user.username }}, on {{ node.created }}, said:
+ </div>
+ <div>
+ {{ node.text|linebreaks }}
+ </div>
+ <div>
+ {% ifequal node.get_depth 1 %}
+ <a href="{{ node.get_absolute_url }}">#</a>
+ ({{ count }}
+ comment{{ count|pluralize }} in this conversation)
+ {% else %}
+ <a href="#comment_{{ node.id }}">#</a>
+ ({{ count }}
+ repl{{ count|pluralize:"y,ies" }})
+ {% endifequal %}
+ <a href="javascript:;"
onmousedown="toggleSlide('add_reply{{node.id}}');">reply</a> (<a href="{{
node.get_absolute_url }}delete/">delete</a>)
+ <div id="add_reply{{node.id}}" style="display:none;
overflow:hidden; height:200px;">
+ {% pp_comment_form2 POST=request.POST path=request.path
user=request.user object=node%}
+ {{ pp_comment.form.errors }}
+ <form method="post" action="">
+ {{ pp_comment.form.text}}
+ {{ pp_comment.form.parent}}
+ {{pp_comment.form.form_id}}
+ {% csrf_token %}
+ <input type="submit" class='button green'
value="Submit Comment">
+ </form>
+ {% endpp_comment_form2 %}
+ </div>
+ </div>
+ </div>
=======================================
--- /dev/null
+++ /trunk/pirate-politics/new_templates/_comments.html Wed Jan 26 19:21:55
2011
@@ -0,0 +1,34 @@
+{% load commenttags %}
+{% load markup %}
+{% load pp_url %}
+
+ <div class="comment">
+ <div class="comment-author"><a href="{% pp_url
template='user_profile.html'
object=comment.user %}">{{iss_obj.user.username}}</a></div>
+ <div class="comment-body">
+ <p>{{ iss_obj.text}}
+ </p>
+ </div>
+ {% include '_commentform.html' %}
+ {% if not comment.is_leaf %}
+ <ul class="children">
+
+ {% pp_comment_list_get object=iss_obj.pk %}
+ {% if pp_comment.comments %}
+ {% for iss_obj in pp_comment.comments %}
+
+ {% if iss_obj.is_leaf %}
+ {% include '_commentleaf.html' %}
+ {% else %}
+ {% include '_comments.html' %}
+ {% endif %}
+
+ {% endfor %}
+ {% endif %}
+ {% endpp_comment_list_get %}
+
+
+ {% endif %}
+ </div>
+ </div>
+
+
=======================================
--- /dev/null
+++ /trunk/pirate-politics/new_templates/_tutorial.html Wed Jan 26 19:21:55
2011
@@ -0,0 +1,11 @@
+<div class="tutorial">
+ <p>
+ <br><br><br>
+ Use ==== or ---- below a line of text for a header<br><br>
+ Use **word** to emphasize it.<br><br>
+ --- for horizontal lines<br><br>
+ Use:<br>
+ ><br>><br>><br> for block quotes
+
+ </p>
+</div>
=======================================
--- /dev/null
+++ /trunk/pirate-politics/new_templates/edit_issue.html Wed Jan 26
19:21:55 2011
@@ -0,0 +1,52 @@
+{% extends 'base.html' %}
+{% load pp_url %}
+{% load issuetags %}
+
+{% block title %}Login Page{% endblock %}
+{% block css %}
+<link rel="stylesheet" type="text/css" href="/static/style.css" />
+{% endblock %}
+
+{% block content%}
+
+<div class="stage">
+ <div class="issuemask">
+ <div class="rightcol">
+ {% include "_rightcol.html" %}
+
+ </div>
+{% if request.object %}
+{% pp_issue_form POST=request.POST path=request.path request=request
issue=request.object %}
+ <div id = "add">
+ <h2>Edit Issue</h2>
+ {{ pp_issue.form.errors }}
+ <form method="post" action="">
+ Name: <br>{{ pp_issue.form.name }}<br>
+ Text: <br>{{ pp_issue.form.text }}
+ {{ pp_issue.form.form_id}}
+ {% csrf_token %}
+ <input type="submit" class="button green" value="Submit Issue" />
+ </form>
+ </div>
+{% endpp_issue_form %}
+{% else %}
+{% pp_issue_form POST=request.POST path=request.path request=request %}
+ <div id = "add">
+ <h2>Submit a New Issue</h2>
+ {{ pp_issue.form.errors }}
+ <form method="post" action="">
+ Name: <br>{{ pp_issue.form.name }}<br>
+ Text: <br>{{ pp_issue.form.text }}
+ {{ pp_issue.form.form_id}}
+ {% csrf_token %}
+ <input type="submit" class="button green" value="Submit Issue" />
+ </form>
+ </div>
+{% endpp_issue_form %}
+{% endif %}
+
+</div></div>
+
+
+{% endblock content %}
+
=======================================
--- /trunk/pirate-politics/new_templates/argument_detail.html Tue Jan 25
15:15:31 2011
+++ /trunk/pirate-politics/new_templates/argument_detail.html Wed Jan 26
19:21:55 2011
@@ -67,9 +67,24 @@
</div>
{% include "_sourcetags.html" %}
+
+ {% include '_commentform.html' %}
+
+ <div class="commentstructure">
+
+ {% pp_comment_list_get user=request.user
object=request.object.id request=request %}
+
+ {% comment %} {{ pp_comment.debug_comments }} {%
endcomment %}
+ {{ pp_comment.comments|safe }}
+
+ {% endpp_comment_list_get%}
+
+
</div>
</div>
+
+ </div>
<div class="rightcol">
{% include '_rightcol.html' %}
</div> </div>
=======================================
--- /trunk/pirate-politics/new_templates/solution_detail.html Tue Jan 25
15:15:31 2011
+++ /trunk/pirate-politics/new_templates/solution_detail.html Wed Jan 26
19:21:55 2011
@@ -137,9 +137,22 @@
{% endpp_get_argument_list %}
</ul>
{% endpp_consensus_get %}
- {% endpp_get_solution %}
+
</div>
+ {% include '_commentform.html' %}
+
+ <div class="commentstructure">
+
+ {% pp_comment_list_get user=request.user
object=pp_solution.solution.id request=request %}
+
+ {% comment %} {{ pp_comment.debug_comments }} {%
endcomment %}
+ {{ pp_comment.comments|safe }}
+
+ {% endpp_comment_list_get%}
+ {% endpp_get_solution %}
+ </div>
+
</div></div>
<div class="rightcol">