[pirate-politics] r507 committed - previous commits failed to add the new templates...

4 views
Skip to first unread message

pirate-...@googlecode.com

unread,
Jan 17, 2011, 2:27:25 PM1/17/11
to pirate-poli...@googlegroups.com
Revision: 507
Author: fragro
Date: Mon Jan 17 11:26:21 2011
Log: previous commits failed to add the new templates...
http://code.google.com/p/pirate-politics/source/detail?r=507

Added:
/trunk/pirate-politics/myTemplates_v2/_issue.html
/trunk/pirate-politics/myTemplates_v2/_rightcol.html
/trunk/pirate-politics/myTemplates_v2/_solution.html
/trunk/pirate-politics/myTemplates_v2/_sourcetags.html
/trunk/pirate-politics/myTemplates_v2/_voting.html
/trunk/pirate-politics/myTemplates_v2/tag_detail.html
/trunk/pirate-politics/myTemplates_v2/welcome.html
Deleted:
/trunk/pirate-politics/myTemplates_v2/cont.html
/trunk/pirate-politics/myTemplates_v2/hot.html
/trunk/pirate-politics/myTemplates_v2/issue_detail_2.html
/trunk/pirate-politics/myTemplates_v2/new.html
Modified:
/trunk/pirate-politics/myTemplates_v2/argument_detail.html
/trunk/pirate-politics/myTemplates_v2/base.html
/trunk/pirate-politics/myTemplates_v2/issue_detail.html
/trunk/pirate-politics/myTemplates_v2/issues.html
/trunk/pirate-politics/myTemplates_v2/solution_detail.html
/trunk/pirate-politics/myTemplates_v2/solutions.html
/trunk/pirate-politics/myTemplates_v2/submit_issue.html
/trunk/pirate-politics/myTemplates_v2/submit_nay_argument.html
/trunk/pirate-politics/myTemplates_v2/submit_solution.html
/trunk/pirate-politics/myTemplates_v2/submit_yea_argument.html

