[pirate-politics] r517 committed - registration form polished: committing to test on other platforms
pirate-...@googlecode.com
Author: fragro
Date: Tue Jan 18 11:59:15 2011
Log: registration form polished: committing to test on other platforms
http://code.google.com/p/pirate-politics/source/detail?r=517
Modified:
/trunk/pirate-politics/new_templates/_issue.html
/trunk/pirate-politics/new_templates/_rightcol.html
/trunk/pirate-politics/new_templates/_solution.html
/trunk/pirate-politics/new_templates/issue_detail.html
/trunk/pirate-politics/new_templates/issues.html
/trunk/pirate-politics/new_templates/register.html
/trunk/pirate-politics/new_templates/solution_detail.html
/trunk/pirate-politics/new_templates/solutions.html
/trunk/pirate-politics/new_templates/tag_detail.html
/trunk/pirate-politics/pirate_core/templatetags/tag_helpers.py
/trunk/pirate-politics/pirate_deliberation/models.py
/trunk/pirate-politics/pirate_issues/callbacks.py
/trunk/pirate-politics/pirate_issues/models.py
/trunk/pirate-politics/pirate_issues/templatetags/usertags.py
/trunk/pirate-politics/pirate_login/models.py
/trunk/pirate-politics/settings.py
/trunk/pirate-politics/static/style.css
=======================================
--- /trunk/pirate-politics/new_templates/_issue.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/_issue.html Tue Jan 18 11:59:15
2011
@@ -4,6 +4,8 @@
{% load consensustags %}
{% load argumenttags %}
{% load solutiontags %}
+{% load comments %}
+
{% if iss_obj %}
@@ -31,13 +33,14 @@
<div class="colmid">
<div class="colleft">
<div class="col2">
- {{ iss_obj.arguments }} arguments
+ {{ iss_obj.arguments }} argument{{
iss_obj.arguments|pluralize }}
</div>
<div class="col1">
- {{ iss_obj.solutions }} solution</a>
+ {{ iss_obj.solutions }} solution{{ iss_obj.solutions|
pluralize }}</a>
</div>
<div class="col3">
- {{iss_obj.comments}} comments
+ {% get_comment_count
for iss_obj as comment_count %}
+ {{comment_count}} comment{{comment_count|pluralize }}
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/_rightcol.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/_rightcol.html Tue Jan 18 11:59:15
2011
@@ -17,12 +17,12 @@
</ul>
{% endif %}
- {% if request.object %}
+ {% if request.object.taggable %}
<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>
+ <li><a href="{% pp_url template='tag_detail.html'
object=tag %}">{{tag.name}}</a></li>
{% endfor %}
{% endpp_get_tags_for_object %}
=======================================
--- /trunk/pirate-politics/new_templates/_solution.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/_solution.html Tue Jan 18 11:59:15
2011
@@ -4,6 +4,7 @@
{% load consensustags %}
{% load argumenttags %}
{% load solutiontags %}
+{% load comments %}
{% if iss_obj %}
@@ -31,13 +32,14 @@
<div class="colmid">
<div class="colleft">
<div class="col2">
- {{ iss_obj.arguments }} arguments
+ {{ iss_obj.arguments }} arguments{{
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">
- {{iss_obj.comments}} comments
+ {% get_comment_count
for iss_obj as comment_count %}
+ {{comment_count}} comment{{comment_count|pluralize }}
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/issue_detail.html Mon Jan 17
12:38:36 2011
+++ /trunk/pirate-politics/new_templates/issue_detail.html Tue Jan 18
11:59:15 2011
@@ -10,7 +10,7 @@
{% load solutiontags %}
{% load sourcetags %}
{% load tag_helpers %}
-
+{% load comments %}
{% block title %}
{% if request.object %}{{ request.object.text }}{% endif %} Issues
@@ -61,7 +61,8 @@
<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
+ {% get_comment_count
for pp_issue.issue as comment_count %}
+ {{comment_count}} comment{{comment_count|pluralize }}
</div>
</div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/issues.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/issues.html Tue Jan 18 11:59:15
2011
@@ -6,6 +6,7 @@
{% load consensustags %}
{% load argumenttags %}
{% load solutiontags %}
+{% load comments %}
{% block title %}
{% if request.object %}{{ request.object.text }}{% endif %} Issues
=======================================
--- /trunk/pirate-politics/new_templates/register.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/register.html Tue Jan 18 11:59:15
2011
@@ -10,16 +10,25 @@
{% block content%}
{% pp_user_registration_form POST=request.POST path=request.path
request=request %}
- <div id = "register">
- {{ pp_login.form.errors }}
- <div class="add">
+
+ <div class = "register">
+
+
<form method="post" action="">
- {{ pp_login.form.as_p }}
+ <h2>Welcome to elgalit.ar</h2>
+ Username:<br>
+ {{ pp_login.form.name }}<br>
+ Password:<br>
+ {{ pp_login.form.password1 }}<br>
+ Check Password:<br>
+ {{ pp_login.form.password2 }}<br>
+ Email:<br>
+ {{ pp_login.form.email }}<br><br>
{{ pp_login.form.form_id}}
{% csrf_token %}
- <input type="submit" value="Submit">
+ <input type="submit" class="button green" value="Submit">
+ <div class="error">{{pp_login.errors}}<br>{{ pp_login.form.errors
}}</div>
</form>
- </div>
</div>
{% endpp_user_registration_form %}
=======================================
--- /trunk/pirate-politics/new_templates/solution_detail.html Mon Jan 17
12:38:36 2011
+++ /trunk/pirate-politics/new_templates/solution_detail.html Tue Jan 18
11:59:15 2011
@@ -10,6 +10,7 @@
{% load solutiontags %}
{% load sourcetags %}
{% load tag_helpers %}
+{% load comments %}
{% block title %}
{% if request.object %}{{ request.object.text }}{% endif %} Issues
@@ -25,8 +26,11 @@
<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">
@@ -54,11 +58,14 @@
<ul><a href="{% pp_url
template='submit_solution.html' object=pp_solution.solution %}"
class='button blue'>edit</a></ul>
{% endifequal %}
+
+{% get_comment_count for request.object as comment_count %}
+
</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 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_count}} comment{{comment_count|pluralize}} |
interest:{{pp_consensus.consensus.interest|floatformat}}</div>
</div>
</div>
@@ -69,6 +76,7 @@
{{pp_solution.solution.text|markdown}}
</div>
+
{% include "_sourcetags.html" %}
<div class="argument">
@@ -113,7 +121,7 @@
<div class="nay_argument">
<h1>Nay Arguments
-{% if request.user.is_authenticated %}
+{% if request.user.is_authenticated %}pluralize
<a href="{% pp_url template='submit_nay_argument.html'
object=pp_solution.solution %}">+</a>
{% endif %}</h1>
<ul>
@@ -140,6 +148,8 @@
</div>
</div>
</div>
+ {% render_comment_list for request.object %}
+ {% render_comment_form for request.object %}
</div>
</div> </div>
</div>
=======================================
--- /trunk/pirate-politics/new_templates/solutions.html Mon Jan 17 12:38:36
2011
+++ /trunk/pirate-politics/new_templates/solutions.html Tue Jan 18 11:59:15
2011
@@ -6,6 +6,7 @@
{% load consensustags %}
{% load argumenttags %}
{% load solutiontags %}
+{% load comments %}
{% block css %}
<link rel="stylesheet" type="text/css" href="/static/style.css" />
=======================================
--- /trunk/pirate-politics/new_templates/tag_detail.html Mon Jan 17
14:53:37 2011
+++ /trunk/pirate-politics/new_templates/tag_detail.html Tue Jan 18
11:59:15 2011
@@ -4,7 +4,6 @@
{% load argumenttags %}
{% load tag_helpers %}
{% load consensustags %}
-
{% block css %}
<link rel="stylesheet" type="text/css" href="/static/style.css" />
@@ -21,7 +20,7 @@
</div>
<div class="issuebound">
- <h1>Tags for {{request.object.name}}</h1>
+ <h1>Objects for {{request.object.name}}</h1>
{% pp_get_objects_for_tag object=request.object %}
<h2>Issues:</h2>
@@ -56,5 +55,3 @@
{% endblock content %}
</body>
</html>
-
-
=======================================
--- /trunk/pirate-politics/pirate_core/templatetags/tag_helpers.py Mon Jan
17 12:40:18 2011
+++ /trunk/pirate-politics/pirate_core/templatetags/tag_helpers.py Tue Jan
18 11:59:15 2011
@@ -48,9 +48,35 @@
namespace['tags2'] = tags2
output = nodelist.render(context)
context.pop()
+ return output
+
+@block
+def pp_get_objects_for_tag(context, nodelist, *args, **kwargs):
+ '''
+ This block tag can create or process forms to get tags.
+ Usage is as follows:
+
+ '''
+
+ context.push()
+ namespace = get_namespace(context)
+
+ tag = kwargs.get('object',None)
+
+ issues = TaggedItem.objects.get_union_by_model(Issue,tag)
+ solutions = TaggedItem.objects.get_union_by_model(Solution,tag)
+ arguments = TaggedItem.objects.get_union_by_model(Argument,tag)
+
+ namespace['issues'] = issues
+ namespace['solutions'] = solutions
+ namespace['arguments'] = arguments
+
+ output = nodelist.render(context)
+ context.pop()
return output
+
@block
def pp_tag_form(context, nodelist, *args, **kwargs):
'''
=======================================
--- /trunk/pirate-politics/pirate_deliberation/models.py Tue Jan 11
02:15:49 2011
+++ /trunk/pirate-politics/pirate_deliberation/models.py Tue Jan 18
11:59:15 2011
@@ -28,6 +28,8 @@
def __unicode__(self):
return self.name
+ def taggable(self):
+ return True
#This must be added to all classes that can be tagged
def get_absolute_url(self):
=======================================
--- /trunk/pirate-politics/pirate_issues/callbacks.py Mon Nov 8 17:53:26
2010
+++ /trunk/pirate-politics/pirate_issues/callbacks.py Tue Jan 18 11:59:15
2011
@@ -3,11 +3,5 @@
#Updates the issue.comments for each comment being posted
def update_issue_comment_count(sender, comment, request, **kwargs):
- aso_rep_event.send(sender = self,event_score=50, user=comment.user,
dimension=ReputationDimension.objects.get('add_comment'))
- issue = comment.content_object
- if issue.comments == 0:
- issue.comments = 1
- else:
- issue.comments += 1
- issue.save()
-
+ aso_rep_event.send(sender = sender,event_score=50, user=comment.user,
dimension=ReputationDimension.objects.get('add_comment'))
+
=======================================
--- /trunk/pirate-politics/pirate_issues/models.py Mon Jan 17 10:25:31 2011
+++ /trunk/pirate-politics/pirate_issues/models.py Tue Jan 18 11:59:15 2011
@@ -47,6 +47,9 @@
def __unicode__(self):
return self.text[0:10]
+
+ def taggable(self):
+ return True
#This must be added to all classes that can be tagged
def get_absolute_url(self):
@@ -65,6 +68,9 @@
def __unicode__(self):
return self.name[0:10]
+
+ def taggable(self):
+ return True
def get_absolute_url(self):
content_type = ContentType.objects.get_for_model(self.__class__)
=======================================
--- /trunk/pirate-politics/pirate_issues/templatetags/usertags.py Mon Jan
17 10:25:31 2011
+++ /trunk/pirate-politics/pirate_issues/templatetags/usertags.py Tue Jan
18 11:59:15 2011
@@ -11,6 +11,7 @@
from django.utils.translation import ugettext as _
from pirate_reputation.models import ReputationDimension
from django.contrib.auth import authenticate, login
+from django.core.validators import validate_email
from pirate_signals.models import aso_rep_event
from pirate_login.models import Login, Register
@@ -28,102 +29,114 @@
get_namespace = namespace_get('pp_login')
-@block
+@block
def pp_user_registration_form(context, nodelist, *args, **kwargs):
- '''form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp-issue-form")
- This block tag can create or process forms either to create or to modify
issues.
- Usage is as follows:
-
- {% pp_issue_form POST=request.POST path=request.path issue=pp_issue.issue
topic=request.object %}
- Do stuff with {{ pp-issue.form }}.
- {% endpp-issue-form %}
- '''
- context.push()
- namespace = get_namespace(context)
-
- POST = kwargs.get('POST', None)
- path = kwargs.get('path', "")
- request = kwargs.get('request',None)
-
- if POST and POST.get("form_id") == "pp_user_registration_form":
- try:
- form = RegisterForm(POST)
- if form.is_valid():
- new_user = form.save()
- user = authenticate(username=new_user.name, password=new_user.password)
- if user is not None:
- if user.is_active:
- login(request, user)
- raise HttpRedirectException(HttpResponseRedirect("/issues.html"))
- except HttpRedirectException, e:
- raise e
- else:
- form = RegisterForm()
-
- namespace['form'] = form
- output = nodelist.render(context)
- context.pop()
-
- return output
+ '''form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp-issue-form")
+ This block tag can create or process forms either to create or to
modify issues.
+ Usage is as follows:
+
+ {% pp_issue_form POST=request.POST path=request.path
issue=pp_issue.issue topic=request.object %}
+ Do stuff with {{ pp-issue.form }}.
+ {% endpp-issue-form %}
+ '''
+ context.push()
+ namespace = get_namespace(context)
+
+ POST = kwargs.get('POST', None)
+ path = kwargs.get('path', "")
+ request = kwargs.get('request',None)
+
+ if POST and POST.get("form_id") == "pp_user_registration_form":
+ try:
+ form = RegisterForm(POST)
+ if form.is_valid():
+ new_user = form.save()
+ if new_user.password1 == new_user.password2:
+ #check to see if there are other users with this name
+ try:
+ ui = User.objects.get(username=new_user.name)
+ namespace['errors'] = "Sorry that username is
taken already, please pick another."
+ except:
+ user = User.objects.create_user(new_user.name,
new_user.email, new_user.password1)
+ user = authenticate(username=new_user.name,
password=new_user.password1)
+ if user is not None:
+ if user.is_active:
+ login(request, user)
+ raise
HttpRedirectException(HttpResponseRedirect("/issues.html"))
+ else:
+ namespace['errors'] = "Passwords are not the same. Try
again."
+
+ except HttpRedirectException, e:
+ raise e
+ else:
+ form = RegisterForm()
+
+ namespace['form'] = form
+ output = nodelist.render(context)
+ context.pop()
+
+ return output
class RegisterForm(forms.ModelForm):
- def save(self, commit=True):
- new_user = super(RegisterForm, self).save(commit=False)
- user = User.objects.create_user(new_user.name, new_user.email,
new_user.password)
- user.save()
- return new_user
-
- class Meta:
- model = Register
-
- form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_user_registration_form")
+ def save(self, commit=True):
+ new_user = super(RegisterForm, self).save(commit=False)
+ return new_user
+
+ class Meta:
+ model = Register
+
+ form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_user_registration_form")
+ password1 =
forms.CharField(label=_(u'Password'),widget=forms.PasswordInput(render_value=False))
+ password2 = forms.CharField(label=_(u'Password
Check'),widget=forms.PasswordInput(render_value=False))
+ email = forms.CharField(label=_(u'Email'),validators =
[validate_email])
-@block
+@block
def pp_user_login_form(context, nodelist, *args, **kwargs):
- '''form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp-issue-form")
- This block tag can create or process forms either to create or to modify
issues.
- Usage is as follows:
-
- {% pp_issue_form POST=request.POST path=request.path issue=pp_issue.issue
topic=request.object %}
- Do stuff with {{ pp-issue.form }}.
- {% endpp-issue-form %}
- '''
- context.push()
- namespace = get_namespace(context)
-
- POST = kwargs.get('POST', None)
- path = kwargs.get('path', "")
- request = kwargs.get('request',None)
-
- if POST and POST.get("form_id") == "pp_user_login_form":
- try:
- form = LoginForm(POST)
- new_user = form.save()
- user = authenticate(username=new_user.name, password=new_user.password)
- if user is not None:
- if user.is_active:
- login(request, user)
- raise HttpRedirectException(HttpResponseRedirect(path))
- except HttpRedirectException, e:
- raise e
- else:
- form = LoginForm()
-
- namespace['form'] = form
- output = nodelist.render(context)
- context.pop()
-
- return output
+ '''form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp-issue-form")
+ This block tag can create or process forms either to create or to
modify issues.
+ Usage is as follows:
+
+ {% pp_issue_form POST=request.POST path=request.path
issue=pp_issue.issue topic=request.object %}
+ Do stuff with {{ pp-issue.form }}.
+ {% endpp-issue-form %}
+ '''
+ context.push()
+ namespace = get_namespace(context)
+
+ POST = kwargs.get('POST', None)
+ path = kwargs.get('path', "")
+ request = kwargs.get('request',None)
+
+ if POST and POST.get("form_id") == "pp_user_login_form":
+ try:
+ form = LoginForm(POST)
+ new_user = form.save()
+ user = authenticate(username=new_user.name,
password=new_user.password)
+ if user is not None:
+ if user.is_active:
+ login(request, user)
+ raise HttpRedirectException(HttpResponseRedirect(path))
+ except HttpRedirectException, e:
+ raise e
+ else:
+ form = LoginForm()
+
+ namespace['form'] = form
+ output = nodelist.render(context)
+ context.pop()
+
+ return output
class LoginForm(forms.ModelForm):
- def save(self, commit=True):
- new_user = super(LoginForm, self).save(commit=False)
- return new_user
-
- class Meta:
- model = Login
- form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_user_login_form")
+
+ def save(self, commit=True):
+ new_user = super(LoginForm, self).save(commit=False)
+ return new_user
+
+ class Meta:
+ model = Login
+ form_id = forms.CharField(widget=forms.HiddenInput(),
initial="pp_user_login_form")
=======================================
--- /trunk/pirate-politics/pirate_login/models.py Wed Dec 15 20:39:19 2010
+++ /trunk/pirate-politics/pirate_login/models.py Tue Jan 18 11:59:15 2011
@@ -4,7 +4,8 @@
# Create your models here.
class Register(models.Model):
name = models.CharField(max_length=140, unique = True)
- password = models.CharField(max_length=600)
+ password1 = models.CharField(max_length=600)
+ password2 = models.CharField(max_length=600)
email = models.CharField(max_length=600, unique=True)
# Create your models here.
=======================================
--- /trunk/pirate-politics/settings.py Mon Jan 17 12:43:37 2011
+++ /trunk/pirate-politics/settings.py Tue Jan 18 11:59:15 2011
@@ -13,6 +13,7 @@
'django.contrib.sessions',
'django.contrib.admin',
'django.contrib.markup',
+ 'django.contrib.comments',
'customtags',
'tagging',
'hello',
@@ -38,6 +39,10 @@
FAIL_SILENTLY = True
+GAE_SETTINGS_MODULES = (
+ 'gae_comments_settings',
+)
+
DJANGO_BUILTIN_TAGS = (
'native_tags.templatetags.native',
'django.contrib.markup.templatetags.markup',
=======================================
--- /trunk/pirate-politics/static/style.css Mon Jan 17 17:42:07 2011
+++ /trunk/pirate-politics/static/style.css Tue Jan 18 11:59:15 2011
@@ -29,10 +29,13 @@
font-style:bold;
padding-left:10px;
padding-top: 10px;
- }
+
+ }
+
#header .headtitle a:visited, #header .headtitle a:link {
color:#565656;
}
+
#header ul {
list-style-type:none;
margin:0;
@@ -43,11 +46,11 @@
padding-left:50px;
}
+
#header ul li {
font-size:18px;
font-weight:bold;
padding:5px;
-
margin-left:5px;
margin-right:5px;
display:inline;
@@ -55,25 +58,34 @@
background-color: #2c6da0;
border-top-right-radius: 10px;
border-top-left-radius: 10px;
+ -moz-border-radius-topright:10px;
+ -moz-border-radius-topleft:10px;
}
#header ul li a {
text-decoration:none;
-
}
#header ul li a:link, #header ul li a:visited, #header ul li a:active {
color:#FFFFFF;
- background-position: 0 top;
- position: relative;
- top: 1px;
- padding: 6px 10px 4px;
- }
+ }
+
#header ul li a:hover {
background-position: 0 center;
- color:#FFFFFF;
+ color:#FFFFF;
}
+.register {
+ float:center;
+ position:relative;
+ left:40%;
+}
+
+.error {
+ color:red;
+}
+
+
.add {
float:center;
position:relative;
@@ -87,6 +99,7 @@
font-size:140%; /* width of whole page */
font-weight:bold;
padding-bottom:20px; top:-5px;
+ overflow:hidden;
}
.stage {
@@ -94,13 +107,13 @@
position:relative;
/*border:3px solid red;*/
float:left;
+ margin:0;
}
.issuemask {
position:relative;
width:90%;
/*position:left;*/
- top:25%;
float:left;
/*border:2px dashed #67A3E4;*/
@@ -112,7 +125,6 @@
/*position:left;*/
left:-15%;
float:left;
- padding:0%;
/*border:2px dashed #67A3E4;*/
}
@@ -236,10 +248,10 @@
color:black;
/*background: url('Bullet.png') no-repeat scroll;*/
/*background-color:#d3d9df;*/
- margin:0em 2em 1.2em 0em;
+ margin:1.5em 2em 1.2em 0em;
/*overflow:hidden;*/
/*border:1px dashed black;*/
- }
+}
.issue .issueback {
@@ -254,13 +266,13 @@
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;
- }
+}
+
.issue .issueback a {
padding:10px 30px 5px 5px;
}
@@ -278,7 +290,6 @@
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;*/
@@ -310,20 +321,21 @@
}
.bullet {
- width:78px;
- height:78px;
+ width:64px;
+ height:64px;
background-color:#2C6DA0;
/*background: url('/static/Bullet.png') no-repeat scroll;*/
color:black;
padding:0px 0px 0px 0px;
- margin:0px 0px 0px -10px;
+ margin:0px 0px 0px 0px;
overflow:visible;
border-radius: 5px;
+ -moz-border-radius:5px;
}
.bullet:after {
content:"interest";
position: relative;
- left: 13px;
+ left: 11px;
top: -30px;
font-size: small;
}
@@ -333,7 +345,7 @@
text-align:center;
border:0;
position:relative;
- left:-25px;
+ left:0px;
bottom:+2px;
overflow:visible;
}
@@ -413,6 +425,7 @@
border-bottom:3px solid #989898;
padding-bottom: 3px;
top: -3px;
+
}
.details {