From d7847154070c70f23d21da21228be1d4a36a611f Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 25 May 2012 18:34:16 -0400 Subject: [PATCH] Round dollar amount to nearest dollar [#30073593] --- frontend/templates/book_panel.html | 6 +++--- frontend/templates/campaign_detail.html | 4 ++-- frontend/templates/pledge.html | 2 +- frontend/templates/sidebar_pledge_complete.html | 2 +- frontend/templates/work.html | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 2a397d65..ac4b5df0 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -22,13 +22,13 @@ {% else %}{% if status == 'SUCCESSFUL' %} UNGLUED!

On: {{ deadline|date:"M d, Y" }}

-

Raised: {{ work.last_campaign.current_total|intcomma }}

+

Raised: {{ work.last_campaign.current_total|floatformat:0|intcomma }}

{% if first_ebook %}
Read it Now
{% else %}
Coming Soon
{% endif %} {% else %}{% if status == 'ACTIVE' %} UNGLUE IT! -

${{ work.last_campaign.current_total|intcomma }} raised

${{ work.last_campaign.target|intcomma }} needed

+

${{ work.last_campaign.current_total|floatformat:0|intcomma }} raised

${{ work.last_campaign.target|floatformat:0|intcomma }} needed

by {{ deadline|date:"M d, Y" }}

Support
 @@ -151,7 +151,7 @@
{% if not is_preview %} {% ifequal status "ACTIVE" %} - ${{ work.last_campaign.current_total|intcomma }}/${{ work.last_campaign.target|intcomma }} + ${{ work.last_campaign.current_total|floatformat:0|intcomma }}/${{ work.last_campaign.target|floatformat:0|intcomma }} {% else %}{% if status == "INITIALIZED" %} Status: Coming soon! {% else %} diff --git a/frontend/templates/campaign_detail.html b/frontend/templates/campaign_detail.html index a1190f71..c652c25c 100644 --- a/frontend/templates/campaign_detail.html +++ b/frontend/templates/campaign_detail.html @@ -25,7 +25,7 @@

Campaign: {{campaign.name}}

Work: {{campaign.work}}

-

Target: {{campaign.target|intcomma}}

+

Target: {{campaign.target|floatformat:0|intcomma}}

Deadline: {{campaign.deadline}}

Status: {{campaign.status}}

ISBN: {{campaign.work.first_isbn_13}}

@@ -33,7 +33,7 @@

Embed a widget:

PayPal receiver: {{campaign.paypal_receiver}}

-

Current total (pledged/authorized): {{campaign.current_total|intcomma}}

+

Current total (pledged/authorized): {{campaign.current_total|floatformat:0|intcomma}}

{% csrf_token %} {{form.as_p}} diff --git a/frontend/templates/pledge.html b/frontend/templates/pledge.html index ca69a993..2d63d6bc 100644 --- a/frontend/templates/pledge.html +++ b/frontend/templates/pledge.html @@ -30,7 +30,7 @@
- ${{ work.last_campaign.target|intcomma }} needed by
+ ${{ work.last_campaign.target|floatformat:0|intcomma }} needed by
{{ work.last_campaign.deadline }}
diff --git a/frontend/templates/sidebar_pledge_complete.html b/frontend/templates/sidebar_pledge_complete.html index 1b7a981c..10896208 100644 --- a/frontend/templates/sidebar_pledge_complete.html +++ b/frontend/templates/sidebar_pledge_complete.html @@ -7,7 +7,7 @@ will contain campaign info. maybe a cover image. (small.) {% comment %}

You just pledged ${{transaction.amount|intcomma}} to {{work.title}}.

-

If the campaign reaches its target of ${{campaign.target|intcomma}} by {{campaign.deadline|date:"F d, Y"}}, +

If the campaign reaches its target of ${{campaign.target|floatformat:0|intcomma}} by {{campaign.deadline|date:"F d, Y"}}, your PayPal account will be charged ${{transaction.amount|intcomma}}.

note: campaign (image, title, rights holder, deadline, maybe target) diff --git a/frontend/templates/work.html b/frontend/templates/work.html index ed893fee..8caffd81 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -64,11 +64,11 @@ $j(document).ready(function(){ {% else %}{% if work.last_campaign and not is_preview %} {% if status == 'ACTIVE' %} Unglue it!
- ${{ work.last_campaign.current_total|intcomma }}/${{ work.last_campaign.target|intcomma }}
+ ${{ work.last_campaign.current_total|floatformat:0|intcomma }}/${{ work.last_campaign.target|floatformat:0|intcomma }}
Ending {{ countdown }} {% else %} {% if status == 'SUCCESSFUL' %} - Unglued on {{ work.last_campaign.deadline|date:"M j, Y"}}!
${{ work.last_campaign.current_total|intcomma }} raised of ${{ work.last_campaign.target|intcomma }} goal + Unglued on {{ work.last_campaign.deadline|date:"M j, Y"}}!
${{ work.last_campaign.current_total|floatformat:0|intcomma }} raised of ${{ work.last_campaign.target|floatformat:0|intcomma }} goal {% else %}{% if status == 'INITIALIZED' %} Campaign starting soon {% else %}{% if status == 'SUSPENDED' %} @@ -184,7 +184,7 @@ $j(document).ready(function(){ {% else %} {{ work.last_campaign.supporters.count }} Ungluers have {% endif %} - pledged ${{ work.last_campaign.current_total|intcomma }}
toward a ${{ work.last_campaign.target|intcomma }} goal + pledged ${{ work.last_campaign.current_total|floatformat:0|intcomma }}
toward a ${{ work.last_campaign.target|floatformat:0|intcomma }} goal {% else %} {% if wishers == 1 %} 1 Ungluer has @@ -277,7 +277,7 @@ $j(document).ready(function(){ {{ claim.rights_holder.rights_holder_name }} {% endif %} {% endfor %} - , has agreed to release {{work.title}} to the world as a Creative Commons licensed ebook ({{ work.last_campaign.license }}) if ungluers can join together to raise ${{ work.last_campaign.target|intcomma }} by {{ work.last_campaign.deadline }}. + , has agreed to release {{work.title}} to the world as a Creative Commons licensed ebook ({{ work.last_campaign.license }}) if ungluers can join together to raise ${{ work.last_campaign.target|floatformat:0|intcomma }} by {{ work.last_campaign.deadline }}. You can help!

Campaign details: the fine print

@@ -397,7 +397,7 @@ $j(document).ready(function(){ {% if premium.limit == 0 or premium.limit > premium.premium_count %}
  • - ${{ premium.amount|intcomma }}{% if pledged.0.premium == premium %}
    Pledged!
    {% endif %} + ${{ premium.amount|floatformat:0|intcomma }}{% if pledged.0.premium == premium %}
    Pledged!
    {% endif %} {{ premium.description }} {% ifnotequal premium.limit 0 %}
    Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
    • @@ -408,7 +408,7 @@ $j(document).ready(function(){ {% if premium.limit == 0 or premium.limit > premium.premium_count %}
  • - ${{ premium.amount|intcomma }} + ${{ premium.amount|floatformat:0|intcomma }} {{ premium.description }} {% ifnotequal premium.limit 0 %}
    Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}