[pirate-politics] r505 committed - update with significant changes to the html and css
pirate-...@googlecode.com
Author: fragro
Date: Mon Jan 17 10:25:31 2011
Log: update with significant changes to the html and css
http://code.google.com/p/pirate-politics/source/detail?r=505
Modified:
/trunk/pirate-politics/ajaxapi/views.py
/trunk/pirate-politics/pirate_core/middleware.py
/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/pirate_issues/templatetags/usertags.py
/trunk/pirate-politics/pirate_login/views.py
/trunk/pirate-politics/pirate_sources/templatetags/sourcetags.py
/trunk/pirate-politics/settings.py
/trunk/pirate-politics/static/Bullet.png
/trunk/pirate-politics/static/style.css
/trunk/pirate-politics/urls.py
=======================================
--- /trunk/pirate-politics/ajaxapi/views.py Wed Jan 5 13:39:26 2011
+++ /trunk/pirate-politics/ajaxapi/views.py Mon Jan 17 10:25:31 2011
@@ -3,9 +3,18 @@
from django.utils import simplejson
from django.http import HttpResponse, HttpResponseRedirect
from pirate_consensus.models import UpDownVote
+from pirate_sources.models import URLSource
import datetime
+from django.shortcuts import get_object_or_404,redirect
from django.contrib.contenttypes.models import ContentType
+def delete_source(request,object_id):
+ obj = get_object_or_404(URLSource,id=object_id)
+ obj.delete()
+ if isinstance(request.session['last_visited'],list):
+ return redirect(request.session['last_visited'][-1][0])
+
+
def vote(request):
'''
@@ -47,7 +56,8 @@
if 'application/json' in request.META.get('HTTP_ACCEPT', ''):
return HttpResponse(simplejson.dumps(results),
mimetype='application/json')
-
+
+##########DEPRECATED!!!#############################
#populates database with voting content for testing. I know it's ugly as
hell, but I had this in it's own file and was having some import issues,
thought
#it best to just put it here until it is defunct and no longer needed. If
anyone feels up for it, extracting this to a file wouldn't be difficult.
def generate_vote_content(request):
=======================================
--- /trunk/pirate-politics/pirate_core/middleware.py Thu Jan 13 13:59:30
2011
+++ /trunk/pirate-politics/pirate_core/middleware.py Mon Jan 17 10:25:31
2011
@@ -11,6 +11,9 @@
"""
This class works in conjunction with the pp_url tag to populate
requests with
a model instance and/or a numerical range that can be used in
pagination.
+
+ This also maintains a queue of recently visited urls, that can be used
as 'breadcrumbs'
+ for ease in navigation.
"""
def process_request(self, request):
@@ -30,7 +33,32 @@
if dim is not None:
request.dimension = dim
-
+
+ request_path = request.get_full_path()
+ if request_path != '/favicon.ico' and
request.path[:8] != '/submit':
+ try:
+ if request.session['currently_visiting'] != request_path:
+ try:
+ visit_list = list(request.session['last_visited'])
+ except:
+ visit_list = []
+ if len(visit_list) >= 8:
+ try: visit_list.pop(0)
+ except: pass #no visit_list
+ try: #if content type is issue and dimension, then
list of solutions
+ name = request.object.name
+ except:
+ try:
+ name = request.dimension
+ except:
+ try: name =
request.session['currently_visiting']
+ except KeyError: name = "NA"
+ try: visit_list.append((name,
request.session['currently_visiting']))
+ except KeyError: pass #first visit
+ request.session['last_visited'] = visit_list
+ except KeyError: pass
+
+ if request_path != '/favicon.ico':
request.session['currently_visiting'] = request_path
class AddToBuiltinsMiddleware(object):
def process_request(self, request):
# This adds all tags registered separately through native_tags to
the builtins
=======================================
--- /trunk/pirate-politics/pirate_issues/models.py Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/pirate_issues/models.py Mon Jan 17 10:25:31 2011
@@ -35,10 +35,9 @@
#This should be a pirate-wikipage instance
class Issue(models.Model):
topic = models.ForeignKey(Topic, blank= True, null = True)
- name = models.CharField(max_length=100, default = "DEF", blank=True)
+ name = models.CharField(max_length=54, default = "DEF", blank=True)
submit_date = models.DateTimeField('date_published',auto_now_add=True)
text = models.TextField(max_length=1200)
- comments = models.IntegerField(default=0, blank = True , null = True)
user = models.ForeignKey(User, blank=True, null=True)
solutions = models.IntegerField(default=0,blank=True,null=True)
arguments = models.IntegerField(default=0, blank = True , null = True)
@@ -58,10 +57,9 @@
class Solution(models.Model):
issue = models.ForeignKey(Issue, blank=True, null=True)
- name = models.CharField(max_length=100, default = "DEF", blank=True,
null=True)
+ name = models.CharField(max_length=54, default = "DEF", blank=True,
null=True)
text = models.TextField(max_length=1200)
submit_date = models.DateTimeField('date_published',auto_now_add=True)
- comments = models.IntegerField(default=0, blank = True , null = True)
user = models.ForeignKey(User ,blank=True, null=True)
arguments = models.IntegerField(default=0)
=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/issuetags.py Thu Jan
13 13:59:30 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/issuetags.py Mon Jan
17 10:25:31 2011
@@ -270,11 +270,11 @@
if isinstance(topic, Topic) and isinstance(issue, Issue):
issue.topic = topic
if POST and POST.get("form_id") == "pp_issue_form":
- form = IssueForm(POST)
+ form = IssueForm(POST) if issue is None else IssueForm(POST,
instance=issue)
issue = form.save(commit=False)
issue.user = request.user
- issue.comments = 0
issue.solutions = 0
+ issue.arguments = 0
if isinstance(topic, Topic):
issue.topic = topic
issue.save()
@@ -290,7 +290,7 @@
path = template.Template(load +
ts).render(template.Context({'issue':issue}))
raise HttpRedirectException(HttpResponseRedirect(path))
- else: form = IssueForm()
+ else: form = IssueForm() if issue is None else
IssueForm(instance=issue)
#TODO:THIS IS FOR FORMIXIN WHICH NEEDS SOME WORK
#form = IssueForm.create(POST, path, issue)
@@ -334,6 +334,8 @@
#need to grab user from authenticatio
form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_issue_form")
- name = forms.CharField()
+ name = forms.CharField(label="text", max_length=54,
+ widget=forms.TextInput(
+ attrs={'size':'50', 'class':'inputText'}))
text = forms.CharField(widget=forms.Textarea)
=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Tue
Jan 11 02:15:49 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/solutiontags.py Mon
Jan 17 10:25:31 2011
@@ -207,7 +207,9 @@
form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_solution_form")
text = forms.CharField(widget=forms.Textarea)
- name = forms.CharField(widget=forms.TextInput(), initial="")
+ name = forms.CharField(label="text", max_length=54,
+ widget=forms.TextInput(
+ attrs={'size':'50', '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/pirate_issues/templatetags/usertags.py Tue Jan
11 02:15:49 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/usertags.py Mon Jan
17 10:25:31 2011
@@ -54,7 +54,7 @@
if user is not None:
if user.is_active:
login(request, user)
- raise HttpRedirectException(HttpResponseRedirect("/hot.html"))
+ raise HttpRedirectException(HttpResponseRedirect("/issues.html"))
except HttpRedirectException, e:
raise e
else:
=======================================
--- /trunk/pirate-politics/pirate_login/views.py Wed Dec 15 20:39:19 2010
+++ /trunk/pirate-politics/pirate_login/views.py Mon Jan 17 10:25:31 2011
@@ -4,4 +4,4 @@
def logout_view(request):
logout(request)
- return HttpResponseRedirect('/hot.html')
+ return HttpResponseRedirect('/issues.html')
=======================================
--- /trunk/pirate-politics/pirate_sources/templatetags/sourcetags.py Tue
Jan 11 02:15:49 2011
+++ /trunk/pirate-politics/pirate_sources/templatetags/sourcetags.py Mon
Jan 17 10:25:31 2011
@@ -25,6 +25,7 @@
if obj:
namespace['urlsource_list'] =
URLSource.objects.filter(object_pk=obj.pk)
namespace['imgsource_list'] =
IMGSource.objects.filter(object_pk=obj.pk)
+ namespace['model'] = URLSource
output = nodelist.render(context)
context.pop()
@@ -92,6 +93,7 @@
form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_imgsource_form")
img = forms.ImageField()
+
@block
def pp_urlsource_form(context, nodelist, *args, **kwargs):
'''
=======================================
--- /trunk/pirate-politics/settings.py Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/settings.py Mon Jan 17 10:25:31 2011
@@ -12,6 +12,7 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.admin',
+ 'django.contrib.markup',
'customtags',
'tagging',
'hello',
=======================================
--- /trunk/pirate-politics/static/Bullet.png Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/static/Bullet.png Mon Jan 17 10:25:31 2011
Binary file, no diff available.
=======================================
--- /trunk/pirate-politics/static/style.css Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/static/style.css Mon Jan 17 10:25:31 2011
@@ -125,90 +125,17 @@
.rightcol {
position:relative;
width:24%;
- left:90%;
+ left:83%;
float:left;
- /*border:1px solid #F4CE22;*/
overflow:hidden;
- }
-.rightcol ul {
-
- list-style-type:none;
color:black;
- font-size:130%;
- font-weight:bold;
- /*border:1px dashed black;*/
- margin-top:30px;
- margin-left:0px;
- padding-left:0;
-
- }
-.rightcol ul li{
- font-size:80%;
- color:#5F4DFF;
+ margin:0;
+ padding:0;
+ font-size:100%;
}
-
-.solution {
- position:relative;
- /*width:94%;*/
- color:black;
- /*background: url('Bullet.png') no-repeat scroll;*/
- /*background-color:#d3d9df;*/
- /*background-position:+40px +40px; */
- margin:0em 2em 0em 0em;
- /*overflow:hidden;*/
- /*border:1px dashed black;*/
- }
-
-.solution h1 {
- bottom:55px;
- position:relative;
- width:100%;
- /*background-color:#d3d9df;*/
- margin:0px 0px 0px 0px;
- /*border:1px dashed black;*/
- /*border:30px solid #d3d9df;
- border-radius: 15px; /*css3 only*/
- /*-moz-border-radius: 15px; /*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;
- left:+8%;
- }
-
-.solution h1 .solutionback {
- width:100%;
- font-size:80%;
- min-width:20%;
- height:native;
- margin:0px 0px 0px 0px;
- background-color:#d3d9df;
- border:20px solid #d3d9df;
- border-radius: 30px; /*css3 only*/
- -moz-border-radius: 30px; /*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:20px solid #d3d9df;
- }
-
-.solution h2{
- font-size:50%;
- font-weight:bold;
- color:black;
- }
-
-.solution h3{
- font-size:150%;
- font-weight:bold;
-
- }
-
-
+
+
.upvote, .downvote, .irrvote {
width:40px;
height:30px;
@@ -220,21 +147,21 @@
overflow:visible;
}
-.solution .upvote {
+.upvote {
margin:0px 0px 0px 0px;
position:relative;
bottom:-35px;
overflow:visible;
}
-.solution .downvote {
+.downvote {
margin:0px 0px 0px 0px;
position:relative;
bottom:-45px;
overflow:visible;
}
-.solution .irrvote {
+.irrvote {
margin:0px 0px 0px 0px;
position:relative;
bottom:-40px;
@@ -249,12 +176,11 @@
bottom:+2px;
overflow:visible;
}
-
.argument ul{
list-style-type:none;
}
-i
+
.yea_argument h1 {
font-size:140%; /* width of whole page */
font-weight:bold;
@@ -271,8 +197,8 @@
.argument .yea_argument {
position:relative;
- width:50%;
- left:1%;
+ width:49%;
+ left:-55px;
float:left;
/*border:1px solid #2D167B;*/
overflow:hidden;
@@ -281,7 +207,7 @@
.argument .nay_argument {
position:relative;
width:50%;
- left:1%;
+ left:-35px;
float:right;
/*border:1px solid #F4CE22;*/
overflow:hidden;
@@ -318,6 +244,43 @@
overflow:visible;
border-bottom:15px solid #d3d9df;
}
+
+
+.issue .issueback2 {
+ position:absolute;
+ width:100%;
+ top:18px;
+ left:-10px;
+ font-size:150%;
+ font-style:bold;
+ min-width:20%;
+ height:native;
+ background-color:#d3d9df;
+ border:15px solid #d3d9df;
+ border-radius: 15px; /*css3 only*/
+ -moz-border-radius: 15px; /*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;
+ }
+
+.userinfo {
+ width:native;
+ font-size:60%;
+ border-bottom:0;
+ margin-top:8px;
+
+}
+
+.issue. issueback2 .userinfo {
+ width:native;
+ font-size:50%;
+ border-bottom:0;
+ margin-top:8px;
+}
.issue p {
padding:0 1em 1em 1em;
@@ -351,6 +314,13 @@
bottom:-5px;
overflow:visible;
}
+
+.issue .bullet2 {
+ position:relative;
+ left:-60px;
+ bottom:30px;
+ overflow:visible;
+ }
.issue .bullet h1 {
font-size:30px;
@@ -358,13 +328,22 @@
}
.bullet_ {
- font-size:50%;
+ font-size:75%;
position:absolute;
- left:+50%;
- top:+35%;
+ top:+55px;
+ left:-90px;
padding:0px 0px 0px 0px;
margin:10px 10px 0px 0px;
}
+
+.bullet2_ {
+ font-size:75%;
+ position:absolute;
+ top:+100px;
+ left:-99px;
+ padding:0px 0px 0px 0px;
+ margin:10px 10px 0px 0px;
+ }
.add_tag {
font-size:20%;
@@ -405,21 +384,17 @@
font-weight:bold;
}
+
+.details {
+ position:relative;
+ bottom:-5px;
+}
.detail {
color:black;
position:relative;
overflow:hidden;
- bottom:50px;
-}
-
-.detail h1 {
- position:relative;
- font-size:40%; /* width of whole page */
- overflow:visible;
- font-weight:bold;
- }
-
+}
.colmid,
.colleft {
float:left;
@@ -441,11 +416,7 @@
}
.threecol a:link, .threecol a:visited {
- text-decoration:none;
-}
-
-.threecol a:hover {
- text-decoration:underline;
+ color:black;
}
.colmid {
@@ -494,7 +465,7 @@
position:right;
}
-.issueback .threecol {
+.issueback .threecol, .issueback2 .threecol {
width:native;
font-size:50%;
border-bottom:0;
@@ -536,14 +507,14 @@
top: 1px;
padding: 6px 10px 4px;
}
-.button.red { background-color: #e50000; }
+.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.black { background-color: #333; }
.button.white { background-color: #fff; color: #000; text-shadow: 1px 1px
#fff; }
-.button.small { font-size: 75%; padding: 3px 7px; }
+.button.small { font-size: 90%; padding: 1px 5px; }
.button.small:active { padding: 4px 7px 2px; background-position: 0 top; }
.button.large { font-size: 125%; padding: 7px 12px; }
.button.large:active { padding: 8px 12px 6px; background-position: 0 top; }
=======================================
--- /trunk/pirate-politics/urls.py Thu Jan 13 13:59:30 2011
+++ /trunk/pirate-politics/urls.py Mon Jan 17 10:25:31 2011
@@ -1,14 +1,17 @@
import dselector
from django.views.generic.simple import direct_to_template
+from django.views.generic.create_update import delete_object
from django.views.decorators.csrf import csrf_protect
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 ajaxapi.views import vote, generate_vote_content
+from ajaxapi.views import vote, generate_vote_content, delete_source
from pirate_login.views import logout_view
+from pirate_sources.models import URLSource
+
admin.autodiscover()
parser = dselector.Parser()
@@ -18,10 +21,12 @@
(r'^admin/', include(admin.site.urls)),
(r'^setup_admin/', setup_admin),
(r'^helloworld/', hello_view),
+ (r'^sourcedelete/(?P<object_id>\d+)/$', delete_source),
(r'^vote/', vote),
(r'^generate_vote_content/', generate_vote_content),
(r'^comments/', include('django.contrib.comments.urls')),
(r'^logout/', logout_view),
+
)
urlpatterns += parser.patterns('',
(r'{template:file}', csrf_protect(redirectable(direct_to_template)),
{}, "pp-page"),