[finish #24030945] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.

pull/1/head
eric 2012-04-28 13:02:38 -04:00
parent 6cd6064387
commit 61a4878b54
5 changed files with 49 additions and 17 deletions

View File

@ -2,25 +2,35 @@
Great News, {{user.username}}! {{ work.title }}, which you have supported on Unglue.it, is now available for download as an Unglued Ebook.
</p>
{% else %}
Good News! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.rights.display }} ebook.
Good News, {{user.username}}! {{ work.title }} which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
{% if work.ebooks.0.user %}
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link to
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
{% endif %}
{% endif %}
Here are the files available for download:
{% for ebook in work.ebooks %}
File type: {{ ebook.format.display }}</td>
License: {{ ebook.rights.display }}</td>
Host Site: {{ ebook.provider }}</td>
File type: {{ ebook.get_format_display }}
License: {{ ebook.get_rights_display }}
Host Site: {{ ebook.provider }}
URL: {{ ebook.url }}
{% endfor %}
{% if work.ebooks.0.rights == 'PD-US' %}
A public domain ebook belongs to all of us. You can do anything you like with it.
{% else %}
The Creative Commons licensing terms for allow you to redistribute the files under the the specified license terms. There's no DRM.
The Creative Commons licensing terms for allow you to redistribute the files under the specified license terms. There's no DRM.
{% endif %}
{% if work.last_campaign_status == 'SUCCESSFUL' %}
If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing.
{% else %}
If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble.
{% endif %}
Thanks,
Your Tireless Unglue.it Staff
Give ebooks to the world; give income to authors and publishers. Unglue.it

View File

@ -1,12 +1,12 @@
{% load truncatechars %}
<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>
<a href="{% url work work.id %}"><img src="{{ work.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
</div>
<div class="comments_info">
<div class="comments_graphical">
<span><a href="{% url work work.id %}">{{ work.title }}</a> is now available for download</span>
</div>
<div class="comments_textual">
{% if work.last_campaign_status == 'SUCCESSFUL' %}
@ -14,14 +14,16 @@
Great News! <a href="{% url work work.id %}">{{ work.title }}</a> which you have supported is now available for download as an Unglued Ebook.
</p>
{% else %}
Good News! <a href="{% url work work.id %}">{{ work.title }}</a> which is on your wishlist is available for download as a {{ work.ebooks.0.rights.display }} ebook.
<p>
Good News! <a href="{% url work work.id %}">{{ work.title }}</a> which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
</p>
{% if work.ebooks.0.user %}
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link to
<p>
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
</p>
{% endif %}
{% endif %}
Here are the files available for download:
<p>Here are the files available for download:</p>
<table>
<tr>
<th>File type</th>
@ -31,20 +33,36 @@ Here are the files available for download:
</tr>
{% for ebook in work.ebooks %}
<tr>
<td>{{ ebook.format.display }}</td>
<td>{{ ebook.rights.display }}</td>
<td>{{ ebook.get_format_display }}</td>
<td>{{ ebook.get_rights_display }}</td>
<td>{{ ebook.provider }}</td>
<td><a href="{{ ebook.url }}">{{ ebook.url|truncatechars:20 }}</a></td>
<td><a href="{{ ebook.url }}">{{ ebook.url|truncatechars:30 }}</a></td>
</tr>
{% endfor %}
</table>
<p>
{% if work.ebooks.0.rights == 'PD-US' %}
A public domain ebook belongs to all of us. You can do anything you like with it.
{% else %}
The Creative Commons licensing terms for allow you to redistribute the files under the the specified license terms. There's no DRM.
The Creative Commons licensing terms for the ebook allow you to redistribute the files under the specified license terms. There's no DRM.
{% endif %}
</p>
<p>
{% if work.last_campaign_status == 'SUCCESSFUL' %}
If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing.
{% else %}
If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble.
{% endif %}
</p>
<p>
Thanks,
</p>
<p>
Your Tireless Unglue.it Staff
</p>
</div>
</div>
</div>

View File

@ -129,4 +129,5 @@ UNGLUEIT_TEST_PASSWORD = None
# decide which of the period tasks to add to the schedule
#CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB

View File

@ -121,4 +121,6 @@ IS_PREVIEW = False
# decide which of the period tasks to add to the schedule
#CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB
CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB

View File

@ -122,3 +122,4 @@ STATIC_ROOT = '/var/www/static'
# decide which of the period tasks to add to the schedule
#CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB