EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1/head
Andromeda Yelton 2012-05-13 16:47:10 -04:00
parent fc14bda80e d9a96c2ada
commit f1a7d68f8a
21 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/tasks.py
View File

@ -51,14 +51,19 @@ def fac(n, sleep_interval=None):
sleep(sleep_interval)
return res
from django.core import mail
from django.core.mail import get_connection
from django.core.mail.message import EmailMessage
@task
def send_mail_task(subject, message, from_email, recipient_list,
fail_silently=False, auth_user=None, auth_password=None,
connection=None):
"""a task to drop django.core.mail.send_mail into """
return mail.send_mail(subject, message, from_email, recipient_list, fail_silently, auth_user, auth_password, connection)
connection = connection or get_connection(username=auth_user,
password=auth_password,
fail_silently=fail_silently)
return EmailMessage(subject, message, from_email, recipient_list,
connection=connection, headers = {'Reply-To': from_email }).send()
from notification.engine import send_all

7
frontend/templates/book_panel.html
View File

@ -1,3 +1,4 @@
{% load humanize %}
{% with work.first_ebook as first_ebook %}
{% with work.last_campaign.supporters as supporters %}
{% with work.cover_image_thumbnail as thumbnail %}
@ -19,13 +20,13 @@
{% else %}{% if status == 'SUCCESSFUL' %}
<b>UNGLUED!</b>
<p><b>On:</b> {{ deadline|date:"M d, Y" }}</p>
<p><b>Raised:</b> {{ work.last_campaign.current_total }}</p>
<p><b>Raised:</b> {{ work.last_campaign.current_total|intcomma }}</p>
</div>
<div class="read_itbutton">{% if first_ebook %}<a href="{{ work.ebooks.0.url }}">{% endif %}Read it Now</a></div>
{% else %}{% if status == 'ACTIVE' %}
<b>UNGLUE IT!</b>
<p><b>${{ work.last_campaign.current_total }}</b> raised</p><p><b>${{ work.last_campaign.target }}</b> needed</p>
<p><b>${{ work.last_campaign.current_total|intcomma }}</b> raised</p><p><b>${{ work.last_campaign.target|intcomma }}</b> needed</p>
<p>by {{ deadline|date:"M d, Y" }}</p>
</div>
<div class="read_itbutton pledge"><a href="/pledge/{{work.id}}">Support</a></div>
@ -148,7 +149,7 @@
<div class="listview panelfront side1 booklist-status">
{% if not is_preview %}
{% ifequal status "ACTIVE" %}
<span class="booklist-status-text" style="width: 190px"><b>${{ work.last_campaign.current_total }}</b> raised of <b>${{ work.last_campaign.target }}</b> goal</span>
<span class="booklist-status-text" style="width: 190px"><b>${{ work.last_campaign.current_total|intcomma }}</b> raised of <b>${{ work.last_campaign.target|intcomma }}</b> goal</span>
{% else %}{% if status == "INITIALIZED" %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
{% else %}

5
frontend/templates/campaign_detail.html
View File

@ -1,4 +1,5 @@
{% extends "base.html" %}
{% load humanize %}
{% url privacy as privacyurl %}
{% block extra_head %}
@ -24,7 +25,7 @@
<h2>Campaign: {{campaign.name}}</h2>
<!-- url for work: -->
<p>Work: <a href="{% url work work_id=campaign.work.id %}">{{campaign.work}}</a></p>
<p>Target: {{campaign.target}}</p>
<p>Target: {{campaign.target|intcomma}}</p>
<p>Deadline: {{campaign.deadline}}</p>
<p>Status: {{campaign.status}}</p>
<p>ISBN: {{campaign.work.first_isbn_13}} </p>
@ -32,7 +33,7 @@
<p>Embed a widget:</p>
<textarea rows="2" cols="80">&lt;iframe src="{{base_url}}/api/widget/{{campaign.work.first_isbn_13}}/" width="152" height="325" frameborder="0"&gt;</iframe></textarea>
<p>PayPal receiver: {{campaign.paypal_receiver}}</p>
<p>Current total (pledged/authorized): {{campaign.current_total}}</p>
<p>Current total (pledged/authorized): {{campaign.current_total|intcomma}}</p>
<form method="POST" action="{% url campaign_by_id pk=campaign.id %}" onsubmit="test()">
{% csrf_token %}
{{form.as_p}}

9
frontend/templates/manage_campaign.html
View File

@ -1,4 +1,5 @@
{% extends "basedocumentation.html" %}
{% load humanize %}
{% block title %}Campaign Management{% endblock %}
@ -78,7 +79,7 @@ Please fix the following before launching your campaign:
<div class="pledged-info">
<div class="pledged-group">
{{ work.last_campaign.supporters.count }} Ungluers have pledged ${{ work.last_campaign.current_total }}
{{ work.last_campaign.supporters.count }} Ungluers have pledged ${{ work.last_campaign.current_total|intcomma }}
</div>
<div class="status">
<img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" title="book list status" alt="book list status" />
@ -145,7 +146,7 @@ Please fix the following before launching your campaign:
{% ifnotequal campaign_status 'ACTIVE' %}
<h3>Target Price</h3>
<p> This is the target price for your campaign. Once you launch the campaign, you won't be able to increase it. The <i>mimimum</i> target is ${{form.minimum_target}} .</p>
<p> This is the target price for your campaign. Once you launch the campaign, you won't be able to increase it. The <i>mimimum</i> target is ${{form.minimum_target|intcomma}} .</p>
{{ form.target.errors }}{{ form.target }}
<h3>License being offered</h3>
<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/licenses">Creative Commons: About the Licenses</a>.</p>
@ -158,7 +159,7 @@ Please fix the following before launching your campaign:
{% else %}
<h3>Target Price</h3>
<p>The current target price for your campaign is <b>${{ campaign.target }}</b>. Since your campaign is active, you may lower, but not raise, this target.</p>
<p>The current target price for your campaign is <b>${{ campaign.target|intcomma }}</b>. Since your campaign is active, you may lower, but not raise, this target.</p>
${{ form.target.errors }}{{ form.target }}
<h3>License being offered</h3>
@ -194,7 +195,7 @@ Please fix the following before launching your campaign:
{% for premium in premiums %}
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<a href="{% url pledge work_id=campaign.work.id %}?premium_id={{premium.id}}">
<span class="menu-item-price">${{ premium.amount }}</span>
<span class="menu-item-price">${{ premium.amount|intcomma }}</span>
<span class="menu-item-desc">{{ premium.description }}</span>
</a>
{% if premium.type %}<span class="custom-premium"> <br />Type: {{ premium.get_type_display }}</span>{% endif %}

4
frontend/templates/notification/pledge_charged/full.txt
View File

@ -1,9 +1,9 @@
Congratulations!
{% load humanize %}Congratulations!
Thanks to you and other ungluers, {{ work.title }} will be released to the world in an unglued ebook edition. {{ payment_processor }} will now charge your credit card.
Pledge Summary
Amount pledged: {{ amount }}
Amount pledged: {{ amount|intcomma }}
Premium: {{ premium }}
We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ campaign.rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.

4
frontend/templates/notification/pledge_status_change/full.txt
View File

@ -1,7 +1,7 @@
You have modified a pledge that you had previously made to the campaign to unglue {{ campaign.work.title }}
{% load humanize %}You have modified a pledge that you had previously made to the campaign to unglue {{ campaign.work.title }}
Your new pledge summary
Amount pledged: {{ amount }}
Amount pledged: {{ amount|intcomma }}
Premium: {{ premium }}
If you'd like to visit the project page, click here:

7
frontend/templates/notification/pledge_you_have_pledged/full.txt
View File

@ -1,10 +1,7 @@
{% with work.title as title %}
{% with site.domain as domain %}
{% with work.id as work_id %}
Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ title }}. If this campaign successfully raises ${{ campaign.target }} by {{ campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
{% load humanize %}{% with work.title as title %}{% with site.domain as domain %}{% with work.id as work_id %}Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ title }}. If this campaign successfully raises ${{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
Pledge summary
Amount pledged: ${{ transaction.amount }}
Amount pledged: ${{ transaction.amount|intcomma }}
Premium: {{ transaction.premium.description }}
You can help even more by sharing this campaign with your friends.

5
frontend/templates/notification/pledge_you_have_pledged/notice.html
View File

@ -1,3 +1,4 @@
{% load humanize %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work work.id %}?tab=2"><img src="{{ work.cover_image_thumbnail }}" alt="cover image for {{ work.title }}" /></a>
@ -5,12 +6,12 @@
<div class="comments_info">
<div class="comments_graphical">
You've just pledged ${{ transaction.amount }} to <a href="{% url work work.id %}">{{ work.title }}</a>.
You've just pledged ${{ transaction.amount|intcomma }} to <a href="{% url work work.id %}">{{ work.title }}</a>.
</div>
<div class="comments_textual">
<p>Thank you, {{transaction.user.username}},</p>
<p class="pledge_complete">You've just pledged ${{ transaction.amount }} to <a href="{% url work work.id %}">{{ work.title }}</a>. If it reaches its goal of ${{ campaign.target }} by {{ campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p class="pledge_complete">You've just pledged ${{ transaction.amount|intcomma }} to <a href="{% url work work.id %}">{{ work.title }}</a>. If it reaches its goal of ${{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p class="pledge_complete">You can help even more by sharing this campaign with your friends!</p>
<ul><li> Email it!</li>
<li> Tweet it!</li>

2
frontend/templates/notification/wishlist_active/full.txt
View File

@ -1,4 +1,4 @@
Congratulations, you wished for it, and now there is an active Campaign for {{ campaign.work.title }} to be unglued. If ungluers like you pledge {{ campaign.target }} by {{ campaign.deadline }}, this book will be released under a Creative Commons license for everyone to enjoy.
{% load humanize %}Congratulations, you wished for it, and now there is an active Campaign for {{ campaign.work.title }} to be unglued. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline }}, this book will be released under a Creative Commons license for everyone to enjoy.
You can help!

3
frontend/templates/notification/wishlist_active/notice.html
View File

@ -1,3 +1,4 @@
{% load humanize %}
{% with campaign.work.id as id %}
{% with campaign.work.title as title %}
@ -11,7 +12,7 @@
<span>The rights holder, {{ active_claim.rights_holder.rights_holder_name }}, has launched a campaign for <a href="{% url work id %}">{{ title }}</a>!</span>
</div>
<div class="comments_textual">
<div>Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target }} by {{ campaign.deadline|date:"M d, Y" }}, <I>{{ title }}</i> will be released under a <a href="http://creativecommons.org">Creative Commons</a> license for all to enjoy.</div>
<div>Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d, Y" }}, <I>{{ title }}</i> will be released under a <a href="http://creativecommons.org">Creative Commons</a> license for all to enjoy.</div>
<div>You can help! <a href="{% url pledge work_id=id %}">Pledge</a> any amount, and use the sharing options on the <a href="{% url work id %}">campaign page</a> to tell your friends.</a></div>
</div>
</div>

9
frontend/templates/notification/wishlist_near_deadline/full.txt
View File

@ -1,8 +1,7 @@
{% if campaign.left > 0 %}
The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is almost out of time. We need to raise ${{ campaign.left }} more by {{ campaign.deadline }} in order to give this book to the world.
{% load humanize %}{% if campaign.left > 0 %} The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is almost out of time. We need to raise ${{ campaign.left|intcomma }} more by {{ campaign.deadline }} in order to give this book to the world.
{% if pledged %}
Your pledge of {{ amount }} is helping {{ campaign.work.title }} to reach its goal, but we can only unglue this book if the campaign succeeds. You can help your pledge go farther by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
Your pledge of {{ amount|intcomma }} is helping {{ campaign.work.title }} to reach its goal, but we can only unglue this book if the campaign succeeds. You can help your pledge go farther by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
{% else %}
We need your pledge to reach this target. Any amount helps. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge work_id=campaign.work.id %} .
@ -12,10 +11,10 @@
Thank you!
{% else %}
The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is on track to succeed! It has met its target price of {{ campaign.target }} and will close soon.
The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is on track to succeed! It has met its target price of {{ campaign.target|intcomma }} and will close soon.
{% if pledged %}
Your pledge of {{ amount }} is helping us give this book to the world. Thank you! When the campaign closes, we'll be in touch about how and when you'll receive your premiums.
Your pledge of ${{ amount|intcomma }} is helping us give this book to the world. Thank you! When the campaign closes, we'll be in touch about how and when you'll receive your premiums.
{% else %}
If you wanted to support this campaign, this is your last chance. Pledge by midnight (Eastern US time) if you want to help the campaign or receive any premiums: https://{{ site.domain }}{% url pledge work_id=campaign.work.id %}
{% endif %}