=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/_issue.html Mon Jan 17 11:26:21
2011
@@ -0,0 +1,48 @@
+{% load pp_url %}
+{% load topictags %}
+{% load issuetags %}
+{% load consensustags %}
+{% load argumenttags %}
+{% load solutiontags %}
+
+ {% if iss_obj %}
+
+
+ <div class="issue">
+ <div class="bullet">
+ {% if request.user.is_authenticated %}
+ {% pp_consensus_get object=iss_obj.id
user=request.user %}
+ <h1> {{ pp_consensus.interest|floatformat }}
+ </h1>
+ {% endpp_consensus_get %}
+ {% else %}
+ {% pp_consensus_get object=iss_obj.id %}
+ <h1> {{ pp_consensus.interest|floatformat }}
+ </h1>
+ {% endpp_consensus_get %}
+ {% endif %}
+ <!-- <div class="bullet_daylight"></div>
+ <div class="bullet_verdict"></div> -->
+ </div>
+ <div class="issueback">
+<a href="{% pp_url template='issue_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>
+
+ <div class="threecol">
+ <div class="colmid">
+ <div class="colleft">
+ <div class="col2">
+ {{ iss_obj.arguments }} arguments
+ </div>
+ <div class="col1">
+ {{ iss_obj.solutions }} solution</a>
+ </div>
+ <div class="col3">
+ {{iss_obj.comments}} comments
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+{% endif %}
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/_rightcol.html Mon Jan 17
11:26:21 2011
@@ -0,0 +1,48 @@
+{% load pp_url %}
+{% load topictags %}
+{% load issuetags %}
+{% load consensustags %}
+{% load argumenttags %}
+{% load solutiontags %}
+{% load sourcetags %}
+{% load tag_helpers %}
+
+
+ {% if request.user.is_authenticated %}
+ <ul class="d">
+ <b>Recently Visited:</b>
+ {% for name, link in request.session.last_visited reversed %}
+ <li><a href="{{link}}">{{name}}</a></li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% if request.object %}
+ <ul class="d">
+ <b>Tags:</b> {% if request.user.is_authenticated and
request.object %}<a href="javascript:;"
onmousedown="toggleSlide('tag_rightcol');">+tag</a>{% endif %}
+ {% pp_get_tags_for_object object=request.object %}
+ {% for tag in pp_tag.tags %}
+ <li><a href="{% pp_url template='tag_detail.html'
object=pp_tag.tag %}">{{tag.name}}</a></li>
+ {% endfor %}
+ {% endpp_get_tags_for_object %}
+
+ {% endif %}
+
+ </ul>
+
+ {% if request.user.is_authenticated and request.object %}
+
+ {% pp_tag_form POST=request.POST path=request.path
object=request.object %}
+ <div id="tag_rightcol" style="display:none; overflow:hidden;
height:50px;">
+ {{ pp_tag.form.errors }}
+ <form method="post" action="">
+ {{ pp_tag.form.tag}}
+ {{pp_tag.form.form_id}}
+ {% csrf_token %}
+ <input type="submit" class='button green' value="Submit
Tag">
+ </form>
+ </div>
+ {% endpp_tag_form %}
+ {% endif %}
+
+
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/_solution.html Mon Jan 17
11:26:21 2011
@@ -0,0 +1,49 @@
+{% load pp_url %}
+{% load topictags %}
+{% load issuetags %}
+{% load consensustags %}
+{% load argumenttags %}
+{% load solutiontags %}
+
+ {% if iss_obj %}
+
+ <div class="issue">
+ <div class="main">
+ <div class="bullet">
+ {% if request.user.is_authenticated %}
+ {% pp_consensus_get object=iss_obj.id
user=request.user %}
+ <h1> {{ pp_consensus.interest|floatformat }}
+ </h1>
+ {% endpp_consensus_get %}
+ {% else %}
+ {% pp_consensus_get object=iss_obj.id %}
+ <h1> {{ pp_consensus.interest|floatformat }}
+ </h1>
+ {% endpp_consensus_get %}
+ {% endif %}
+ <!-- <div class="bullet_daylight"></div>
+ <div class="bullet_verdict"></div> -->
+ </div>
+ <div class="issueback">
+<a href="{% pp_url template='solution_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>
+
+ <div class="threecol">
+ <div class="colmid">
+ <div class="colleft">
+ <div class="col2">
+ {{ iss_obj.arguments }} arguments
+ </div>
+ <div class="col1">
+ submitted by <a href="{% pp_url
template='user_profile.html'
object=iss_obj.user %}">{{iss_obj.user.username}}</a>
+ </div>
+ <div class="col3">
+ {{iss_obj.comments}} comments
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ {% endif %}
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/_sourcetags.html Mon Jan 17
11:26:21 2011
@@ -0,0 +1,77 @@
+{% load pp_url %}
+{% load topictags %}
+{% load issuetags %}
+{% load consensustags %}
+{% load argumenttags %}
+{% load solutiontags %}
+{% load sourcetags %}
+{% load tag_helpers %}
+
+<h2>Sources:
+{% ifequal request.user request.object.user %}<a href="javascript:;"
onmousedown="toggleSlide('mydiv');">+url</a>
+
+{% comment %}<a href="javascript:;"
onmousedown="toggleSlide('mydiv2');">+image</a>
+{% endcomment %}
+{% endifequal %}
+</h2>
+ {% ifequal request.user request.object.user %}
+
+ <div id="mydiv" style="display:none; overflow:hidden;
height:30px;">
+
+ {% pp_urlsource_form POST=request.POST
object=request.object user=request.user %}
+ <div id = "add">
+ {{ pp_source.form.errors }}
+ <form method="post" action="">
+ {{ pp_source.urlform.url}}
+ {{ pp_source.urlform.form_id}}
+ {% csrf_token %}
+ <input type="submit" class="button green"
value="Submit URL">
+ </form>
+ </div>
+ {% endpp_urlsource_form %}
+
+
+ </div></div>
+
+ <div id="mydiv2" style="display:none; overflow:hidden;
height:50px;">
+{% comment %}
+ {% pp_imgsource_form POST=request.POST FILE=request.FILES
object=request.object %}
+ <div id = "add">
+ {{ pp_source.imgform.errors }}
+ <form form enctype="multipart/form-data" method="post"
action="">
+ {{ pp_source.imgform.img}}
+ {{ pp_source.imgform.form_id}}
+ {% csrf_token %}
+ <input type="submit" value="Submit URL">
+ </form>
+ </div>
+ {% endpp_imgsource_form %}
+{% endcomment %}
+ </div>
+
+
+
+ {% endifequal %}
+
+ {% pp_get_sources object=request.object %}
+ <ul>
+ {% for urlsource in pp_source.urlsource_list %}
+ <li>
+ {% ifequal request.user request.object.user %}
+ <a href="{{urlsource.url}}">{{urlsource.url}}</a> <a
href="/sourcedelete/{{urlsource.id}}/" class="small button red">-</a>
+ {% else %}
+ <a href="{{urlsource.url}}">{{urlsource.url}}</a>
+ {% endifequal %}
+ </li>
+ {% empty %}
+ No Sources
+ {% endfor %}
+ {% endpp_get_sources %}
+ </ul>
+
+
+
+
+
+
+ </div>
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/_voting.html Mon Jan 17 11:26:21
2011
@@ -0,0 +1,23 @@
+
+
+<div class = "voting">
+ <div class="upvote">
+ <span id="upvote{{request.object.id}}">
+ <img src= "{{pp_consensus.upvoteimg}}"
id="upvoteimg{{request.object.id}}"
onclick="upvote({{request.object.id}},'upcount{{request.object.id}}','upvoteimg{{request.object.id}}');"/>
+ </span>
+ </div>
+
+
+ <div class="irrvote">
+ <span id="neutralvote">
+ <img src= "{{pp_consensus.neutvoteimg}}"
id="neutvoteimg{{request.object.id}}"
onclick="neutvote({{request.object.id}},'neutcount{{request.object.id}}','neutvoteimg{{request.object.id}}');"
/>
+ </span>
+
+ </div>
+ <div class="downvote">
+ <span id="downvote">
+ <img src= "{{pp_consensus.downvoteimg}}"
id="downvoteimg{{request.object.id}}"
onclick="downvote({{request.object.id}},'downcount{{request.object.id}}', 'downvoteimg{{request.object.id}}');"
/>
+ </span>
+
+ </div>
+ </div>
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/tag_detail.html Mon Jan 17
11:26:21 2011
@@ -0,0 +1,82 @@
+{% extends 'base.html' %}
+
+{% load pp_url %}
+{% load argumenttags %}
+{% load consensustags %}
+
+
+{% block css %}
+<link rel="stylesheet" type="text/css" href="/static/style.css" />
+{% endblock %}
+
+{% block content %}
+ <div class="stage">
+ <div class="issuemask">
+ <div class="rightcol">
+ <!-- <ul><a href="{% pp_url
template='submit_solution.html' %}"><img src="/static/submit_solution.png"
/></a></ul> -->
+ <ul>Events:
+ <li>TBA</li>
+ </ul>
+ <ul>Recently Visited:
+ <li>Link 1</li>
+ <li>Link 2</li>
+ </ul>
+
+ </div>
+
+ <div class="pagehead">
+ argument {% ifequal request.object.arg_type.arg 'yea' %}for
{% endifequal %}{% ifequal request.object.arg_type.arg 'nay' %}against {%
endifequal %}
+ <a href="{% pp_url template='solution_detail.html'
object=request.object.parent %}">{{ request.object.parent.name }}</a>
<br>from issue <a href="{% pp_url template='issue_detail_2.html'
object=request.object.parent.issue %}">{{ request.object.parent.issue.name
}}</a>
+
+ </div>
+
+ <div class="issuebound">
+
+
+
+ <div class="solution">
+
+ {% pp_consensus_get object=request.object.id user=request.user %}
+ <div class = "voting">
+ <div class="upvote">
+ <span id="upvote{{request.object.id}}">
+ <img src= "{{pp_consensus.upvoteimg}}"
id="upvoteimg{{request.object.id}}"
onclick="upvote({{request.object.id}},'upcount{{request.object.id}}','upvoteimg{{request.object.id}}');"/>
+ </span>
+ </div>
+
+
+ <div class="irrvote">
+ <span id="neutralvote">
+ <img src= "{{pp_consensus.neutvoteimg}}"
id="neutvoteimg{{request.object.id}}"
onclick="neutvote({{request.object.id}},'neutcount{{request.object.id}}','neutvoteimg{{request.object.id}}');"
/>
+ </span>
+
+ </div>
+ <div class="downvote">
+ <span id="downvote">
+ <img src= "{{pp_consensus.downvoteimg}}"
id="downvoteimg{{request.object.id}}"
onclick="downvote({{request.object.id}},'downcount{{request.object.id}}', 'downvoteimg{{request.object.id}}');"
/>
+ </span>
+
+ </div>
+ </div>
+ {% endpp_consensus_get %}
+ <h1>
+ <div class="solutionback">
+ {{request.object.name}}<h2> submitted by
{{request.object.user.username}} on {{request.object.pub_date}} </h2>
+
+ </div>
+ </h1>
+ </div>
+ <div class="details">
+ <h2>{{request.object.arg_type.arg}} argument
details:</h2>
+ {{request.object.text}}
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+{% endblock content %}
+</body>
+</html>
+
+
=======================================
--- /dev/null
+++ /trunk/pirate-politics/myTemplates_v2/welcome.html Mon Jan 17 11:26:21
2011
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% load pp_url %}
+{% load usertags %}
+
+{% block title %}Register Page{% endblock %}
+{% block css %}
+<link rel="stylesheet" type="text/css" href="/static/style.css" />
+{% endblock %}
+
+{% block content%}
+<h1>WELCOME TO PIRATE-POLITICS</h1>
+
+
+{% endblock content %}
+
=======================================
--- /trunk/pirate-politics/myTemplates_v2/cont.html Wed Dec 15 16:13:49 2010
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends 'base.html' %}
-
-{% load pp_url %}
-{% load topictags %}
-{% load issuetags %}
-{% load consensustags %}
-{% load argumenttags %}
-{% load solutiontags %}
-
-{% block title %}
-{% if request.object %}{{ request.object.text }}{% endif %} Issues
-{% endblock title %}
-{% block css %}
-<link rel="stylesheet" type="text/css" href="/static/style.css" />
-{% endblock %}
-
-{% block content %}
- <div class="stage">
- <div class="issuemask">
- <div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
- <div class="issuebound">
-
- {% pp_get_issue_list dimension="hot" topic=request.object %}
-
- {% for issue in pp_issue.issue_list %}
-
-
- <div class="issue">
- <h1>
- <div class="bullet">
- <h1> {{ issue.interest }}
- </h1>
- <!-- <div class="bullet_daylight"></div>
- <div class="bullet_verdict"></div> -->
- </div>
- <div class="issueback">
- <a STYLE="text-decoration:none" href="{% pp_url
template="issue_detail_2.html" object=issue %}">{{issue.name}}</a>
- <div class="threecol">
- <div class="colmid">
- <div class="colleft">
- <div class="col2">
- X Arguments
- </div>
- <div class="col1">
- {{ issue.solutions}} Solutions
- </div>
- <div class="col3">
- {{issue.comments}} Comments
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </h1>
- </div>
- {% endfor %}
- {% endpp_get_issue_list %}
- </div>
- </div>
- </div>
-</body>
-</html>
-
- <div class="threecol">
- <div class="colmid">
-
-
-{% endblock content %}
=======================================
--- /trunk/pirate-politics/myTemplates_v2/hot.html Thu Jan 13 13:59:30 2011
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends 'base.html' %}
-
-{% load pp_url %}
-{% load topictags %}
-{% load issuetags %}
-{% load consensustags %}
-{% load argumenttags %}
-{% load solutiontags %}
-
-{% block title %}
-{% if request.object %}{{ request.object.text }}{% endif %} Issues
-{% endblock title %}
-{% block css %}
-<link rel="stylesheet" type="text/css" href="/static/style.css" />
-{% endblock %}
-
-{% block content %}
- <div class="stage">
- <div class="issuemask">
- <div class="rightcol">
- <ul><a href="{% pp_url template='submit.html' %}"><img
src="/static/submit_issue.png" /></a></ul>
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
- <div class="issuebound">
-
- {% pp_get_issue_list dimension="hot" topic=request.object %}
-
- {% for issue in pp_issue.issue_list %}
-
-
- <div class="issue">
- <h1>
- <div class="bullet">
- {% pp_consensus_get object=issue.id
user=request.user %}
- <h1> {{ pp_consensus.interest|floatformat }}
- </h1>
- {% endpp_consensus_get %}
- <!-- <div class="bullet_daylight"></div>
- <div class="bullet_verdict"></div> -->
- </div>
- <div class="issueback">
- <a STYLE="text-decoration:none" href="{% pp_url
template="issue_detail_2.html" object=issue %}">{{issue.name}}</a>
- <div class="threecol">
- <div class="colmid">
- <div class="colleft">
- <div class="col2">
- <a STYLE="text-decoration:none" href="{% pp_url
template="issue_detail_2.html" object=issue %}"> {{issue.comments}}
comments </a>
- </div>
- <div class="col1">
- <a href="{% pp_url template='solutions.html' object=issue %}"> {{
issue.solutions}} solutions</a>
- </div>
-
- </div>
- </div>
- </div>
-
- </div>
- </h1>
- </div>
- {% endfor %}
- {% endpp_get_issue_list %}
- </div>
- </div>
- </div>
-{% endblock content %}
-</body>
-</html>
-
-
=======================================
--- /trunk/pirate-politics/myTemplates_v2/issue_detail_2.html Thu Jan 13
13:59:30 2011
+++ /dev/null
@@ -1,164 +0,0 @@
-{% extends 'base.html' %}
-
-{% load pp_url %}
-{% load topictags %}
-{% load issuetags %}
-{% load consensustags %}
-{% load argumenttags %}
-{% load solutiontags %}
-{% load sourcetags %}
-{% load tag_helpers %}
-
-{% block title %}
-{% if request.object %}{{ request.object.text }}{% endif %} Issues
-{% endblock title %}
-{% block css %}
-<link rel="stylesheet" type="text/css" href="/static/style.css" />
-{% endblock %}
-
-{% block content %}
- <div class="stage">
- <div class="issuemask">
- <div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
- <div class="issuebound">
-
- {% pp_get_issue object=request.object %}
-
- <div class="issue">
- <h1>
- <div class="bullet">
- {% pp_consensus_get object=pp_issue.issue.id
user=request.user %}
- <h1> {{ pp_consensus.interest|floatformat }}
- </h1>
- {% endpp_consensus_get %}
- </div>
- <div class="bullet_">
-
- </div>
- <div class="issueback">
- {{pp_issue.issue.name}}
- <div class="threecol">
- <div class="colmid">
- <div class="colleft">
- <div class="col2">
- {{pp_issue.issue.arguments}} arguments
- </div>
- <div class="col1">
- <a href="{% pp_url template='solutions.html'
object=pp_issue.issue %}"> {{ pp_issue.issue.solutions}} solutions</a>
- </div>
- <div class="col3">
- {{pp_issue.issue.comments}} comments
- </div>
- </div>
- </div>
- </div>
- </div>
- </h1>
-
- <div class="detail">
- <h2>Call To Arms:</h2>
- {{pp_issue.issue.text}}
-
-
- <h2>Sources: {% ifequal request.user
pp_issue.issue.user %}<a href="javascript:;"
onmousedown="toggleSlide('mydiv');">+url</a> {% comment %}<a
href="javascript:;" onmousedown="toggleSlide('mydiv2');">+image</a>{%
endcomment %} {% endifequal %}</h2>
- {% ifequal request.user pp_issue.issue.user %}
-
- <div id="mydiv" style="display:none; overflow:hidden;
height:30px;">
-
- {% pp_urlsource_form POST=request.POST
object=pp_issue.issue user=request.user %}
- <div id = "add">
- {{ pp_source.form.errors }}
- <form method="post" action="">
- {{ pp_source.urlform.url}}
- {{ pp_source.urlform.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit URL">
- </form>
- </div>
- {% endpp_urlsource_form %}
-
-
- </div></div>
-
- <div id="mydiv2" style="display:none; overflow:hidden;
height:50px;">
-{% comment %}
- {% pp_imgsource_form POST=request.POST FILE=request.FILES
object=pp_issue.issue %}
- <div id = "add">
- {{ pp_source.imgform.errors }}
- <form form enctype="multipart/form-data" method="post"
action="">
- {{ pp_source.imgform.img}}
- {{ pp_source.imgform.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit URL">
- </form>
- </div>
- {% endpp_imgsource_form %}
-{% endcomment %}
- </div>
-
-
-
- {% endifequal %}
- <ul>
- {% pp_get_sources object=pp_issue.issue %}
- {% for urlsource in pp_source.urlsource_list %}
- <li> <a
href="{{urlsource.url}}">{{urlsource.url}}</a></li>
- {% endfor %}
- {% for imgsource in pp_source.imgsource_list %}
- <li> <img
src="{{imgsource.img.url}}">{{imgsource.img.url}}</img></li>
- {% endfor %}
- {% endpp_get_sources %}
- </ul>
-
-
- </div>
-
- <h2>Tags:</h2>
- {% pp_get_tags_for_object object=pp_issue.issue %}
- {% for tag in pp_tag.tags %}
- <a href="{% pp_url template='tag_detail.html'
object=pp_tag.tag %}">{{tag.name}}</a>,
- {% endfor %}
- {% endpp_get_tags_for_object %}
-
- <div class=add>
- <h3>
- {% if request.user.is_authenticated %}
- {% pp_tag_form POST=request.POST path=request.path
object=pp_issue.issue %}
- {{ pp_tag.form.errors }}
- <form method="post" action="">
- Add Tag:{{ pp_tag.form.tag}}
- {{pp_tag.form.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit URL">
- </form>
- {% endpp_tag_form %}
-
- {% endif %}
-
-
- </div>
- </h3>
-
- {% endpp_get_issue %}
- </div>
- </div>
- </div>
- </div>
-</body>
-</html>
-
- <div class="threecol">
- <div class="colmid">
-
-
-{% endblock content %}
=======================================
--- /trunk/pirate-politics/myTemplates_v2/new.html Wed Dec 15 16:13:49 2010
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends 'base.html' %}
-
-{% load pp_url %}
-{% load topictags %}
-{% load issuetags %}
-{% load consensustags %}
-{% load argumenttags %}
-{% load solutiontags %}
-
-{% block title %}
-{% if request.object %}{{ request.object.text }}{% endif %} Issues
-{% endblock title %}
-{% block css %}
-<link rel="stylesheet" type="text/css" href="/static/style.css" />
-{% endblock %}
-
-{% block content %}
- <div class="stage">
- <div class="issuemask">
- <div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
- <div class="issuebound">
-
- {% pp_get_issue_list dimension="new" topic=request.object %}
-
- {% for issue in pp_issue.issue_list %}
-
-
- <div class="issue">
- <h1>
- <div class="bullet">
- <h1> {{ issue.interest }}
- </h1>
- <!-- <div class="bullet_daylight"></div>
- <div class="bullet_verdict"></div> -->
- </div>
- <div class="issueback">
- <a STYLE="text-decoration:none" href="{% pp_url
template="issue_detail_2.html" object=issue %}">{{issue.name}}</a>
- <div class="threecol">
- <div class="colmid">
- <div class="colleft">
- <div class="col2">
- X Arguments
- </div>
- <div class="col1">
- {{ issue.solutions}} Solutions
- </div>
- <div class="col3">
- {{issue.comments}} Comments
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </h1>
- </div>
- {% endfor %}
- {% endpp_get_issue_list %}
- </div>
- </div>
- </div>
-</body>
-</html>
-
- <div class="threecol">
- <div class="colmid">
-
-
-{% endblock content %}
=======================================
--- /trunk/pirate-politics/myTemplates_v2/argument_detail.html Thu Jan 13
13:59:30 2011
+++ /trunk/pirate-politics/myTemplates_v2/argument_detail.html Mon Jan 17
11:26:21 2011
@@ -13,18 +13,9 @@
{% block content %}
<div class="stage">
<div class="issuemask">
- <div class="rightcol">
- <!-- <ul><a href="{% pp_url
template='submit_solution.html' %}"><img src="/static/submit_solution.png"
/></a></ul> -->
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
+ <div class="rightcol">
+ {% include '_rightcol.html' %}
+ </div>
<div class="pagehead">


@@ -37,27 +28,7 @@
<div class="solution">

{% pp_consensus_get object=request.object.id user=request.user %}
- <div class = "voting">
- <div class="upvote">
- <span id="upvote{{request.object.id}}">
- <img src= "{{pp_consensus.upvoteimg}}"
id="upvoteimg{{request.object.id}}"
onclick="upvote({{request.object.id}},'upcount{{request.object.id}}','upvoteimg{{request.object.id}}');"/>
- </span>
- </div>
-
-
- <div class="irrvote">
- <span id="neutralvote">
- <img src= "{{pp_consensus.neutvoteimg}}"
id="neutvoteimg{{request.object.id}}"
onclick="neutvote({{request.object.id}},'neutcount{{request.object.id}}','neutvoteimg{{request.object.id}}');"
/>
- </span>
-
- </div>
- <div class="downvote">
- <span id="downvote">
- <img src= "{{pp_consensus.downvoteimg}}"
id="downvoteimg{{request.object.id}}"
onclick="downvote({{request.object.id}},'downcount{{request.object.id}}', 'downvoteimg{{request.object.id}}');"
/>
- </span>
-
- </div>
- </div>
+ {% include "_voting.html"%}
{% endpp_consensus_get %}
<h1>
<div class="solutionback">
@@ -66,40 +37,14 @@
</div>
</h1>
</div>
- <div class="details">
+ <div class="detail">
<h2>{{request.object.arg_type.arg}} argument
details:</h2>
{{request.object.text}}

</div>

- <h2>Tags:</h2>
- {% pp_get_tags_for_object object=request.object %}
- {% for tag in pp_tag.tags %}
- <a href="{% pp_url template='tag_detail.html'
object=pp_tag.tag %}">{{tag.name}}</a>,
- {% endfor %}
- {% for tag in pp_tag.tags1 %}
- <a href="{% pp_url template='tag_detail.html'
object=pp_tag.tag %}">{{tag.name}}</a>,
- {% endfor %}
- {% for tag in pp_tag.tags2 %}
- <a href="{% pp_url template='tag_detail.html'
object=pp_tag.tag %}">{{tag.name}}</a>,
- {% endfor %}
- {% endpp_get_tags_for_object %}
-
- <div class=add>
- <h3>
- {% pp_tag_form POST=request.POST path=request.path
object=request.object %}
- {{ pp_tag.form.errors }}
- <form method="post" action="">
- Add Tag:{{ pp_tag.form.tag}}
- {{pp_tag.form.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit URL">
- </form>
- {% endpp_tag_form %}
-
-
- </div>
- </h3>
+
+ {% include '_sourcetags.html' %}
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/myTemplates_v2/base.html Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/myTemplates_v2/base.html Mon Jan 17 11:26:21 2011
@@ -75,9 +75,9 @@

<body>
<div id="header">
- <h1><a STYLE="text-decoration:none" href="/home.html">egalit.ar</a></h1>
+ <div class="headtitle"><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='hot'%}">egalit.ar</a></div>
<ul>
- <li><a href="/hot.html">issues</a></li>
+ <li><a href="{% pp_url template='issues.html'
dimension='hot'%}">issues</a></li>

{% if request.user.is_authenticated %}
<li><a href="{% pp_url template='user_profile.html'
object=request.user%}">profile</a></li> {% else %}
@@ -99,6 +99,7 @@
<li><a STYLE="text-decoration:none"
href="/cont.html">controversial</a></li> |
<li><a STYLE="text-decoration:none" href="/new.html">new </a></li>
</ul>
+ {% endblock %}
</div>
<div class="col1">
<ul>topic:
=======================================
--- /trunk/pirate-politics/myTemplates_v2/issue_detail.html Wed Dec 15
16:13:49 2010
+++ /trunk/pirate-politics/myTemplates_v2/issue_detail.html Mon Jan 17
11:26:21 2011
@@ -1,104 +1,87 @@
{% extends 'base.html' %}
+
+{% load markup %}
+
{% load pp_url %}
+{% load topictags %}
{% load issuetags %}
-{% load solutiontags %}
+{% load consensustags %}
{% load argumenttags %}
+{% load solutiontags %}
+{% load sourcetags %}
+{% load tag_helpers %}
+

{% block title %}
-Issue detail
+{% if request.object %}{{ request.object.text }}{% endif %} Issues
{% endblock title %}
+{% block css %}
+<link rel="stylesheet" type="text/css" href="/static/style.css" />
+{% endblock %}
+
{% block content %}
-
-{% pp_get_issue object=request.object %}
-<h2>Details for {{pp_issue.issue.name|title}}</h2>
- <ul>
-
- <li>{{pp_issue.issue.topic}}</li>
- <li>{{pp_issue.issue.name}}</li>
- <li>{{pp_issue.issue.pub_date}}</li>
- <li>{{pp_issue.issue.text }}</li>
- <li><a
href="/upvote/{{pp_issue.issue.topic}}/{{pp_issue.issue.id}}">Support: {{
pp_issue.upvotes }}</a></li>
- <li><a
href="/neutvote/{{pp_issue.issue.topic}}/{{pp_issue.issue.id}}">Neutral: {{
pp_issue.neutralvotes }}</a></li>
- <li><a
href="/downvote/{{pp_issue.issue.topic}}/{{pp_issue.issue.id}}">Oppose: {{
pp_issue.neutralvotes }}</a></li>
- </ul>
-
-
-
- {% pp_get_solution_list issue=pp_issue.issue %}
-
-<!--Get list of solutions and display them-->
-
- {% for solution in pp_solution.solution_list %}
-
- <span class="detailLink"><a href="{% pp_url
template="solution.html" object=solution %}">Solution:</a></span>
- {{solution.name}} <br>
- {{solution.text}} <br> <br>
-
- {% pp_get_arg_types %}
-
-<!--Display Arguments for this solution-->
-
- {% for arg_type in pp_argumentation.arg_type_list %}
-
- {{arg_type}} <br>
-
- {% pp_get_argument_list object=solution
arg_type=arg_type %}
-
- {% for arg in pp_argumentation.argument_list %}
- {{arg.name}} <br>
- {{arg.text}} <br>
-
- {% endfor %}
-
- {% endpp_get_argument_list %}
-
-<!--Form for adding new arguments for this solution-->
- {% pp_argument_form POST=request.POST path=request.path
user=request.user object=solution arg_type=arg_type %}
-
- <div id = "add">
- <hr />
- {{ pp_argumentation.form.errors }}
- <form method="post" action="">
- {{ pp_argumentation.form.as_p }}
- {% csrf_token %}
- <input type="submit" value="Submit">
- </form>
- </div>
-
- {% endpp_argument_form %}
-
- {% endfor %}
-
- {% endpp_get_arg_types %}
-
- {% endfor %}
-
- {% endpp_get_solution_list %}
-
-<!--Begin Solution Form for adding new solutions-->
- <br>
- Add Solution: <br>
- {% pp_solution_form POST=request.POST path=request.path
user=request.user issue=pp_issue.issue %}
-
- <div id = "add">
- <hr />
- {{ pp_solution.form.errors }}
- <form method="post" action="">
- {{ pp_solution.form.as_p }}
- {% csrf_token %}
- <input type="submit" value="Submit">
- </form>
- </div>
-
- {% endpp_solution_form %}
-
-
-
-{% endpp_get_issue %}
+ <div class="stage">
+ <div class="issuemask">
+
+ <div class="rightcol">
+
+ {% include "_rightcol.html" %}
+
+ </div>
+
+ <div class="issuebound">
+
+ {% pp_get_issue object=request.object %}
+
+ <div class="issue">
+ <div class="main">
+ <div class="bullet">
+ {% pp_consensus_get object=pp_issue.issue.id
user=request.user %}
+ <h1> {{ pp_consensus.interest|floatformat }}
+ </h1>
+ {% endpp_consensus_get %}
+ </div>
+ <div class="bullet_">
+ {% ifequal pp_issue.issue.user
request.user%}
+ <ul><a href="{% pp_url
template='submit_issue.html' object=pp_issue.issue %}" class='button
blue'>edit</a></ul>
+
+ {% endifequal %}
+
+
+ </div>
+ <div class="issueback">
+ {{pp_issue.issue.name}}
+ <div class="threecol">
+ <div class="colmid">
+ <div class="colleft">
+ <div class="col2">
+ {{pp_issue.issue.arguments}} arguments
+ </div>
+ <div class="col1">
+ <a href="{% pp_url template='solutions.html'
object=pp_issue.issue %}"> {{ pp_issue.issue.solutions}} solutions</a>
+ </div>
+ <div class="col3">
+ {{pp_issue.issue.comments}} comments
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="details">
+ {{pp_issue.issue.text|markdown}}
+
+ {% include "_sourcetags.html" %}
+
+ </div>
+ {% endpp_get_issue %}
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>


{% endblock content %}
-
-
-
-
=======================================
--- /trunk/pirate-politics/myTemplates_v2/issues.html Wed Dec 15 16:13:49
2010
+++ /trunk/pirate-politics/myTemplates_v2/issues.html Mon Jan 17 11:26:21
2011
@@ -11,153 +11,55 @@
{% if request.object %}{{ request.object.text }}{% endif %} Issues
{% endblock title %}
{% block css %}
-<link rel="stylesheet" type="text/css" href="/static/issues.css" />
+<link rel="stylesheet" type="text/css" href="/static/style.css" />
{% endblock %}

-{% block content %}
-
-<div class = "topicdisplay">
-{% pp_get_topic_list topic=request.object %}
- {% for topic in pp_topic.topic_list %}
-
- <a href="{% pp_url template="issues.html" object=topic %}">{{
topic.text }}</a>
-
- {% endfor %}
-</div>
-{% endpp_get_topic_list %}
-
- <hr />
-
-{% pp_get_issue_list dimension="new" topic=request.object %}
-
-<div id ="issueList">
- <h2>Issues</h2>
-
-<!--Get list of issues and display them with voting information-->
-
- {% for issue in pp_issue.issue_list %}
-
- {% pp_consensus_get object=issue.id user=request.user %}
- <div class = "issue">
- <span class="name">{{issue.name|
title}}:{{issue.interest}}</span>
- <div class = "voting">
-
- <span id="upvote{{issue.id}}">
- <img src= "{{pp_consensus.upvoteimg}}"
id="upvoteimg{{issue.id}}"
onclick="upvote({{issue.id}},'upcount{{issue.id}}','upvoteimg{{issue.id}}');"/>
- </span>
- (<span
id="upcount{{issue.id}}">{{pp_consensus.upvotes}}</span>)<br />
- <span id="neutralvote">
- <img src= "{{pp_consensus.neutvoteimg}}"
id="neutvoteimg{{issue.id}}"
onclick="neutvote({{issue.id}},'neutcount{{issue.id}}','neutvoteimg{{issue.id}}');"
/>
- </span>
- (<span
id="neutcount{{issue.id}}">{{pp_consensus.neutvotes}}</span>)<br />
- <span id="downvote">
- <img src= "{{pp_consensus.downvoteimg}}"
id="downvoteimg{{issue.id}}"
onclick="downvote({{issue.id}},'downcount{{issue.id}}', 'downvoteimg{{issue.id}}');"
/>
- </span>
- (<span
id="downcount{{issue.id}}">{{pp_consensus.downvotes}}</span>)
-
+ {% block browser_bar %}
+ <ul>issues:
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='hot'%}">hot</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='cont'%}">controversial</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='new'%}">new </a></li>
+ </ul>
+ {% endblock %}
+
+{% block content %}
+ <div class="stage">
+ <div class="issuemask">
+ <div class="rightcol">
+ {% if request.user.is_authenticated %}
+ <ul><a href="{% pp_url template='submit_issue.html' %}"
class='button blue'>Submit Issue</a></ul>
+ {% else %}
+<ul><a href="{% pp_url template='register.html' %}" class='button
blue'>Submit Issue</a></ul>
+ {% endif %}
+ {% include '_rightcol.html' %}
</div>
- <div class = "details">
- <div class="text">{{issue.text}}</div>
- <span class="topic">Categorized under <a
href="/categories/{{issue.topic}}">{{issue.topic}}</a></span>
- <span class="detailLink"><a href="{% pp_url
template="issue_detail.html" object=issue %}">More details</a></span>
- </div>
- </div>
- {% endpp_consensus_get %}
-
- {% pp_get_solution_list issue=issue %}
-
-<!--Get list of solutions and display them-->
-
- {%for solution in pp_solution.solution_list%}
-
- Solution: {{solution.name}} <br>
- {{solution.text}}
-
- {% pp_get_arg_types %}
-
-<!--Display Arguments for this solution-->
-
- {% for arg_type in pp_argumentation.arg_type_list %}
-
- {{arg_type}} <br>
-
- {% pp_get_argument_list object=solution
arg_type=arg_type %}
-
- {% for arg in pp_argumentation.argument_list %}
- {{arg.name}} <br>
- {{arg.text}} <br>
-
- {% endfor %}
-
- {% endpp_get_argument_list %}
-<!--Form for adding new arguments for this solution-->
- {% pp_argument_form POST=request.POST path=request.path
object=issue arg_type=arg_type %}
-
- <div id = "add">
- <hr />
- {{ pp_argumentation.form.errors }}
- <form method="post" action="">
- {{ pp_argumentation.form.name }}
- {{ pp_argumentation.form.text }}
- {% csrf_token %}
- <input type="submit" value="Submit">
- </form>
- </div>
-
- {% endpp_argument_form %}
-
- {% endfor %}
-
- {% endpp_get_arg_types %}
-
- {% endfor %}
-
- {% endpp_get_solution_list %}
-<!--Begin Solution Form for adding new solutions-->
- <br>
- Add Solution: <br>
- {% pp_solution_form POST=request.POST path=request.path issue=issue
arg_type=arg_type %}
-
- <div id = "add">
- <hr />
- {{ pp_solution.form.errors }}
- <form method="post" action="">
- {{ pp_solution.form.name }}
- {{ pp_solution.form.text }}
- {% csrf_token %}
- <input type="submit" value="Submit">
- </form>
- </div>
-
- {% endpp_solution_form %}
-
-
-
- {% empty %}
- There are no issues at this time, dude.
-
-</div>
- {% endfor %}
-
-
-{% endpp_get_issue_list %}
-
-{% pp_issue_form POST=request.POST path=request.path
topic=request.object %}
- <div id = "add">
- <hr />
- <h2>Create an issue</h2>
- {{ pp_issue.form.errors }}
- <form method="post" action="">
- Hey: {{ pp_issue.form.user }} <br>
- Name: <br/>{{ pp_issue.form.name }}<br/>
- Text: <br/>{{ pp_issue.form.text }}<br/>
- {{ pp_issue.form.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit">
- </form>
+ <div class="issuebound">
+ {% if request.dimension%}
+
+ {% pp_get_issue_list dimension=request.dimension
topic=request.object %}
+
+ {% for iss_obj in pp_issue.issue_list %}
+
+ {% include '_issue.html' %}
+
+ {% endfor %}
+ {% endpp_get_issue_list %}
+
+ {% else %}
+ {% pp_get_issue_list dimension="hot" topic=request.object %}
+
+ {% for iss_obj in pp_issue.issue_list %}
+
+ {% include '_issue.html' %}
+
+ {% endfor %}
+ {% endpp_get_issue_list %}
+ {% endif %}
+ </div>
+ </div>
</div>
-{% endpp_issue_form %}
-
-
-
{% endblock content %}
+</body>
+</html>
+
+
=======================================
--- /trunk/pirate-politics/myTemplates_v2/solution_detail.html Thu Jan 13
13:59:30 2011
+++ /trunk/pirate-politics/myTemplates_v2/solution_detail.html Mon Jan 17
11:26:21 2011
@@ -1,109 +1,75 @@
{% extends 'base.html' %}
+
+{% load markup %}

{% load pp_url %}
-{% load tag_helpers %}
{% load topictags %}
{% load issuetags %}
{% load consensustags %}
{% load argumenttags %}
{% load solutiontags %}
-
+{% load sourcetags %}
+{% load tag_helpers %}
+
+{% block title %}
+{% if request.object %}{{ request.object.text }}{% endif %} Issues
+{% endblock title %}
{% block css %}
<link rel="stylesheet" type="text/css" href="/static/style.css" />
{% endblock %}
+
+{% block browser_bar %}
+ <ul>solutions:
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='hot'
object=request.object %}">hot</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='cont'
object=request.object %}">controversial</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='new' object=request.object %}">new
</a></li>
+ </ul>
+ {% endblock %}

{% block content %}
<div class="stage">
<div class="issuemask">
- <div class="rightcol">
- <!-- <ul><a href="{% pp_url
template='submit_solution.html' %}"><img src="/static/submit_solution.png"
/></a></ul> -->
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
- {% pp_get_solution object=request.object %}
-
- {% pp_consensus_get object=pp_solution.solution.id
user=request.user %}
-
- <div class="pagehead">
+
+ <div class="rightcol">
+
+ {% include "_rightcol.html" %}

</div>

<div class="issuebound">
-
- <div class="solution">
- <div class = "voting">
- <div class="upvote">
- <span id="upvote{{pp_solution.solution.id}}">
- <img src= "{{pp_consensus.upvoteimg}}"
id="upvoteimg{{pp_solution.solution.id}}"
onclick="upvote({{pp_solution.solution.id}},'upcount{{pp_solution.solution.id}}','upvoteimg{{pp_solution.solution.id}}');"/>
- </span>
- </div>


- <div class="irrvote">
- <span id="neutralvote">
- <img src= "{{pp_consensus.neutvoteimg}}"
id="neutvoteimg{{pp_solution.solution.id}}"
onclick="neutvote({{pp_solution.solution.id}},'neutcount{{pp_solution.solution.id}}','neutvoteimg{{pp_solution.solution.id}}');"
/>
- </span>
-
- </div>
- <div class="downvote">
- <span id="downvote">
- <img src= "{{pp_consensus.downvoteimg}}"
id="downvoteimg{{pp_solution.solution.id}}"
onclick="downvote({{pp_solution.solution.id}},'downcount{{pp_solution.solution.id}}', 'downvoteimg{{pp_solution.solution.id}}');"
/>
- </span>
-
- </div>
- </div>
- <h1>
- <div class="solutionback">
- {{pp_solution.solution.name}}<br> <h2> submitted
by <a href="{% pp_url template='user_profile.html'
object=pp_solution.user%}">{{pp_solution.solution.user.username}}</a> on
{{pp_solution.solution.submit_date}} </h2>
-
-</div> </h1>
-
- <div class="details">
- <h3>Solution Details:</h3>
- {{pp_solution.solution.text}}
-
- </div>
- </div>
-
-
-
-
- <h2>Tags:</h2>
- {% pp_get_tags_for_object object=pp_solution.solution %}
- {% for tag in pp_tag.tags %}
- <a href="{% pp_url template='tag_detail.html'
object=tag %}">{{tag.name}}</a>,
- {% endfor %}
-
- {% for tag in pp_tag.tags1 %}
- <a href="{% pp_url template='tag_detail.html'
object=tag %}">{{tag.name}}</a>,
- {% endfor %}
-
- {% endpp_get_tags_for_object %}
- {% if request.user.is_authenticated %}
- <div class=add>
- <h3>
- {% pp_tag_form POST=request.POST path=request.path
object=pp_solution.solution %}
- {{ pp_tag.form.errors }}
- <form method="post" action="">
- Add Tag:{{ pp_tag.form.tag}}
- {{pp_tag.form.form_id}}
- {% csrf_token %}
- <input type="submit" value="Submit Tag">
- </form>
- {% endpp_tag_form %}
-
- {% endif %}
-
- </div> </div>
- </div>
- </h3>
+ {% pp_get_solution object=request.object %}
+
+ {% pp_consensus_get object=pp_solution.solution.id
user=request.user %}
+
+ <div class="issue">
+ <div class="main">
+ <div class="bullet2">
+ {% include '_voting.html' %}
+ </div>
+
+ <div class="bullet2_">
+ {% ifequal pp_solution.solution.user
request.user%}
+ <ul><a href="{% pp_url
template='submit_solution.html' object=pp_solution.solution %}"
class='button blue'>edit</a></ul>
+
+ {% endifequal %}
+ </div>
+ <div class="issueback2">
+{{pp_solution.solution.name}}<br>
+
+<div class="userinfo">submitted by <a href="{% pp_url
template='user_profile.html'
object=pp_solution.user%}">{{pp_solution.solution.user.username}}</a>
{{pp_solution.solution.submit_date|date:"(d/m/Y h:sA)"}} | comment |
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
+
+ </div>
+ </div>
+
+
+
+ <div class="details">
+ {{pp_solution.solution.text|markdown}}
+
+ </div>
+ {% include "_sourcetags.html" %}

