Merge branch 'master' of github.com:Gluejar/regluit into payment

frontend/forms.py

@@ -46,7 +46,7 @@ class EbookForm(forms.ModelForm):
         
 def UserClaimForm ( user_instance, *args, **kwargs ):
     class ClaimForm(forms.ModelForm):
-        i_agree=forms.BooleanField()
+        i_agree=forms.BooleanField(error_messages={'required': 'You must agree to the Terms in order to claim a work.'})
         rights_holder=forms.ModelChoiceField(queryset=user_instance.rights_holder.all(), empty_label=None)
         
         class Meta:
@@ -68,10 +68,12 @@ class RightsHolderForm(forms.ModelForm):
             label='Owner',
             widget=AutoCompleteSelectWidget(OwnerLookup),
             required=True,
+            error_messages={'required': 'Please ensure the owner is a valid Unglue.It account.'},
         )
     email = forms.EmailField(
         label=_("notification email address for rights holder"), 
-        max_length=100, 
+        max_length=100,
+        error_messages={'required': 'Please enter an email address for the rights holder.'},
         )
     class Meta:
         model = RightsHolder
@@ -161,8 +163,9 @@ class ManageCampaignForm(forms.ModelForm):
     paypal_receiver = forms.EmailField(
         label=_("email address to collect Paypal funds"), 
         max_length=100, 
+        error_messages={'required': 'You must enter the email associated with your Paypal account.'},
         )
-    target = forms.DecimalField( min_value= D('0.00') )
+    target = forms.DecimalField( min_value= D('0.00'), error_messages={'required': 'Please specify a target price.'} )
     class Meta:
         model = Campaign
         fields = 'description', 'details', 'license', 'target', 'deadline', 'paypal_receiver'
@@ -273,21 +276,21 @@ class CampaignAdminForm(forms.Form):
     pass
     
 class EmailShareForm(forms.Form):
-    recipient = forms.EmailField()
+    recipient = forms.EmailField(error_messages={'required': 'Please specify a recipient.'})
     sender = forms.EmailField(widget=forms.HiddenInput())
-    subject = forms.CharField(max_length=100)
-    message = forms.CharField(widget=forms.Textarea())
+    subject = forms.CharField(max_length=100, error_messages={'required': 'Please specify a subject.'})
+    message = forms.CharField(widget=forms.Textarea(), error_messages={'required': 'Please include a message.'})
     # allows us to return user to original page by passing it as hidden form input
     # we can't rely on POST or GET since the emailshare view handles both
     # and may iterate several times as it catches user errors, losing URL info
     next = forms.CharField(widget=forms.HiddenInput())
     
 class FeedbackForm(forms.Form):
-    sender = forms.EmailField(widget=forms.TextInput(attrs={'size':50}), label="Your email")
-    subject = forms.CharField(max_length=500, widget=forms.TextInput(attrs={'size':50}))
-    message = forms.CharField(widget=forms.Textarea())
+    sender = forms.EmailField(widget=forms.TextInput(attrs={'size':50}), label="Your email", error_messages={'required': 'Please specify your email address.'})
+    subject = forms.CharField(max_length=500, widget=forms.TextInput(attrs={'size':50}), error_messages={'required': 'Please specify a subject.'})
+    message = forms.CharField(widget=forms.Textarea(), error_messages={'required': 'Please specify a message.'})
     page = forms.CharField(widget=forms.HiddenInput())
-    notarobot = forms.IntegerField(label="Please prove you're not a robot")
+    notarobot = forms.IntegerField(label="Please prove you're not a robot", error_messages={'required': "You must do the sum to prove you're not a robot."})
     answer = forms.IntegerField(widget=forms.HiddenInput())
     num1 = forms.IntegerField(widget=forms.HiddenInput())
     num2 = forms.IntegerField(widget=forms.HiddenInput())