4
frontend/templates/notification/wishlist_near_target/full.txt
View File

@ -1,7 +1,7 @@
The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is close to succeeding! We only need to raise ${{ campaign.left }} more by {{ campaign.deadline }} in order to give this book to the world.
{% load humanize %}The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is close to succeeding! We only need to raise ${{ campaign.left|intcomma }} more by {{ campaign.deadline }} in order to give this book to the world.
{% if pledged %}
Your pledge of {{ amount }} is helping {{ campaign.work.title }} to reach its goal, but we can only unglue this book if the campaign succeeds. You can tip the balance by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
Your pledge of {{ amount|intcomma }} is helping {{ campaign.work.title }} to reach its goal, but we can only unglue this book if the campaign succeeds. You can tip the balance by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
{% else %}
We need your pledge to reach this target. Any amount helps. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge work_id=campaign.work.id %} .

4
frontend/templates/notification/wishlist_premium_limited_supply/full.txt
View File

@ -1,7 +1,7 @@
Did you want one of the limited-edition premiums for the campaign to unglue {{ campaign.work.title }}? This is your last chance -- there's only one left!
{% load humanize %}Did you want one of the limited-edition premiums for the campaign to unglue {{ campaign.work.title }}? This is your last chance -- there's only one left!
Premium: {{ premium.description }}
Amount: {{ premium.amount }}
Amount: {{ premium.amount|intcomma }}
If you'd like to claim the last one, pledge here: https://{{ site.domain }}{% url pledge work_id=campaign.work.id %}