<div class="argument">

@@ -168,17 +134,17 @@

</ul>

- {% endpp_consensus_get %}
-
- </div>
-
-
-
+
+ {% endpp_consensus_get %}
+ {% endpp_get_solution %}
+ </div>
+ </div>
+ </div>
+ </div>
+</div> </div>
</div>
- {% endpp_get_solution %}
-
-{% endblock content %}
</body>
</html>
-
-
+
+
+{% endblock content %}
=======================================
--- /trunk/pirate-politics/myTemplates_v2/solutions.html Thu Jan 13
13:59:30 2011
+++ /trunk/pirate-politics/myTemplates_v2/solutions.html Mon Jan 17
11:26:21 2011
@@ -10,75 +10,58 @@
{% block css %}
<link rel="stylesheet" type="text/css" href="/static/style.css" />
{% endblock %}
+
+{% block browser_bar %}
+ <ul>issues:
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='hot'%}">hot</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='cont'%}">controversial</a></li> |
+ <li><a STYLE="text-decoration:none" href="{% pp_url
template='solutions.html' dimension='new'%}">new </a></li>
+ </ul>
+ {% endblock %}

{% block content %}
<div class="stage">
<div class="issuemask">
- <div class="rightcol">
-
- <ul><a href="{% pp_url template='submit_solution.html'
object=request.object %}"><img src="/static/submit_solution.png"
/></a></ul>
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
-
- </div>
-
+
+ <div class="rightcol">
+ {% if request.user.is_authenticated %}
+ <ul><a href="{% pp_url template='submit_solution.html'
object=request.object %}" class='button blue'>Submit Solution</a></ul>
+ {% else %}
+<ul><a href="{% pp_url template='register.html' %}" class='button
blue'>Submit Solution</a></ul>
+ {% endif %}
+ {% include '_rightcol.html' %}
+ </div>
<div class="pagehead">

