[pirate-politics] r535 committed - changes to css and some structural changes

[pirate-...@googlecode.com]

Revision: 535
Author: fragro
Date: Mon Jan 31 18:54:01 2011
Log: changes to css and some structural changes
http://code.google.com/p/pirate-politics/source/detail?r=535

Modified:
/trunk/pirate-politics/new_templates/_issue.html
/trunk/pirate-politics/new_templates/_solution.html
/trunk/pirate-politics/pirate_issues/models.py
/trunk/pirate-politics/pirate_issues/templatetags/issuetags.py
/trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py
/trunk/pirate-politics/static/style.css

=======================================
--- /trunk/pirate-politics/new_templates/_issue.html Mon Jan 31 18:26:02
2011
+++ /trunk/pirate-politics/new_templates/_issue.html Mon Jan 31 18:54:01
2011
@@ -27,18 +27,15 @@
<div class="bullet_verdict"></div> -->
</div>
<div class="issueback">
- {% if not request.object %}
- <div class="bullet3_">
- <a href="{% pp_url template='issues.html'
object=iss_obj.topic dimension=request.dimension %}">{{ iss_obj.topic.text
}}</a>
- </div>
- {% endif %}
+
<a href="{% pp_url template='issue_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>

<div class="threecol">
<div class="iss_col1">
{% pp_comment_count
object=iss_obj.id %}

- {{ iss_obj.solutions }} solution{{ iss_obj.solutions|pluralize }} | {{
iss_obj.arguments }} argument{{ iss_obj.arguments|pluralize }} | {{
pp_comment.count }} comment{{ pp_comment.count|pluralize}}
+{% if not request.object %}
+ submitted to <a href="{% pp_url
template='issues.html' object=iss_obj.topic
dimension=request.dimension %}">{{ iss_obj.topic.text }}</a> | {%
endif %}{{ iss_obj.solutions }} solution{{ iss_obj.solutions|pluralize }} |
{{ iss_obj.arguments }} argument{{ iss_obj.arguments|pluralize }} | {{
pp_comment.count }} comment{{ pp_comment.count|pluralize}}

{% endpp_comment_count %}

=======================================
--- /trunk/pirate-politics/new_templates/_solution.html Mon Jan 31 18:26:02
2011
+++ /trunk/pirate-politics/new_templates/_solution.html Mon Jan 31 18:54:01
2011
@@ -36,7 +36,6 @@

</div>
<a href="{% pp_url template='solution_detail.html' object=iss_obj %}">
{{iss_obj.name}} </a>
- <div class="threecol">
<div class="iss_col3">
{% pp_comment_count
object=iss_obj.id %}

@@ -44,12 +43,7 @@
{% endpp_comment_count %}

</div>
- <div class="iss_col2">
-
-
- </div>
-
- </div>
+
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/pirate_issues/models.py Fri Jan 21 16:05:49 2011
+++ /trunk/pirate-politics/pirate_issues/models.py Mon Jan 31 18:54:01 2011
@@ -35,7 +35,7 @@
#This should be a pirate-wikipage instance
class Issue(models.Model):
topic = models.ForeignKey(Topic, blank= True, null = True)
- name = models.CharField(max_length=54, default = "DEF", blank=True)
+ name = models.CharField(max_length=64, default = "DEF", blank=True)
submit_date = models.DateTimeField('date_published',auto_now_add=True)
text = models.TextField(max_length=1200)
user = models.ForeignKey(User, blank=True, null=True)
@@ -60,7 +60,7 @@

class Solution(models.Model):
issue = models.ForeignKey(Issue, blank=True, null=True)
- name = models.CharField(max_length=54, default = "DEF", blank=True,
null=True)
+ name = models.CharField(max_length=64, default = "DEF", blank=True,
null=True)
text = models.TextField(max_length=1200)
submit_date = models.DateTimeField('date_published',auto_now_add=True)
user = models.ForeignKey(User ,blank=True, null=True)
=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/issuetags.py Fri Jan
28 02:56:45 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/issuetags.py Mon Jan
31 18:54:01 2011
@@ -334,8 +334,8 @@

#need to grab user from authenticatio
form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_issue_form")
- name = forms.CharField(label="text", max_length=54,
+ name = forms.CharField(label="text", max_length=64,
widget=forms.TextInput(
- attrs={'size':'50', 'class':'inputText'}))
+ attrs={'size':'60', 'class':'inputText'}))
text = forms.CharField(widget=forms.Textarea)

=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Mon
Jan 31 18:26:02 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Mon
Jan 31 18:54:01 2011
@@ -218,9 +218,9 @@

form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_solution_form")
text = forms.CharField(widget=forms.Textarea)
- name = forms.CharField(label="text", max_length=54,
+ name = forms.CharField(label="text", max_length=64,
widget=forms.TextInput(
- attrs={'size':'50', 'class':'inputText'}))
+ attrs={'size':'64', 'class':'inputText'}))
#comments = forms.CharField(widget=forms.HiddenInput(), initial=0)
#issue = forms.CharField(widget=forms.HiddenInput(), initial=None)
#user = forms.CharField(widget=forms.HiddenInput(), initial=None)
=======================================
--- /trunk/pirate-politics/static/style.css Mon Jan 31 18:26:02 2011
+++ /trunk/pirate-politics/static/style.css Mon Jan 31 18:54:01 2011
@@ -400,7 +400,7 @@
.issue .issueback {
position:absolute;
width:90%;
- top:-20px;
+ top:-25%;
left:60px;
font-size:150%;
font-style:bold;
@@ -520,7 +520,6 @@

.comment_user, .comment_reply{
font-size:80%;
-
}

.commentstructure li {
@@ -579,7 +578,7 @@
right:1%;
position:absolute;
width:31%;
- bottom:2%;
+ bottom:-50%;
padding:0px 0px 0px 0px;
}

@@ -679,6 +678,7 @@
}

.iss_col3 {
+ font-size:60%;
width:100%;
margin-top:8px;
}