4
frontend/templates/notification/wishlist_price_drop/full.txt
View File

@ -1,7 +1,7 @@
Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target }} for {{ campaign.work.title }}. Now we only need to raise ${{ campaign.left }} by {{ campaign.deadline }} in order to give this book to the world.
{% load humanize %}Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target|intcomma }} for {{ campaign.work.title }}. Now we only need to raise ${{ campaign.left|intcomma }} by {{ campaign.deadline }} in order to give this book to the world.
{% if pledged %}
Your pledge of {{ amount }} is now going even farther toward helping {{ campaign.work.title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
Your pledge of {{ amount|intcomma }} is now going even farther toward helping {{ campaign.work.title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help by sharing the campaign (https://{{ site.domain }}{% url work work_id=campaign.work.id %}) with your friends through your favorite media: tweet, Facebook, Tumblr, blog, G+, Pinterest, email, carrier pigeon, or good old-fashioned conversation.
{% else %}
The target may be lower, but we still need your help to reach it. Pledges of any amount help. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge work_id=campaign.work.id %} .

9
frontend/templates/pledge.html
View File

@ -1,4 +1,5 @@
{% extends "basepledge.html" %}
{% load humanize %}
{% block title %}Pledge{% endblock %}
@ -29,14 +30,14 @@
<div class="jsmodule rounded pledge">
<div class="jsmod-content">
${{ work.last_campaign.target }} needed by<br />
${{ work.last_campaign.target|intcomma }} needed by<br />
{{ work.last_campaign.deadline }}
</div>
</div>
<div class="pledged-info">
<div class="pledged-group">
{{ work.last_campaign.supporters.count }} Ungluers have pledged ${{ work.last_campaign.current_total }}
{{ work.last_campaign.supporters.count }} Ungluers have pledged ${{ work.last_campaign.current_total|intcomma }}
</div>
<div class="status">
<img src="/static/images/images/icon-book-37by25-{{ work.percent_unglued }}.png" title="book list status" alt="book list status" />
@ -51,7 +52,7 @@
{% if faqmenu == 'modify' %}
<div class="modify_notification clearfix"><h4>You've already pledged to this campaign:</h4>
<div>
Amount: ${{preapproval_amount}}.<br />
Amount: ${{preapproval_amount|intcomma}}.<br />
Your premium: {% if premium_description %}{{ premium_description }}{% else %}You did not request a premium for this campaign.{% endif %}<br/>
</div>
<br /> You can modify your pledge below.
@ -79,7 +80,7 @@
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<input type="radio" name="premium_id" id="premium_{{premium.id}}" value="{{premium.id}}" {% ifequal request.REQUEST.premium_id premium.id|stringformat:"s" %}checked="checked"{% endifequal %} />
<span class="menu-item-price">
${{ premium.amount }}
${{ premium.amount|intcomma }}
</span>
<span class="menu-item-desc">
{{ premium.description }} {% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}

3
frontend/templates/pledge_cancel.html
View File

@ -1,4 +1,5 @@
{% extends "basepledge.html" %}
{% load humanize %}
{% block title %}Pledge Cancelled{% endblock %}
@ -9,7 +10,7 @@
{% block doccontent %}
{% if transaction %}
<div>You've asked to cancel your pledge of ${{ transaction.amount }} to <a href="{% url work work.id %}">{{ work.title }}</a> Did you mean to do this?</div>
<div>You've asked to cancel your pledge of ${{ transaction.amount|intcomma }} to <a href="{% url work work.id %}">{{ work.title }}</a> Did you mean to do this?</div>
<div class="btn_support">Yes, cancel my pledge</div><div class="btn_support">Whoops, don't cancel!</div>
{% comment %}

3
frontend/templates/pledge_complete.html
View File

@ -1,4 +1,5 @@
{% extends "basepledge.html" %}
{% load humanize %}
{% block title %}Pledge Completed{% endblock %}
@ -28,7 +29,7 @@
<h2 class="thank-you">Thank you!</h2>
<p class="pledge_complete">You've just pledged ${{ transaction.amount }} to <a href="{% url work work.id %}">{{ work.title }}</a>. If it reaches its goal of ${{ campaign.target }} by {{ campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p class="pledge_complete">You've just pledged ${{ transaction.amount|intcomma }} to <a href="{% url work work.id %}">{{ work.title }}</a>. If it reaches its goal of ${{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p class="pledge_complete">You can help even more by sharing this campaign with your friends:</p>
<div id="widgetcode">Copy/paste this into your site:<br /><textarea rows="7" cols="22">&lt;iframe src="https://{{request.META.HTTP_HOST}}/api/widget/{{work.first_isbn_13}}/" width="152" height="325" frameborder="0"&gt;&lt;/iframe&gt;</textarea></div>

7
frontend/templates/sidebar_pledge_complete.html
View File

@ -1,3 +1,4 @@
{% load humanize %}
<div class="jsmodule">
<div class="jsmod-content">
<ul class="menu level1">
@ -5,9 +6,9 @@
stuff about stuff.
will contain campaign info. maybe a cover image. (small.)
{% comment %}
<p class="pledge_complete">You just pledged ${{transaction.amount}} to <a href="{% url work work.id %}">{{work.title}}</a>.</p>
<p class="pledge_complete">If the campaign reaches its target of ${{campaign.target}} by {{campaign.deadline|date:"F d, Y"}},
your PayPal account will be charged ${{transaction.amount}}.</p>
<p class="pledge_complete">You just pledged ${{transaction.amount|intcomma}} to <a href="{% url work work.id %}">{{work.title}}</a>.</p>
<p class="pledge_complete">If the campaign reaches its target of ${{campaign.target|intcomma}} by {{campaign.deadline|date:"F d, Y"}},
your PayPal account will be charged ${{transaction.amount|intcomma}}.</p>
note: campaign (image, title, rights holder, deadline, maybe target)
pledge amount

13
frontend/templates/work.html
View File

@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load comments %}
{% load humanize %}
{% block title %}&#151; {% if work.last_campaign_status == 'ACTIVE' %}Campaign to unglue {% endif %}{{ work.title }}{% endblock %}
{% block extra_css %}
@ -63,11 +64,11 @@ $j(document).ready(function(){
{% else %}{% if work.last_campaign and not is_preview %}
{% if status == 'ACTIVE' %}
Unglue it! <br />
${{ work.last_campaign.current_total }}/${{ work.last_campaign.target }} <br />
${{ work.last_campaign.current_total|intcomma }}/${{ work.last_campaign.target|intcomma }} <br />
Ending {{ countdown }}
{% else %}
{% if status == 'SUCCESSFUL' %}
Unglued on {{ work.last_campaign.deadline|date:"M j, Y"}}! <br />${{ work.last_campaign.current_total }} raised of ${{ work.last_campaign.target }} goal
Unglued on {{ work.last_campaign.deadline|date:"M j, Y"}}! <br />${{ work.last_campaign.current_total|intcomma }} raised of ${{ work.last_campaign.target|intcomma }} goal
{% else %}{% if status == 'INITIALIZED' %}
Campaign starting soon
{% else %}{% if status == 'SUSPENDED' %}
@ -184,7 +185,7 @@ $j(document).ready(function(){
{% else %}
{{ work.last_campaign.supporters.count }} Ungluers have
{% endif %}
pledged ${{ work.last_campaign.current_total }}<br />toward a ${{ work.last_campaign.target }} goal
pledged ${{ work.last_campaign.current_total|intcomma }}<br />toward a ${{ work.last_campaign.target|intcomma }} goal
{% else %}
{% if wishers == 1 %}
1 Ungluer has
@ -277,7 +278,7 @@ $j(document).ready(function(){
{{ claim.rights_holder.rights_holder_name }}
{% endif %}
{% endfor %}
, has agreed to release <i>{{work.title}}</i> to the world as a Creative Commons licensed ebook ({{ work.last_campaign.license }}) if ungluers can join together to raise ${{ work.last_campaign.target }} by {{ work.last_campaign.deadline }}.
, has agreed to release <i>{{work.title}}</i> 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 }}.
You can help!</p>
<h4>Last campaign details</h4>
@ -397,7 +398,7 @@ $j(document).ready(function(){
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<a href="{% url pledge_modify work_id %}?premium_id={{premium.id}}">
<span class="menu-item-price">${{ premium.amount }}</span>
<span class="menu-item-price">${{ premium.amount|intcomma }}</span>
<span class="menu-item-desc">{{ premium.description }}</span>
{% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
</a></li>
@ -408,7 +409,7 @@ $j(document).ready(function(){
{% if premium.limit == 0 or premium.limit > premium.premium_count %}
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}">
<a href="{% url pledge work_id %}?premium_id={{premium.id}}">
<span class="menu-item-price">${{ premium.amount }}</span>
<span class="menu-item-price">${{ premium.amount|intcomma }}</span>
<span class="menu-item-desc">{{ premium.description }}</span>
{% ifnotequal premium.limit 0 %}<br /> Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
</a></li>

2
frontend/views.py
View File

@ -1765,7 +1765,7 @@ def emailshare(request):
if form.is_valid():
subject = form.cleaned_data['subject']
message = form.cleaned_data['message']
sender = sender = request.user.email
sender = '%s via Unglue.it <%s>'%(request.user.username, request.user.email)
recipient = form.cleaned_data['recipient']
send_mail_task.delay(subject, message, sender, [recipient])
try:

1
settings/common.py
View File

@ -104,6 +104,7 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.comments',
'django.contrib.humanize',
'south',
'django_extensions',
'regluit.frontend',