</div>

<div class="issuebound">

+ {% if request.dimension %}
+
+ {% pp_get_solution_list issue=request.object
dimension=request.dimension %}
+
+
+ {%for iss_obj in pp_solution.solution_list%}
+
+ {% include '_solution.html' %}
+
+ {% endfor %}
+
+ {% endpp_get_solution_list %}
+
+ {% else %}
{% pp_get_solution_list issue=request.object dimension="hot" %}


- {%for solution in pp_solution.solution_list%}
-
- <div class="issue">
- <h1>
-
- <div class="bullet">
- {% if request.user.is_authenticated %}
- {% pp_consensus_get object=solution.id
user=request.user %}
- <h1> {{ pp_consensus.interest|floatformat }}
- </h1>
- {% endpp_consensus_get %}
- {% else %}
- {% pp_consensus_get object=solution.id %}
- <h1> {{ pp_consensus.interest|floatformat }}
- </h1>
- {% endpp_consensus_get %}
- {% endif %}
- <!-- <div class="bullet_daylight"></div>
- <div class="bullet_verdict"></div> -->
- </div>
- <div class="issueback">
-<a href="{% pp_url template='solution_detail.html' object=solution %}">
{{solution.name}} </a>
-
- <div class="threecol">
- <div class="colmid">
- <div class="colleft">
- <div class="col2">
- {{ solution.arguments }} arguments
- </div>
- <div class="col1">
- submitted by <a href="{% pp_url
template='user_profile.html'
object=solution.user %}">{{solution.user.username}}</a>
- </div>
- <div class="col3">
- {{solution.comments}} comments
- </div>
- </div>
- </div>
- </div>
- </div>
- </h1>
- </div>
- {% endfor %}
- {% endpp_get_solution_list %}
+ {%for iss_obj in pp_solution.solution_list%}
+
+ {% include '_solution.html' %}
+
+ {% endfor %}
+
+ {% endpp_get_solution_list %}
+ {% endif %}
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/myTemplates_v2/submit_issue.html Tue Jan 11
02:15:49 2011
+++ /trunk/pirate-politics/myTemplates_v2/submit_issue.html Mon Jan 17
11:26:21 2011
@@ -12,16 +12,24 @@
<div class="stage">
<div class="issuemask">
<div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
+ {% 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>
@@ -31,12 +39,14 @@
Text: <br>{{ pp_issue.form.text }}
{{ pp_issue.form.form_id}}
{% csrf_token %}
- <input type="submit" value="Submit Issue">
+ <input type="submit" class="button green" value="Submit Issue" />
</form>
</div>
+{% endpp_issue_form %}
+{% endif %}

</div></div>
-{% endpp_issue_form %}
+

{% endblock content %}

=======================================
--- /trunk/pirate-politics/myTemplates_v2/submit_nay_argument.html Wed Jan
5 13:39:26 2011
+++ /trunk/pirate-politics/myTemplates_v2/submit_nay_argument.html Mon Jan
17 11:26:21 2011
@@ -11,13 +11,7 @@
<div class="stage">
<div class="issuemask">
<div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
+ {% include "_rightcol.html" %}

</div>

@@ -29,7 +23,7 @@
{{ pp_argumentation.form.as_p }}
{{ pp_argumentation.form.form_id}}
{% csrf_token %}
- <input type="submit" value="Submit Solution">
+ <input type="submit" class="button green" value="Submit Nay" />
</form>
</div>

=======================================
--- /trunk/pirate-politics/myTemplates_v2/submit_solution.html Tue Jan 11
02:15:49 2011
+++ /trunk/pirate-politics/myTemplates_v2/submit_solution.html Mon Jan 17
11:26:21 2011
@@ -12,13 +12,7 @@
<div class="stage">
<div class="issuemask">
<div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
+ {% include "_rightcol.html" %}

</div>

@@ -31,7 +25,7 @@
Text: <br>{{ pp_solution.form.text }}
{{ pp_solution.form.form_id}}
{% csrf_token %}
- <input type="submit" value="Submit">
+ <input type="submit" class="button green" value="Submit Solution" />
</form>
</div>

=======================================
--- /trunk/pirate-politics/myTemplates_v2/submit_yea_argument.html Tue Jan
11 02:15:49 2011
+++ /trunk/pirate-politics/myTemplates_v2/submit_yea_argument.html Mon Jan
17 11:26:21 2011
@@ -11,13 +11,7 @@
<div class="stage">
<div class="issuemask">
<div class="rightcol">
- <ul>Events:
- <li>TBA</li>
- </ul>
- <ul>Recently Visited:
- <li>Link 1</li>
- <li>Link 2</li>
- </ul>
+ {% include "_rightcol.html" %}

</div>

@@ -30,7 +24,7 @@
Text: <br>{{ pp_argumentation.form.text }}
{{ pp_argumentation.form.form_id}}
{% csrf_token %}
- <input type="submit" value="Submit">
+ <input type="submit" class="button green" value="Submit Yea" />
</form>
</div>

Reply all
Reply to author
Forward
0 new messages