[pirate-politics] r534 committed - changes to css and some structural changes
pirate-...@googlecode.com
Author: fragro
Date: Mon Jan 31 18:26:02 2011
Log: changes to css and some structural changes
http://code.google.com/p/pirate-politics/source/detail?r=534
Modified:
/trunk/pirate-politics/new_templates/_issue.html
/trunk/pirate-politics/new_templates/_solution.html
/trunk/pirate-politics/new_templates/base.html
/trunk/pirate-politics/new_templates/issue_detail.html
/trunk/pirate-politics/new_templates/issues.html
/trunk/pirate-politics/new_templates/solutions.html
/trunk/pirate-politics/new_templates/user_profile.html
/trunk/pirate-politics/pirate_consensus/templatetags/consensustags.py
/trunk/pirate-politics/pirate_core/middleware.py
/trunk/pirate-politics/pirate_core/views.py
/trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py
/trunk/pirate-politics/pirate_messages/models.py
/trunk/pirate-politics/pirate_profile/templatetags/profiletags.py
/trunk/pirate-politics/static/style.css
/trunk/pirate-politics/urls.py
=======================================
--- /trunk/pirate-politics/new_templates/_issue.html Thu Jan 27 01:48:18
2011
+++ /trunk/pirate-politics/new_templates/_issue.html Mon Jan 31 18:26:02
2011
@@ -29,30 +29,25 @@
<div class="issueback">
{% if not request.object %}
<div class="bullet3_">
- {{ iss_obj.topic.text }}
+ <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="colmid">
- <div class="colleft">
- <div class="col2">
- {{ iss_obj.arguments }} argument{{
iss_obj.arguments|pluralize }}
- </div>
- <div class="col1">
- <a href="{% pp_url template='solutions.html' object=iss_obj
dimension=dimension %}">see {{ iss_obj.solutions }} solution{{
iss_obj.solutions|pluralize }}...</a>
- </div>
- <div class="col3">
-
- {% pp_comment_count
object=iss_obj.id %}
-
- {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}}
+ <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}}
{% endpp_comment_count %}
+
+ </div>
+ <div class="iss_col2">
+ <a href="{% pp_url
template='solutions.html' object=iss_obj dimension=request.dimension %}"
class="button blue">see solution{{ iss_obj.solutions|pluralize }}</a>
+
</div>
- </div>
- </div>
+
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/_solution.html Thu Jan 27 20:02:47
2011
+++ /trunk/pirate-politics/new_templates/_solution.html Mon Jan 31 18:26:02
2011
@@ -16,36 +16,39 @@
{% pp_consensus_get object=iss_obj.id
user=request.user %}
<h1> {{ pp_consensus.interest|floatformat }}
</h1>
- {% endpp_consensus_get %}
+ {% endpp_consensus_get %}
{% else %}
{% pp_consensus_get object=iss_obj.id %}
<h1> {{ pp_consensus.interest|floatformat }}
</h1>
- {% endpp_consensus_get %}
+ {% endpp_consensus_get %}
{% endif %}
<!-- <div class="bullet_daylight"></div>
<div class="bullet_verdict"></div> -->
</div>
+
<div class="issueback">
+ <div class="bullet_">
+
+ {% pp_consensus_get object=iss_obj.id
user=request.user %}
+ {% include '_voting_iss_obj.html' %}
+ {% endpp_consensus_get %}
+
+</div>
<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 }} argument{{
iss_obj.arguments|pluralize }}
- </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">
- {% pp_comment_count
object=iss_obj.id %}
-
- {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}}
-
+ <div class="threecol">
+ <div class="iss_col3">
+ {% pp_comment_count
object=iss_obj.id %}
+
+submitted by <a href="{% pp_url template='user_profile.html'
object=iss_obj.user%}"> {{iss_obj.user.username}} </a> on
{{iss_obj.submit_date|date:"(d/m/Y h:sA)"}} | {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}} | {{iss_obj.arguments}}
argument{{iss_obj.arguments|pluralize}}
{% endpp_comment_count %}
+
+ </div>
+ <div class="iss_col2">
+
+
</div>
- </div>
- </div>
+
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/base.html Fri Jan 28 02:56:45 2011
+++ /trunk/pirate-politics/new_templates/base.html Mon Jan 31 18:26:02 2011
@@ -121,13 +121,18 @@
<div id="header">
<div class="headtitle"><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='hot'%}">egalit.ar</a></div>
<ul>
+ <li><a href="{% pp_url template='topics.html'
dimension='hot' %}">topics</a></li>
<li><a href="{% pp_url template='issues.html'
dimension='hot' %}">issues</a></li>
+ <li><a href="{% pp_url template='solutions.html'
dimension='hot' %}">solutions</a></li>
{% if request.user.is_authenticated %}
- <li><a href="{% pp_url template='user_profile.html'
object=request.user%}">profile</a></li> {% else %}
+ <li><a href="{% pp_url template='user_profile.html'
object=request.user%}">profile</a></li>
+ {% else %}
<li><a href="/register.html">profile</a></li>
{% endif %}
- <li><a href="/platform">platform</a></li>
+ <li><a href="/platform.html">platform</a></li>
+ <li><a href="/action.html">action</a></li>
+ <li><a href="/action.html">about</a></li>
</ul>
</div>
<div id="mainContent">
@@ -144,21 +149,6 @@
<li><a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' dimension='new'%}">{% ifequal "new"
request.dimension %}<b>new</b>{% else %}new{% endifequal %}</a></li>
</ul>
{% endblock %}
- </div>
- <div class="col1">
- <ul>topics:
- {% pp_get_topic_list %}
- {% for topic in pp_topic.topic_list %}
- {% if request.dimension %}
- <a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' object=topic dimension=request.dimension%}">{%
ifequal request.object.text topic.text %}<b>{{ topic }}</b>{% else %}{{
topic }}{% endifequal %}</a>
- {% else %}
- <a STYLE="text-decoration:none" href="{% pp_url
template='issues.html' object=topic dimension='hot'%}">{% ifequal
request.object.text topic.text %}<b>{{ topic }}</b>{% else %}{{ topic }}{%
endifequal %}</a>
- {% endif %}
-
-{% if not forloop.last %} | {% endif %}
- {% endfor %}
- {% endpp_get_topic_list %}
- </ul>
</div>
<div class="col3">
{% if request.user.username %}
=======================================
--- /trunk/pirate-politics/new_templates/issue_detail.html Fri Jan 28
02:56:45 2011
+++ /trunk/pirate-politics/new_templates/issue_detail.html Mon Jan 31
18:26:02 2011
@@ -50,32 +50,27 @@
{% ifequal pp_consensus.interest 0 %}
{% ifequal
pp_issue.issue.solutions 0 %}
<div class="bullet_">
- <ul><a href="{% pp_url
template='submit_issue.html' object=pp_issue.issue %}" class='button
blue'>edit</a></ul>
+
</div>
{% endifequal %}
{% endifequal %}
{% endifequal %}
{% endpp_consensus_get %}
{{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 %}">see {{ pp_issue.issue.solutions}}
solution{{pp_issue.issue.solutions|pluralize}}...</a>
- </div>
- <div class="col3">
- {% pp_comment_count
object=pp_issue.issue.id %}
-
- {{ pp_comment.count }}
comment{{ pp_comment.count|pluralize}}
+ <div class="threecol">
+ <div class="iss_col1">
+ {% pp_comment_count
object=pp_issue.issue.id %}
+
+ {{ pp_issue.issue.solutions }} solution{{ pp_issue.issue.solutions|
pluralize }} | {{ pp_issue.issue.arguments }} argument{{
pp_issue.issue.arguments|pluralize }} | {{ pp_comment.count }} comment{{
pp_comment.count|pluralize}}
{% endpp_comment_count %}
-
+
</div>
- </div>
- </div>
+ <div class="iss_col2">
+ <a href="{% pp_url
template='solutions.html' object=pp_issue.issue dimension=dimension %}"
class="button blue">see solution{{ pp_issue.issue.solutions|pluralize
}}</a> <a href="{% pp_url
template='submit_issue.html' object=pp_issue.issue %}" class='button
blue'>edit</a>
+
+ </div>
+
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/issues.html Tue Jan 25 15:15:31
2011
+++ /trunk/pirate-politics/new_templates/issues.html Mon Jan 31 18:26:02
2011
@@ -24,9 +24,14 @@
{% block content %}
<div class="stage">
+
<div class="issuemask">
-
- <div class="issuebound">
+ {% if request.object %}
+ <div class="pagehead">{{ request.object.text }} issues </div>
+ {% else %}<div class="pagehead"> all issues </div>
+ {% endif %}
+ <div class="issuebound">
+
{% if request.dimension%}
{% pp_get_issue_list dimension=request.dimension
topic=request.object %}
=======================================
--- /trunk/pirate-politics/new_templates/solutions.html Tue Jan 25 15:15:31
2011
+++ /trunk/pirate-politics/new_templates/solutions.html Mon Jan 31 18:26:02
2011
@@ -24,7 +24,11 @@
<div class="stage">
<div class="issuemask">
<div class="pagehead">
+ {% if request.object %}
Solutions for {{request.object.name}}
+ {% else %}
+ All Solutions
+ {% endif %}
</div>
<div class="issuebound">
@@ -62,11 +66,13 @@
</div>
<div class="rightcol">
+ {% if request.object %}
{% 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 %}
+ {% endif %}
{% include '_rightcol.html' %}
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/user_profile.html Fri Jan 28
02:56:45 2011
+++ /trunk/pirate-politics/new_templates/user_profile.html Mon Jan 31
18:26:02 2011
@@ -6,6 +6,7 @@
{% load topictags %}
{% load reputationtags %}
{% load notificationtags %}
+{% load markup %}
{% block css %}
@@ -47,7 +48,7 @@
</fieldset>
<fieldset class="bio">
<legend>Bio</legend>
- {{pp_profile.profile.bio}}
+ {{pp_profile.profile.bio|markdown }}
</fieldset>
{% else %}
@@ -75,7 +76,7 @@
{% endif %}
<hr>
-
+ {% if user.is_authenticated %}
<h3> Notifications </h3>
<h4> Unread Notifications: </h4>
@@ -96,7 +97,7 @@
{% endfor %}
</ul>
{% endpp_notification_read_list_get %}
-
+ {% endif %}
{% if request.user.is_staff %}
<hr>
=======================================
--- /trunk/pirate-politics/pirate_consensus/templatetags/consensustags.py
Fri Jan 21 16:05:49 2011
+++ /trunk/pirate-politics/pirate_consensus/templatetags/consensustags.py
Mon Jan 31 18:26:02 2011
@@ -4,6 +4,7 @@
from django.utils import simplejson
from django.shortcuts import get_object_or_404
+from django.contrib.contenttypes.models import ContentType
from pirate_core.views import HttpRedirectException, namespace_get
from pirate_consensus.models import UpDownVote, Consensus
=======================================
--- /trunk/pirate-politics/pirate_core/middleware.py Fri Jan 28 02:56:45
2011
+++ /trunk/pirate-politics/pirate_core/middleware.py Mon Jan 31 18:26:02
2011
@@ -55,8 +55,10 @@
try: #name logic goes here
#you have request.object and content_type
if obj_id == None:
- try: name = "all " + request.dimension + "
issues"
- except: name = "all hot issues"
+ if request.path[0:4] == '/iss': t_nam
= "issues"
+ elif request.path[0:4] == '/sol': t_nam
= "solutions"
+ try: name = request.dimension + " " + t_nam
+ except: name = "hot " + t_nam
elif request_path[0:4] == '/use':
name = str(request.object.username).lower()
+ " profile"
elif str(content_type) == u'issue' and
request_path[0:4] == '/sol':
@@ -74,7 +76,10 @@
except:
try: name = request_path
except KeyError: name = "NA"
- try: visit_list.append((name, request_path))
+ try:
+ try:
+ if visit_list[-1] != (name,request_path):
visit_list.append((name, request_path))
+ except: visit_list.append((name, request_path))
except KeyError: pass #first visit
request.session['last_visited'] = visit_list
except KeyError: pass
=======================================
--- /trunk/pirate-politics/pirate_core/views.py Tue Jan 25 15:15:31 2011
+++ /trunk/pirate-politics/pirate_core/views.py Mon Jan 31 18:26:02 2011
@@ -3,6 +3,7 @@
from django.template import TemplateSyntaxError, TemplateDoesNotExist
from django.http import HttpResponse, HttpResponseRedirect,
HttpResponseNotFound
from django.contrib.contenttypes.models import ContentType
+from django.shortcuts import get_object_or_404,redirect
def template_for_model(model):
@@ -24,6 +25,9 @@
return ret
except:
return '/'
+
+def home_page(request):
+ return redirect('welcome.html')
=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Fri
Jan 28 02:56:45 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Mon
Jan 31 18:26:02 2011
@@ -86,9 +86,11 @@
raise ValueException("The argument 'rng=' to the pp-issue-list
tag must be "
"provided either in the form of an (int,
int) pair, or "
"as a string in the form of '(<int>,
<int>)'.")
-
+
+ content_type = ContentType.objects.get_for_model(Solution)
solution_list = Solution.objects.filter(issue=issue)
consensus_list = Consensus.objects.all()
+ consensus_list = consensus_list.filter(content_type=content_type)
adjust_for_range = True
if not rng: #need to add a range if not specified.
rng = (0,20)
@@ -100,30 +102,30 @@
elif issue and isinstance(issue, Solution):
solution_list = solution_list.filter(issue__id=issue.issue.id)
topic = issue.issue.topic
+ elif issue == None:
+ topic = None
#TODO: OPTIMIZE THIS!!!
- if dimension: #filter by ranking dimension, iterating through every
consensus object, need to find a way optimize
- if dimension == "new":
- order_by = '-submit_date'
- elif dimension == "hot":
- order_by = '-interest'
- elif dimension == "cont":
- order_by = '-controversy'
- elif dimension == "top":
- order_by = '-votes'
-
- consensus_list = consensus_list.order_by(order_by)
- solution_list = []
- for i in consensus_list:
- if i.content_type.name == u'solution':
- if topic and isinstance(topic, Topic):
- if i.content_object.issue.topic == topic and
i.content_object.issue == issue:
- solution_list.append(i.content_object)
- elif not isinstance(topic, Topic):
- if i.content_object.issue == issue:
solution_list.append(i.content_object)
-
- else: #catch all for no dimension grabs new objects
- solution_list = solution_list.order_by('-submit_date')
+
+ if dimension == "new":
+ order_by = '-submit_date'
+ elif dimension == "hot" or dimension == None: #default case
+ order_by = '-interest'
+ elif dimension == "cont":
+ order_by = '-controversy'
+ elif dimension == "top":
+ order_by = '-votes'
+
+ consensus_list = consensus_list.order_by(order_by)
+ solution_list = []
+ for i in consensus_list:
+ if topic and isinstance(topic, Topic):
+ if i.content_object.issue.topic == topic and
i.content_object.issue == issue:
+ solution_list.append(i.content_object)
+ elif not isinstance(topic, Topic) and isinstance(issue,Issue):
+ if i.content_object.issue == issue:
solution_list.append(i.content_object)
+ else: solution_list.append(i.content_object)
+
if adjust_for_range: #filter for rng
solution_list = solution_list[rng[0]:rng[1]]
=======================================
--- /trunk/pirate-politics/pirate_messages/models.py Fri Jan 28 02:56:45
2011
+++ /trunk/pirate-politics/pirate_messages/models.py Mon Jan 31 18:26:02
2011
@@ -42,7 +42,7 @@
else: tt = str(obj.text)
text = str(obj.user.username) + " replied to your " + str(rep_type)
+ ": " + tt + "..."
link = obj.get_absolute_url()
- notif = Notification(receiver=obj.user,
sender=reply_to.user,text=text,link=link,content_type=rep_type,object_pk=reply_to.pk,is_read=False,submit_date=datetime.datetime.now())
+ notif = Notification(receiver=reply_to.user,
sender=obj.user,text=text,link=link,content_type=rep_type,object_pk=reply_to.pk,is_read=False,submit_date=datetime.datetime.now())
notif.save()
notification_send.connect(create_notification)
=======================================
--- /trunk/pirate-politics/pirate_profile/templatetags/profiletags.py Fri
Jan 21 16:05:49 2011
+++ /trunk/pirate-politics/pirate_profile/templatetags/profiletags.py Mon
Jan 31 18:26:02 2011
@@ -6,6 +6,7 @@
from django.contrib.contenttypes.models import ContentType
from tagging.models import Tag, TaggedItem
from pirate_profile.models import Profile
+from ajaxapi.views import clean_html
from pirate_core import HttpRedirectException, namespace_get, FormMixin,
template_for_model
@@ -77,6 +78,7 @@
if form.is_valid():
new_profile=form.save(commit=False)
new_profile.user = user
+ new_profile.bio = clean_html(new_profile.bio)
new_profile.save()
raise
HttpRedirectException(HttpResponseRedirect(new_profile.get_absolute_url()))
else:
=======================================
--- /trunk/pirate-politics/static/style.css Fri Jan 28 14:08:04 2011
+++ /trunk/pirate-politics/static/style.css Mon Jan 31 18:26:02 2011
@@ -401,25 +401,20 @@
position:absolute;
width:90%;
top:-20px;
- margin-top:10px;
left:60px;
font-size:150%;
font-style:bold;
min-width:20%;
height:native;
background-color:#BDC4C8;
- border:15px solid #BDC4C8;
- border-radius: 15px; /*css3 only*/
- -moz-border-radius: 15px; /*firefox specific code*/
+ border:10px solid #BDC4C8;
+ border-radius: 10px; /*css3 only*/
+ -moz-border-radius: 10px; /*firefox specific code*/
/*-moz-box-shadow: 5px 5px 2px #888;
-webkit-box-shadow: 5px 5px 2px #888;
box-shadow: 5px 5px 2px #888;*/
overflow:visible;
- border-bottom:15px solid #BDC4C8;
-}
-
-.issue .issueback a {
- padding:10px 30px 5px 5px;
+ border-bottom:10px solid #BDC4C8;
}
.issue .issueback2 {
@@ -431,14 +426,14 @@
min-width:20%;
height:native;
background-color:#d3d9df;
- border:15px solid #d3d9df;
- border-radius: 15px; /*css3 only*/
- -moz-border-radius: 15px; /*firefox specific code*/
+ border:10px solid #d3d9df;
+ border-radius: 10px; /*css3 only*/
+ -moz-border-radius: 10px; /*firefox specific code*/
/*-moz-box-shadow: 5px 5px 2px #888;
-webkit-box-shadow: 5px 5px 2px #888;
box-shadow: 5px 5px 2px #888;*/
overflow:visible;
- border-bottom:15px solid #d3d9df;
+ border-bottom:10px solid #d3d9df;
}
.issueback a {
@@ -446,7 +441,6 @@
}
.userinfo {
- width:native;
font-size:60%;
border-bottom:0;
margin-top:8px;
@@ -493,7 +487,7 @@
width:native;
font-size:50%;
border-bottom:0;
- margin-top:8px;
+
}
.issue p {
@@ -507,8 +501,8 @@
background-color:#7EB2CC;
/*background: url('/static/Bullet.png') no-repeat scroll;*/
color:black;
+ bottom:1.5%;
padding:0px 0px 0px 0px;
- margin:0px 0px 0px 0px;
overflow:visible;
border-radius: 5px;
-moz-border-radius:5px;
@@ -582,10 +576,10 @@
}
.bullet_ {
- font-size:75%;
- position:absolute;
right:1%;
- top:-30%;
+ position:absolute;
+ width:31%;
+ bottom:2%;
padding:0px 0px 0px 0px;
}
@@ -612,11 +606,10 @@
.threecol {
position:relative; /* This fixes the IE7 overflow hidden bug */
- clear:both;
float:left;
width:100%;
font-size:85%; /* width of whole page */
- overflow:hidden; /* This chops off any overhanging divs */
+
border-bottom:3px solid #989898;
padding-bottom: 3px;
top: -3px;
@@ -652,95 +645,90 @@
float:right;
overflow:hidden;
}
-
-.colmid,
-.colleft {
- float:left;
- width:100%; /* width of page */
- position:relative;
- /*border:3px solid green;*/
-}
.col1,
.col2,
-.col3 {
+.col3,
+.iss_col1 {
float:left;
position:relative;
padding:0 0 0 0; /* no left and right padding on columns, we just make
them narrower instead
only padding top and bottom is included here, make it whatever value
you need */
overflow:hidden;
- /*border:1px dashed black;*/
-
+ /*border:1px dashed black;*/
}
+.iss_col2 {
+ float:right;
+}
+
+
.threecol a:link, .threecol a:visited {
color:black;
}
-.colmid {
- right:33%;
- }
-
-.colleft {
- right:33%;
- }
+.iss_col2 {
+ width:30%;
+ padding:5px;
+ float:right;
+}
+
+.iss_col1 {
+ width:50%;
+ margin-top:8px;
+}
+
+.iss_col3 {
+ width:100%;
+ margin-top:8px;
+}
.col2 {
- width:29%;
- left:102%;
- }
+ width:50%;
+}
.col1 {
width:29%;
- left:39%;
- }
+}
.col3 {
- width:29%;
- left:76%;
- }
+ float:right;
+ width:35%;
+}
.col1 ul, .col2 ul, .col3 ul{
position:relative;
list-style-type:none;
margin:0;
/*border:1px dashed red;*/
- }
+}
.col1 ul ul, .col2 ul ul, .col3 ul ul{
position:relative;
display:inline;
/*border:1px dashed blue;*/
- }
+}
.col1 ul li, .col2 ul li, .col3 ul li{
position:relative;
display:inline;
/*border:1px dashed orange;*/
- }
+}
.col3 ul{
position:right;
- }
+}
.issueback .threecol, .issueback2 .threecol {
width:native;
font-size:50%;
border-bottom:0;
- margin-top:8px;
- }
-
-.col3 {
- width:29%;
- left:76%;
- }
+}
.col1 ul, .col2 ul, .col3 ul{
position:relative;
list-style-type:none;
}
- /* BUTTONS */
-
.mailbutton {
padding: 1px 8px;
@@ -755,7 +743,7 @@
background: url(no-mail.png) repeat-x bottom;
}
-.button {
+.button, .issue .issueback .iss_col2 .button {
padding: 5px 10px;
display: inline;
background: #777 url(button.png) repeat-x bottom;
@@ -768,22 +756,26 @@
-webkit-border-radius: 5px;
text-shadow: 1px 1px #666;
}
-.button:hover {
+
+.button:hover, .issue .issueback .iss_col2 .button:hover {
background-position: 0 center;
color: #EFEFEF;
}
-.button:active {
+
+.button:active, .issue .issueback .iss_col2 .button:active {
background-position: 0 top;
position: relative;
top: 1px;
padding: 6px 10px 4px;
}
+
.button:visited { color: white;}
.button.red { background-color: #990000; }
.button.purple { background-color: #9400bf; }
.button.green { background-color: #58aa00; }
.button.orange { background-color: #ff9c00; }
-.button.blue { background-color: #2c6da0; }
+.button.blue, .issue .issueback .iss_col2 .button.blue { background-color:
#2c6da0; }
+
.button.black { background-color: #333; }
.button.white { background-color: #fff; color: #000; text-shadow: 1px 1px
#fff; }
.button.small { font-size: 90%; padding: 1px 5px; }
=======================================
--- /trunk/pirate-politics/urls.py Mon Jan 17 10:25:31 2011
+++ /trunk/pirate-politics/urls.py Mon Jan 31 18:26:02 2011
@@ -6,7 +6,7 @@
from django.conf.urls.defaults import *
from django.contrib import admin
from hello.views import hello_view, setup_admin
-from pirate_core import redirectable
+from pirate_core import redirectable, home_page
from ajaxapi.views import vote, generate_vote_content, delete_source
from pirate_login.views import logout_view
@@ -18,6 +18,7 @@
parser.register("file", r'[\w0-9\_]+\.?[\w0-9\_]*')
urlpatterns = patterns('',
+ (r'^$', home_page),
(r'^admin/', include(admin.site.urls)),
(r'^setup_admin/', setup_admin),
(r'^helloworld/', hello_view),