Merge pull request #204 from Gluejar/b2u_errata

B2u errata
pull/1/head
Raymond Yee 2013-09-07 09:23:05 -07:00
commit 5c8b67a1c9
3 changed files with 9 additions and 5 deletions

View File

@ -551,7 +551,7 @@ class CCForm(PlainCCForm):
min_value=D('1.00'),
max_value=D('100000.00'),
decimal_places=2,
label="Pledge",
label="Amount",
)
class DonateForm(forms.Form):

View File

@ -76,7 +76,7 @@ $j(document).ready(function() {
</form>
</div>
<div id="pledge_area">
<a class="fakeinput" id="pledge_option">Pledge</a>
<a class="fakeinput" id="pledge_option">{{ action|capfirst }}</a>
</div>
</div>
@ -112,7 +112,7 @@ $j(document).ready(function() {
{% csrf_token %}
{{ form.non_field_errors }}
{{ form.as_p }}
<input id="use_account_submit" name="use_account" type="submit" class="submit-button loader-gif" value="Complete Pledge" />
<input id="use_account_submit" name="use_account" type="submit" class="submit-button loader-gif" value="Complete {{ action|capfirst }}" />
</div>
</form>
</div>

View File

@ -167,7 +167,11 @@ function put_un_in_cookie2(){
</span>
<span class="user-book-info">
<a href="{% url supporter object.user.username %}">{{ object.user.username }}</a><br />
pledged to the campaign to unglue <br />
{% ifequal object.type 2 %}
pledged to unglue
{% else %}
bought a copy of
{% endifequal %}<br />
<a class="user-book-name" href="{% url work object.campaign.work.id %}">{{ object.campaign.work.title }}</a>
</span>
{% else %}{% ifequal event.2 "comment" %}
@ -185,7 +189,7 @@ function put_un_in_cookie2(){
</span>
<span class="user-book-info">
<a href="{% url supporter object.wishlist.user.username %}">{{ object.wishlist.user.username }}</a><br />
wishlisted <br />
added to list<br />
<a class="user-book-name" href="{% url work object.work.id %}">{{ object.work.title }}</a>
</span>
{% endifequal %}{% endifequal %}{% endifequal %}