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: