diff --git a/frontend/forms.py b/frontend/forms.py
index 19a25fc9..d7a1c976 100644
--- a/frontend/forms.py
+++ b/frontend/forms.py
@@ -343,6 +343,8 @@ class CampaignPledgeForm(forms.Form):
if preapproval_amount is None:
# preapproval_amount failed validation, that error is the relevant one
return self.cleaned_data
+ elif self.premium is None:
+ raise forms.ValidationError(_("Please select a premium." ))
elif preapproval_amount < self.premium.amount:
logger.info("raising form validating error")
raise forms.ValidationError(_("Sorry, you must pledge at least $%s to select that premium." % (self.premium.amount)))
diff --git a/frontend/templates/fund_the_pledge.html b/frontend/templates/fund_the_pledge.html
index fd4becdd..2de0d753 100644
--- a/frontend/templates/fund_the_pledge.html
+++ b/frontend/templates/fund_the_pledge.html
@@ -24,7 +24,7 @@ $j(document).ready(function() {
// remove help text when input is selected
// user-entered text should be in usual text color
- inputs.on("click", function() {
+ inputs.on("focus", function() {
defaultValue = $j(this).val();
$j(this).val('');
$j(this).css('color', '#3d4e53')
diff --git a/frontend/templates/pledge_complete.html b/frontend/templates/pledge_complete.html
index 7ca27b9a..e8e13015 100644
--- a/frontend/templates/pledge_complete.html
+++ b/frontend/templates/pledge_complete.html
@@ -32,11 +32,12 @@
Thank you!
You've just {% if modified %}modified your pledge for{% else %}pledged{% endif %} ${{ transaction.amount|intcomma }} to {{ work.title }}. If it reaches its goal of ${{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.
+
Your pledge: ${{transaction.amount|intcomma}}.
Your premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}You did not request a premium for this campaign.{% endif %}
- {% if transaction.anonymous %}You want your pledge to be anonymous.
{% endif %}
+ {% if transaction.anonymous %}You asked to pledge anonymously, so you will be counted but not named on the list of supporters.
{% endif %}
Acknowledgements:
- The unglued ebook will be delivered to your inbox.
{% if not transaction.anonymous %}
diff --git a/frontend/views.py b/frontend/views.py
index 62071e86..ce6ffc63 100755
--- a/frontend/views.py
+++ b/frontend/views.py
@@ -643,7 +643,7 @@ class PledgeView(FormView):
raise e
transactions = self.campaign.transactions().filter(user=self.request.user, status=TRANSACTION_STATUS_ACTIVE, type=PAYMENT_TYPE_AUTHORIZATION)
- premium_id = self.request.REQUEST.get('premium_id', None)
+ premium_id = self.request.REQUEST.get('premium_id', 150)
if transactions.count() == 0:
ack_name=''
ack_dedication=''
diff --git a/static/css/pledge.css b/static/css/pledge.css
index 45cb2ed9..c852729d 100644
--- a/static/css/pledge.css
+++ b/static/css/pledge.css
@@ -259,7 +259,7 @@ span.menu-item-price {
#authorize.off {
display: none;
}
-#authorize div.innards input {
+#authorize div.innards input[type="text"] {
font-size: 15px;
line-height: 22.5px;
border-width: 2px;
@@ -267,11 +267,11 @@ span.menu-item-price {
margin: 1% 0;
color: #3d4e53;
}
-#authorize div.innards input:disabled {
+#authorize div.innards input[type="text"]:disabled {
border-color: white;
}
-#authorize div.innards input.address,
-#authorize div.innards input#card_Number {
+#authorize div.innards input[type="text"].address,
+#authorize div.innards input[type="text"]#card_Number {
width: 61%;
}
#authorize div.innards label {
diff --git a/static/less/pledge.less b/static/less/pledge.less
index 9b3992ae..ae92da90 100644
--- a/static/less/pledge.less
+++ b/static/less/pledge.less
@@ -201,7 +201,7 @@ span.menu-item-price {
padding: 10px;
div.innards {
- input {
+ input[type="text"] {
font-size: @font-size-larger;
line-height: @font-size-larger*1.5;
border-width: 2px;
@@ -215,7 +215,7 @@ span.menu-item-price {
&.address, card_Number {
width: 61%;
- }
+ }
}
label {