@@ -296,7 +299,7 @@ class FeedbackForm(forms.Form):
         cleaned_data = self.cleaned_data
         notarobot = str(cleaned_data.get("notarobot"))
         answer = str(cleaned_data.get("answer"))
-        if notarobot!=answer:
+        if notarobot != answer:
             raise forms.ValidationError(_("Whoops, try that sum again."))
             
         return cleaned_data

frontend/templates/emailshare.html

@@ -26,7 +26,7 @@ input[type=submit] {
     <form method="POST" action="/emailshare/">
         {% csrf_token %}
 		{{ form.as_p }}
-        <div class="spacer"></div><input type="submit" value="Share" />    
+        <div class="clearfix"></div><input type="submit" value="Share" />    
     </form>
 
 {% endblock %}

frontend/templates/feedback.html

@@ -9,14 +9,14 @@
 	To: support@gluejar.com<br /><br />
     <form method="POST" action="/feedback/">
         {% csrf_token %}
-		{{ form.sender.label_tag }}</br>
 		{{ form.sender.errors }}
+		{{ form.sender.label_tag }}</br>
 		{{ form.sender }}</br><br />
-		{{ form.subject.label_tag }}</br>
 		{{ form.subject.errors }}
+		{{ form.subject.label_tag }}</br>
 		{{ form.subject }}</br><br />
-		{{ form.message.label_tag }}</br>
 		{{ form.message.errors }}
+		{{ form.message.label_tag }}</br>
 		{{ form.message }}</br><br />
 		{{ form.notarobot.errors }}
 		{{ form.non_field_errors }}

frontend/templates/manage_campaign.html

@@ -3,6 +3,12 @@
 {% block title %}Campaign Management{% endblock %}
 
 {% block extra_extra_head %}
+<style type="text/css">
+textarea {
+	width: 90%;
+}
+</style>
+
 <script type="text/javascript">
 var $j = jQuery.noConflict();
 $j(document).ready(function(){
@@ -80,29 +86,29 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
 <p>If you'd like to embed a video from another source, please talk to us. You certainly can; we just want to make sure we've given you the right instructions.</p>
 </div>
 <p>Make it concise and emotionally appealing.  The point here is not to tell ungluers everything about your book; it's to remind them why they love it.</p>
-{{ form.description }}{{ form.description.errors }}
+{{ form.description.errors }}{{ form.description }}
 <h3>Offer details</h2>
 <p>This will be displayed on the Details tab for your work.  It gives additional information for the highly curious.  It should include:</p>
 <ul class="terms">
 <li>Details about the edition being offered.</li>
 <li>Hyperlinks for the author(s), publisher making the offer, or for the work itself.</li>
 </uL>
-{{ form.details }}{{ form.details.errors }}
+{{ form.details.errors }}{{ form.details }}
 <h3>Target Price</h2>
 <p> This is the target price for your campaign. Once you launch the campaign, you won't be able to increase it.</p>
-{{ form.target }}{{ form.target.errors }}
+{{ form.target.errors }}{{ form.target }}
 <h3>License being offered</h2>
 <p> This is the license you are offering to use once the campaign succeeds. For more info on the licenses you can use, see <a href="http://creativecommons.org/">Creative Commons</a></p>
-{{ form.license }}{{ form.license.errors }}
+{{ form.license.errors }}{{ form.license }}
 <h3>Ending date</h2>
 <p> This is the ending date of your campaign. Once you launch the campaign, you won't be able to change it. 
 The ending date can't be more than six months away- that's a practical limit for credit card authorizations.</p>
 
-{{ form.deadline }}{{ form.deadline.errors }}
+{{ form.deadline.errors }}{{ form.deadline }}
 
 <h3>Paypal collection address</h2>
 <p> If your campaign succeeds, the funds raised (less commission and fees) will be deposited in a paypal account bearing this email address.</p>
-{{ form.paypal_receiver }}{{ form.paypal_receiver.errors }}</p>
+{{ form.paypal_receiver.errors }}{{ form.paypal_receiver }}</p>
 
 {% ifequal campaign.status 'ACTIVE' %}
 <input type="submit" name="save" value="Modify Campaign" />
@@ -139,11 +145,11 @@ The ending date can't be more than six months away- that's a practical limit for
 <h4>Add a custom premium for this campaign</h4>
 <form action="#" method="POST">
 {% csrf_token %}
-Pledge Amount: {{ premium_form.amount }}{{ premium_form.amount.errors }}<br />
-Premium Description: {{ premium_form.description }}{{ premium_form.description.errors }}<br />
-Number Available (0 if no limit): {{ premium_form.limit }}{{ premium_form.limit.errors }}<br />
+Pledge Amount: {{ premium_form.amount.errors }}{{ premium_form.amount }}<br />
+Premium Description: {{ premium_form.description.errors }}{{ premium_form.description }}<br />
+Number Available (0 if no limit): {{ premium_form.limit.errors }}{{ premium_form.limit }}<br />
 {{ premium_form.campaign }}
-{{ premium_form.type }}{{ premium_form.type.errors }}
+{{ premium_form.type.errors }}{{ premium_form.type }}
 <br />
 <input type="submit" name="add_premium" value="Add Premium" />
 </form>

frontend/templates/pledge.html

@@ -47,13 +47,11 @@
     	<form class="pledgeform" method="POST" action="{% url pledge work_id=work.id %}">
         	{% csrf_token %}
 			{{ form.non_field_errors }}
-        	{{ form.preapproval_amount.errors }}
-        	<div class="pledge_amount">{{ form.preapproval_amount.label_tag }}: ${{ form.preapproval_amount }}</div>
-        	{{ form.anonymous.errors }}
+        	<div class="pledge_amount">{{ form.preapproval_amount.label_tag }}: {{ form.preapproval_amount.errors }}${{ form.preapproval_amount }}</div>
         	
         	{% comment %}
         	not supported yet; don't display
-        	{{ form.anonymous.label_tag }}: {{ form.anonymous }}	
+        	{{ form.anonymous.label_tag }}: {{ form.anonymous.errors }}{{ form.anonymous }}	
         	{% endcomment %}
 
         	<ul class="support menu">

frontend/templates/pledge_modify.html

@@ -65,14 +65,12 @@
 	
     	<form method="POST" action="{% url pledge_modify work_id=work.id %}">
         	{% csrf_token %}
-		{{ form.non_field_errors }}
-        	{{ form.preapproval_amount.errors }}
-        	<div class="pledge_amount">{{ form.preapproval_amount.label_tag }}: ${{ form.preapproval_amount }}</div>
-        	{{ form.anonymous.errors }}
+		    {{ form.non_field_errors }}
+        	<div class="pledge_amount">{{ form.preapproval_amount.label_tag }}: {{ form.preapproval_amount.errors }}${{ form.preapproval_amount }}</div>
         	
         	{% comment %}
         	not supported yet; don't display
-        	{{ form.anonymous.label_tag }}: {{ form.anonymous }}	
+        	{{ form.anonymous.label_tag }}: {{ form.anonymous.errors }}{{ form.anonymous }}	
         	{% endcomment %}
 
         	<ul class="support menu">

frontend/templates/registration/login_form.html

@@ -1,6 +1,6 @@
 <!-- login_form.html -->
 <form method="post" action="{% url django.contrib.auth.views.login %}">{% csrf_token %}
-    {{ form.username.label_tag }}
+    {{ form.username.label_tag }}    
     {{ form.username }}
     {{ form.password.label_tag }}
     {{ form.password }}

frontend/templates/registration/password_reset_confirm.html

@@ -4,7 +4,7 @@
 Enter your new password below to reset your password.<br /><br />
 
 <form method="post" action="#">{% csrf_token %}
-    {{ form.as_table }}
+    {{ form.as_p }}
     <input type="submit" value="Set password" />
 </form>
 {% endblock %}

frontend/templates/rights_holders.html

@@ -44,8 +44,8 @@
 	<dd>On Behalf of: {{ claim.rights_holder.rights_holder_name }}</dd>
 	<dd>PSA #: {{ claim.rights_holder.id }}</dd>
 	<dd>Date of Claim : {{ claim.created }}</dd>
-	<dd>Status: {{ claim.status }}</dd>
-	<dd> Change to:</dd> {{ claim_form.as_p }}
+	<dd>Status of Claim: {{ claim.status }}</dd>
+	<dd>Change to:</dd> {{ claim_form.as_p }}
     <input type="submit" name="set_claim_status" value="Set Claim Status" id="submit">
 {% endfor %}
 </dl>
@@ -62,7 +62,7 @@
 	<dd>On Behalf of: {{ claim.rights_holder.rights_holder_name }}</dd>
 	<dd>PSA #: {{ claim.rights_holder.id }}</dd>
 	<dd>Date of Claim : {{ claim.created }}</dd>
-	<dd>Status: {{ claim.status }}</dd>
+	<dd>Status of Claim: {{ claim.status }}</dd>
 {% endfor %}
 </dl>
 {% endif %}

static/css/book_list.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/book_panel.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/campaign.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -577,35 +577,27 @@ a {
 .show_more_edition {
   text-align: right;
 }
-.errorlist {
+.alert > .errorlist {
   list-style-type: none;
   font-size: 14px;
+  border: none;
+  text-align: left;
+  font-weight: normal;
+  font-size: 12px;
 }
-.errorlist li {
-  margin-bottom: 7px;
+.alert > .errorlist > li {
+  margin-bottom: 14px;
 }
-.errorlist .errorlist li {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
-  width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
+.alert > .errorlist .errorlist {
+  margin-top: 7px;
+}
+.alert > .errorlist .errorlist li {
   width: auto;
   height: auto;
   padding-left: 32px;
   padding-right: 32px;
   font-size: 12px;
 }
-.errorlist .errorlist li li {
-  list-style: none;
-  border: none;
-}
 #js-slide .jsmodule {
   width: 660px !important;
 }

static/css/documentation.css

@@ -86,21 +86,19 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
+  height: auto;
+  line-height: 16px;
   padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  height: 16px;
-  line-height: 16px;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -195,21 +193,19 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
+  height: auto;
+  line-height: 16px;
   padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  height: 16px;
-  line-height: 16px;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -390,6 +386,10 @@ body {
   padding: 10px;
   background: #edf3f4;
 }
+.doc ul.errorlist li {
+  background: none;
+  margin-bottom: 0;
+}
 .doc ul.terms {
   list-style: inherit;
   list-style-position: inside;
@@ -434,9 +434,6 @@ dd {
 .doc ol li {
   margin-bottom: 7px;
 }
-.errorlist li {
-  border: solid #8dc63f 4px;
-}
 .collapse ul {
   display: none;
 }

static/css/landingpage.css

@@ -86,21 +86,19 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
+  height: auto;
+  line-height: 16px;
   padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  height: 16px;
-  line-height: 16px;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -195,21 +193,19 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
+  height: auto;
+  line-height: 16px;
   padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  height: 16px;
-  line-height: 16px;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/learnmore.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/notices.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -106,24 +106,6 @@
   float: none !important;
   padding-right: 15px;
 }
-.errorlist {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
-  width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
-  height: auto;
-}
-.errorlist li {
-  list-style: none;
-  border: none;
-}
 /* notice_settings */
 th {
   text-align: left;

static/css/pledge.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/registration.css

@@ -73,40 +73,22 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
   list-style: none;
   border: none;
 }
-.errorlist {
-  clear: both;
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
-  width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
-}
-.errorlist li {
-  list-style: none;
-  border: none;
-}
 #login_centerer {
   padding: 10px 25%;
   width: 960px;

static/css/search.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/searchandbrowse.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/sitewide.css

@@ -74,16 +74,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {
@@ -270,6 +270,23 @@ ul.menu {
   padding: 0;
   margin: 0;
 }
+.errorlist {
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
+  width: 90%;
+  height: auto;
+  line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
+  text-align: center;
+}
+.errorlist li {
+  list-style: none;
+  border: none;
+}
 /* add class clearfix to floats to make them self-clear */
 .clearfix:after {
   content: ".";

static/css/supporter_layout.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/css/variables.css

@@ -73,16 +73,16 @@
   margin: 5px 0;
 }
 .errors {
-  -moz-border-radius: 32px;
-  -webkit-border-radius: 32px;
-  border-radius: 32px;
-  border: solid #e35351 4px;
+  -moz-border-radius: 16px 16px 0 0;
+  -webkit-border-radius: 16px 16px 0 0;
+  border-radius: 16px 16px 0 0;
+  border: solid #e35351 3px;
+  clear: both;
   width: 90%;
-  padding: 5px;
-  font-weight: bold;
-  padding: 7px 0;
-  height: 16px;
+  height: auto;
   line-height: 16px;
+  padding: 7px 0;
+  font-weight: bold;
   text-align: center;
 }
 .errors li {

static/less/campaign.less

@@ -510,17 +510,22 @@ a{ color:#3d4e53; font-size:12px;}
   text-align: right;
 }
 
-.errorlist {
+.alert > .errorlist {
 	list-style-type: none;
 	font-size: 14px;
+	border: none;
+	text-align: left;
+	font-weight: normal;
+	font-size: 12px;
 	
-	li {
-		margin-bottom: 7px;
+	> li {
+		margin-bottom: 14px;
 	}
 
 	.errorlist {
+		margin-top: 7px; 
+		
 		li {
-			.errors;
 			width: auto;
 			height: auto;
 			padding-left: 32px;

static/less/documentation.less

@@ -109,7 +109,12 @@ body {
 		margin-bottom:7px;
 		.one-border-radius(14px);
 		padding:10px;
-		background:@pale-blue;		
+		background:@pale-blue;
+	}
+	
+	&.errorlist li {
+		background: none;
+		margin-bottom: 0;
 	}
 	
 	&.terms {
@@ -148,10 +153,6 @@ dd {
 	margin-bottom: 7px;
 }
 
-.errorlist li {
-	border: solid @call-to-action 4px;
-}
-
 .collapse ul {
 	display: none;
 }

static/less/notices.less

@@ -18,11 +18,6 @@
 	padding-right: 15px;
 }
 
-.errorlist {
-	.errors;
-	height: auto;
-}
-
 /* notice_settings */
 th {
 	text-align: left;

static/less/registration.less

@@ -1,10 +1,5 @@
 @import "variables.less";
 
-.errorlist {
-	clear: both;
-	.errors;
-}
-
 #login_centerer {
     padding:10px 25%;
     width: 960px;

static/less/sitewide.less

@@ -184,6 +184,10 @@ ul.menu{
     margin:0;
 }
 
+.errorlist {
+	.errors;
+}
+
 /* add class clearfix to floats to make them self-clear */
 .clearfix:after {
 	content: ".";

static/less/variables.less

@@ -122,13 +122,14 @@
 }
 
 .errors {
-	.one-border-radius(32px);
-	border: solid @alert 4px;
+	.border-radius(16px, 16px, 0, 0);
+	border: solid @alert 3px;
+	clear: both;
 	width: 90%;
-	padding: 5px;
-	font-weight: bold;
+	height: auto;
+	line-height: 16px;
 	padding: 7px 0;
-	.height(16px);
+	font-weight: bold;
 	text-align: center;	
 	
 	li {