[pirate-politics] r528 committed - changes to the vote buttons and some changes to the css
pirate-...@googlecode.com
Author: fragro
Date: Wed Jan 26 22:18:11 2011
Log: changes to the vote buttons and some changes to the css
http://code.google.com/p/pirate-politics/source/detail?r=528
Modified:
/trunk/pirate-politics/new_templates/_commentform.html
/trunk/pirate-politics/new_templates/_voting.html
/trunk/pirate-politics/new_templates/argument_detail.html
/trunk/pirate-politics/new_templates/issue_detail.html
/trunk/pirate-politics/new_templates/solution_detail.html
/trunk/pirate-politics/static/style.css
/trunk/pirate-politics/static/voteimgs/down_arrow_acti.png
/trunk/pirate-politics/static/voteimgs/down_arrow_flat.png
/trunk/pirate-politics/static/voteimgs/neut_arrow_acti.png
/trunk/pirate-politics/static/voteimgs/neut_arrow_flat.png
/trunk/pirate-politics/static/voteimgs/up_arrow_acti.png
/trunk/pirate-politics/static/voteimgs/up_arrow_flat.png
=======================================
--- /trunk/pirate-politics/new_templates/_commentform.html Wed Jan 26
19:21:55 2011
+++ /trunk/pirate-politics/new_templates/_commentform.html Wed Jan 26
22:18:11 2011
@@ -5,7 +5,7 @@
{% 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;">
+<div id="add_comment" style="display:none; overflow:hidden; height:180px;">
{% pp_comment_form POST=request.POST path=request.path
user=request.user object=request.object%}
{{ pp_comment.form.errors }}
<form method="post" action="">
=======================================
--- /trunk/pirate-politics/new_templates/_voting.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/_voting.html Wed Jan 26 22:18:11
2011
@@ -1,23 +1,12 @@
<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>
=======================================
--- /trunk/pirate-politics/new_templates/argument_detail.html Wed Jan 26
19:21:55 2011
+++ /trunk/pirate-politics/new_templates/argument_detail.html Wed Jan 26
22:18:11 2011
@@ -27,12 +27,6 @@
<div class="issue">
<div class="main">
{% pp_consensus_get object=request.object.id user=request.user %}
-
- {% include '_voting.html' %}
-
-
-
-
<div class="issueback2">
{% ifequal request.object.user
request.user %}
@@ -53,14 +47,16 @@
{% endifequal %}
{% endifequal %}
{{request.object.name}}<br>
-
-<div class="userinfo">submitted by <a href="{% pp_url
template='user_profile.html'
object=pp_solution.user%}">{{request.object.user.username}}</a>
{{request.object.submit_date|date:"(d/m/Y h:sA)"}} {% comment %}|
{{comment_count}} comment{{comment_count|pluralize}} {% endcomment %}|
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
-
+{% pp_comment_count object=request.object.id %}
+<div class="userinfo">submitted by <a href="{% pp_url
template='user_profile.html'
object=request.object.user%}">{{request.object.user.username}}</a>
+
+ {{request.object.submit_date|date:"(d/m/Y h:sA)"}}| {{ pp_comment.count
}} comment{{ pp_comment.count|pluralize}} |
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
+{% endpp_comment_count %}
</div>
-
-
-
+ {% include '_voting.html' %}
+
+
<div class="details">
{{request.object.text|markdown}}
=======================================
--- /trunk/pirate-politics/new_templates/issue_detail.html Wed Jan 26
15:29:32 2011
+++ /trunk/pirate-politics/new_templates/issue_detail.html Wed Jan 26
22:18:11 2011
@@ -67,7 +67,12 @@
<a href="{% pp_url template='solutions.html'
object=pp_issue.issue %}">see {{ pp_issue.issue.solutions}}
solution{{pp_issue.issue.solutions|pluralize}}...</a>
</div>
<div class="col3">
- 0 comments
+ {% pp_comment_count
object=pp_issue.issue.id %}
+
+ {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}}
+
+ {% endpp_comment_count %}
+
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/solution_detail.html Wed Jan 26
19:21:55 2011
+++ /trunk/pirate-politics/new_templates/solution_detail.html Wed Jan 26
22:18:11 2011
@@ -45,8 +45,6 @@
<div class="issue">
<div class="main">
- {% include '_voting.html' %}
-
<div class="issueback2">
{% ifequal pp_solution.solution.user
request.user %}
@@ -60,11 +58,20 @@
{% endifequal %}
{{pp_solution.solution.name}}<br>
-<div class="userinfo">submitted by <a href="{% pp_url
template='user_profile.html'
object=pp_solution.solution.user%}">{{pp_solution.solution.user.username}}</a>
{{pp_solution.solution.submit_date|date:"(d/m/Y h:sA)"}} {% comment %}|
{{comment_count}} comment{{comment_count|pluralize}} {% endcomment %}|
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
+<div class="userinfo">submitted by <a href="{% pp_url
template='user_profile.html'
object=pp_solution.solution.user%}">{{pp_solution.solution.user.username}}</a>
+
+{% pp_comment_count object=pp_solution.solution.id %}
+
+{{pp_solution.solution.submit_date|date:"(d/m/Y h:sA)"}} | {{
pp_comment.count }} comment{{ pp_comment.count|pluralize}} |
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
+
+{% endpp_comment_count %}
+
</div>
-
+ </div>
+
+ {% include '_voting.html' %}
<div class="details">
@@ -74,7 +81,7 @@
{% include "_sourcetags.html" %}
- </div>
+
<div class="argument">
=======================================
--- /trunk/pirate-politics/static/style.css Wed Jan 26 15:58:58 2011
+++ /trunk/pirate-politics/static/style.css Wed Jan 26 22:18:11 2011
@@ -120,9 +120,7 @@
}
.voting {
- bottom:100px;
- width:40px;
- height:90px;
+ margin-left:10%;
}
.pagehead {
@@ -143,7 +141,7 @@
}
.issuemask {
- position:absolute;
+ position:relative;
width:100%;
/*position:left;*/
float:left;
@@ -225,14 +223,12 @@
.downvote {
margin:0px 0px 0px 0px;
position:relative;
-
overflow:visible;
}
.irrvote {
margin:0px 0px 0px 0px;
position:relative;
-
overflow:visible;
}
@@ -244,7 +240,6 @@
bottom:+2px;
overflow:visible;
}
-
.argument ul{
list-style-type:none;
@@ -285,7 +280,6 @@
/*background-color:#d3d9df;*/
/*overflow:hidden;*/
/*border:1px dashed black;*/
- margin-bottom: 30px;
}
@@ -316,10 +310,8 @@
.issue .issueback2 {
float:right;
- position:absolute;
+ position:relative;
width:90%;
- top:10px;
- left:50px;
font-size:150%;
font-style:bold;
min-width:20%;
=======================================
--- /trunk/pirate-politics/static/voteimgs/down_arrow_acti.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/down_arrow_acti.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/voteimgs/down_arrow_flat.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/down_arrow_flat.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/voteimgs/neut_arrow_acti.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/neut_arrow_acti.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/voteimgs/neut_arrow_flat.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/neut_arrow_flat.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/voteimgs/up_arrow_acti.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/up_arrow_acti.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/voteimgs/up_arrow_flat.png Tue Aug 3
23:30:37 2010
+++ /trunk/pirate-politics/static/voteimgs/up_arrow_flat.png Wed Jan 26
22:18:11 2011
Binary file, no diff available.