diff --git a/.gitignore b/.gitignore index b9fcb214..4a693c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,4 @@ logs/* celerybeat.pid celerybeat-schedule .gitignore~ -static/scss/*.css static/scss/*.css.map diff --git a/README.md b/README.md index 6a7c4be1..5eaf79d2 100644 --- a/README.md +++ b/README.md @@ -41,11 +41,13 @@ to install python-setuptools in step 1: 1. `django-admin.py celeryd --loglevel=INFO` start the celery daemon to perform asynchronous tasks like adding related editions, and display logging information in the foreground. 1. `django-admin.py celerybeat -l INFO` to start the celerybeat daemon to handle scheduled tasks. 1. `django-admin.py runserver 0.0.0.0:8000` (you can change the port number from the default value of 8000) +1. make sure a [redis server](https://redis.io/topics/quickstart) is running 1. Point your browser to http://localhost:8000/ CSS development -1. We are using Less version 2.8 for CSS. http://incident57.com/less/. We use minified CSS. +1. We used Less version 2.8 for CSS. http://incident57.com/less/. We use minified CSS. +1. New CSS development is using SCSS. Install libsass and django-compressor. Production Deployment --------------------- diff --git a/api/onix.py b/api/onix.py index 8b84c1fc..6506f936 100644 --- a/api/onix.py +++ b/api/onix.py @@ -42,7 +42,7 @@ def header(facet=None): header_node = etree.Element("Header") sender_node = etree.Element("Sender") sender_node.append(text_node("SenderName", "unglue.it")) - sender_node.append(text_node("EmailAddress", "support@gluejar.com")) + sender_node.append(text_node("EmailAddress", "unglueit@ebookfoundation.org")) header_node.append(sender_node) header_node.append(text_node("SentDateTime", pytz.utc.localize(datetime.datetime.utcnow()).strftime('%Y%m%dT%H%M%SZ'))) header_node.append(text_node("MessageNote", facet.title if facet else "Unglue.it Editions")) diff --git a/api/templates/api_help.html b/api/templates/api_help.html index 02e4ba62..97fd8239 100644 --- a/api/templates/api_help.html +++ b/api/templates/api_help.html @@ -76,6 +76,20 @@ XML: OPDS feeds. You don't need a key to use them. The starting point is {{base_url}}{% url 'opds' %}

+

+ Examples: +

+
filtered by format
+
{{base_url}}{% url 'opds_acqusition' 'epub' %}
+
filtered by license
+
{{base_url}}{% url 'opds_acqusition' 'by-sa' %}
+
filtered by title search
+
{{base_url}}{% url 'opds_acqusition' 's.open' %}
+
filtered by keyword
+
{{base_url}}{% url 'opds_acqusition' 'kw.fiction' %}
+
filtered by ungluer
+
{{base_url}}{% url 'opds_acqusition' '@eric' %}
+

There's also an OPDS record available for every work on unglue.it. For example, requesting, {{base_url}}{% url 'opds_acqusition' 'all'%}?work=13950 get you to the web page or opds record for A Christmas Carol.

ONIX Catalog Feeds

diff --git a/api/templates/widget.html b/api/templates/widget.html index 47499823..657da237 100644 --- a/api/templates/widget.html +++ b/api/templates/widget.html @@ -1,9 +1,9 @@ - +{% load sass_tags %} unglue.it: {{work.title}} - - + + - - + + @@ -83,21 +84,30 @@ Please fix the following before launching your campaign:
- {% ifequal work.last_campaign.type 1 %} + {% if work.last_campaign.type == 1 %} {{ work.last_campaign.supporters_count }} Ungluers have pledged ${{ work.last_campaign.current_total|intcomma }} {% else %} Total revenue: ${{ work.last_campaign.current_total|intcomma }} from {{ work.last_campaign.supporters_count }} Ungluers and {{ work.last_campaign.anon_count }} others - {% endifequal %} + {% endif %}
+ {% if campaign.charitable %} +
+ This campaign is eligible for charitable donation support. +
+ {% elif campaign.type == 1 %} +
+ If you believe your campaign meets the criteria for charitable donation support, use the feedback form to request a review by Free Ebook Foundation staff. +
+ {% endif %}
- {% ifequal campaign_status 'INITIALIZED' %} + {% if campaign_status == 'INITIALIZED' %} Preview Your Campaign {% else %} See Your Campaign - {% endifequal %} + {% endif %}
@@ -105,7 +115,7 @@ Please fix the following before launching your campaign:
@@ -117,35 +127,30 @@ Please fix the following before launching your campaign: {% csrf_token %} {{ form.media }}

Edit the editions (if needed)

- {% if campaign.rh.can_sell %} {% if campaign.work.ebookfiles.0 %}

You have uploaded ebook files for this work.

{% else %} - {% ifequal work.last_campaign.type 2 %} + {% if work.last_campaign.type == 2 %}

To sell ebooks as part of a buy to unglue campaign, you will need to upload an EPUB file for the ebook you want to sell.

- {% endifequal %} - {% ifequal work.last_campaign.type 3 %} + {% elif work.last_campaign.type == 3 %}

To distribute ebooks as part of a thanks for ungluing campaign, you will need to upload the ebook files to unglue.it.

- {% endifequal %} + {% endif %} {% endif %} - {% endif %}

Please choose the edition that most closely matches the edition to be unglued. This is the edition whose cover image will display on your book's page. Your unglued edition should be identical to this edition if possible; you should note any differences under Rights Details below.

{{ form.edition.errors }} {% for edition in campaign.work.editions.all %}
-

Edition {{ edition.id }}: +

Edition {{ edition.id }}:

{% with managing='True' %}{% include "edition_display.html" %}{% endwith %} @@ -159,7 +164,7 @@ Please fix the following before launching your campaign: {% endif %} {% if campaign.work.epubfiles.0 %} {% for ebf in campaign.work.epubfiles %} -

{% if ebf.active %}ACTIVE {% elif ebf.ebook.active %} MIRROR {% endif %}EPUB file: {{ebf.file}}
created {{ebf.created}} for edition {{ebf.edition_id}} {% if ebf.asking %}(This file has had the campaign 'ask' added.){% endif %}
{% if ebf.active %}{% ifequal action 'mademobi' %}A MOBI file is being generated. (Takes a minute or two.) {% else %}You can generate a MOBI file. {% endifequal %}{% endif %}

+

{% if ebf.active %}ACTIVE {% elif ebf.ebook.active %} MIRROR {% endif %}EPUB file: {{ebf.file}}
created {{ebf.created}} for edition {{ebf.edition_id}} {% if ebf.asking %}(This file has had the campaign 'ask' added.){% endif %}
{% if ebf.active %}{% if action == 'mademobi' %}A MOBI file is being generated. (Takes a minute or two.) {% else %}You can generate a MOBI file. {% endif %}{% endif %}

{% endfor %} {% if campaign.work.test_acqs.0 %}
-{% ifequal campaign.type 1 %} +{% if campaign.type == 1 %}

Premiums

{% csrf_token %} @@ -417,13 +415,14 @@ Please fix the following before launching your campaign:

A few things to keep in mind:

    +
  • For tax status reasons, premiums are not currently available to supporters who use donations instead of pledges.
  • Are your premiums cumulative? That is, if you have a $10 and a $25 premium, does the $25 pledger get everything that the $10 pledger gets also? Either cumulative or not-cumulative is fine, but make sure you've communicated clearly
  • Adding new premiums during your campaign is a great way to build momentum. If you do, make sure to leave a comment in the Comments tab of your campaign page to tell supporters (it will be automatically emailed to them). Some of them may want to change (hopefully increase) their pledge to take advantage of it.
  • Also make sure to think about how your new premiums interact with old ones. If you add a new premium at $10, will people who have already pledged $25 be automatically eligible for it or not? Again, you can choose whatever you want; just be sure to communicate clearly.

Acknowledgements

-

Your ungluers will also automatically receive the following acknowledgements:

+

Your ungluers (including thos who use donations, will also automatically receive the following acknowledgements:

  • Any amount — The unglued ebook
  • $25 and above — Their name in the acknowledgements section under "supporters"
  • @@ -431,8 +430,7 @@ Please fix the following before launching your campaign:
  • $100 and above — Their name, profile link, & a dedication under "bibliophiles"

Your premium values may be any amounts -- you do not need to offer premiums at $25/$50/$100. For example, if you offer a $30 premium, anyone pledging to it will be eligible for the $25 reward. This will be communicated to them during the pledging process; you do not need to explain it in your pitch.

-{% endifequal %} -{% ifequal campaign.type 2 %} +{% elif campaign.type == 2 %}

Offers to sell

{% if not campaign.work.ebookfiles.0 %}

An EPUB file for this work needs to be loaded!

@@ -455,8 +453,7 @@ Please fix the following before launching your campaign:

{% endfor %}

-{% endifequal %} -{% ifequal campaign.type 3 %} +{% elif campaign.type == 3 %}

Suggested Contributions

{% if not campaign.work.ebooks.0 %}

ebook files for this work need to be loaded!

@@ -476,10 +473,10 @@ Please fix the following before launching your campaign: {% endfor %}

When a contribution>$1 is made by a library, the library's verified users on unglue.it are not asked to make another contribution.

-{% endifequal %} +{% endif %} -{% ifequal campaign_status 'INITIALIZED' %} +{% if campaign_status == 'INITIALIZED' %}
{% if campaign.launchable %}

Before you hit launch:

@@ -494,47 +491,45 @@ Please fix the following before launching your campaign: {% else %} - {% ifequal campaign.type 1 %} + {% if campaign.type == 1 %}

Please make sure you've selected your campaign's edition and entered its description, funding goal, deadline, premiums, and previewed your campaign, before launching.

- {% endifequal %} - {% ifequal campaign.type 2 %} + {% elif campaign.type == 2 %}

Please make sure you've selected your campaign's edition and entered its description, funding goal, initial ungluing date, prices, and previewed your campaign, before launching.

Buy To Unglue campaigns can't be launched until ebook files have been loaded and pricing has been set and made active

- {% endifequal %} - {% ifequal campaign.type 3 %} + {% elif campaign.type == 3 %}

Please make sure you've selected your campaign's edition and entered its description and previewed your campaign, before launching.

Thanks for Ungluing campaigns can't be launched until ebook files have been loaded and a suggested contribution has been set

- {% endifequal %} + {% endif %} {% endif %}
-{% endifequal %} +{% endif %}
{% if campaign_status == 'ACTIVE' or campaign_status == 'SUCCESSFUL' %} {% if campaign_status == 'ACTIVE' %} -

Your campaign is now active! Hooray!

+

Your campaign is now active! Hooray!

-

What to do next

- +

What to do next

+ {% endif %} -{% ifequal campaign.type 1 %} -

Acknowledgements

-

When you're logged in, the "Ungluers" tab on the campaign page will tell you a bit about each ungluer- when they last pledged, for example, and you can send individual messages to each ungluer. Use this tool with care! You can see who your biggest supporters are by looking at the sample acknowledgement page. -After your campaign succeeds, you can used this page to generate epub code for the acknowledgements section of your unglued ebook. -

+{% if campaign.type == 1 %} +

Acknowledgements

+

When you're logged in, the "Ungluers" tab on the campaign page will tell you a bit about each ungluer- when they last pledged, for example, and you can send individual messages to each ungluer. Use this tool with care! You can see who your biggest supporters are by looking at the sample acknowledgement page. + After your campaign succeeds, you can used this page to generate epub code for the acknowledgements section of your unglued ebook. +

{% else %} -{% comment %}This might be a good place to put a sales report. {% endcomment %} -{% endifequal %} + {% comment %}This might be a good place to put a sales report. {% endcomment %} +{% endif %} {% endif %}
diff --git a/frontend/templates/ml_status.html b/frontend/templates/ml_status.html index b208030a..54f77539 100644 --- a/frontend/templates/ml_status.html +++ b/frontend/templates/ml_status.html @@ -5,7 +5,7 @@ You are subscribed to the Unglue.it Newsletter. It comes roughly twice a month. {% else %} -You are NOT subscribed to the Unglue.it Newsletter. It comes roughly twice a month. If you have just become an ungluer, your list invitation should be on its way. Put "gluenews@gluejar.com" in your contact list to make sure you get it.
+You are NOT subscribed to the Unglue.it Newsletter. It comes roughly twice a month. If you have just become an ungluer, your list invitation should be on its way. Put "unglueit@ebookfoundation.org" in your contact list to make sure you get it.
{% csrf_token %} diff --git a/frontend/templates/notification/account_active/full.txt b/frontend/templates/notification/account_active/full.txt index ad02521d..a88b5eba 100644 --- a/frontend/templates/notification/account_active/full.txt +++ b/frontend/templates/notification/account_active/full.txt @@ -1,7 +1,7 @@ {% load humanize %} As you requested, we've updated your account with the payment method you provided. -If you have any questions, we are happy to help. Simply email us at support@gluejar.com. +If you have any questions, we are happy to help. Simply email us at unglueit@ebookfoundation.org. {% if user.profile.account %} The current card we have on file: diff --git a/frontend/templates/notification/account_expired/full.txt b/frontend/templates/notification/account_expired/full.txt index 81466b24..b25da308 100644 --- a/frontend/templates/notification/account_expired/full.txt +++ b/frontend/templates/notification/account_expired/full.txt @@ -3,7 +3,7 @@ We want to let you know that your {{ user.profile.account.card_type }} card endi When you receive your new card, simply go to https://{{ site.domain }}{% url 'manage_account' %} to enter your card information. Thank you! -If you have any questions, we are happy to help. Simply email us at support@gluejar.com. +If you have any questions, we are happy to help. Simply email us at unglueit@ebookfoundation.org. {% if user.profile.account %} The current card we have on file: diff --git a/frontend/templates/notification/account_expiring/full.txt b/frontend/templates/notification/account_expiring/full.txt index 8e5afd17..55801ac4 100644 --- a/frontend/templates/notification/account_expiring/full.txt +++ b/frontend/templates/notification/account_expiring/full.txt @@ -3,7 +3,7 @@ We want to give you advance notice that your {{ user.profile.account.card_type } When you receive your new card, simply go to https://{{ site.domain }}{% url 'manage_account' %} to enter your card information. Thank you! -If you have any questions, we are happy to help. Simply email us at support@gluejar.com. +If you have any questions, we are happy to help. Simply email us at unglueit@ebookfoundation.org. {% if user.profile.account %} The current card we have on file: diff --git a/frontend/templates/notification/donation/notice.html b/frontend/templates/notification/donation/notice.html index 24d83cb2..298e5071 100644 --- a/frontend/templates/notification/donation/notice.html +++ b/frontend/templates/notification/donation/notice.html @@ -7,7 +7,7 @@ {% endblock %} {% block comments_graphical %} -{% ifequal transaction.host 'credit' %} +{% if transaction.host == 'credit' %} Your Unglue.it transaction has completed and ${{transaction.max_amount|floatformat:2|intcomma}} has been deducted from your Unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %} @@ -19,7 +19,7 @@ {% else %} Your Unglue.it credit card transaction has completed and your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}. {% endif %} -{% endifequal %} +{% endif %} {% endblock %} {% block comments_textual %} diff --git a/frontend/templates/notification/notice_settings.html b/frontend/templates/notification/notice_settings.html index 10350d86..2b4c79e3 100644 --- a/frontend/templates/notification/notice_settings.html +++ b/frontend/templates/notification/notice_settings.html @@ -1,12 +1,13 @@ {% extends 'notification/base.html' %} - {% load i18n %} +{% load sass_tags %} {% load truncatechars %} + {% block title %}{% trans "Notification Settings" %}{% endblock %} {% block extra_css %} - + {% endblock %} {% block extra_js %} diff --git a/frontend/templates/notification/pledge_charged/full.txt b/frontend/templates/notification/pledge_charged/full.txt index 5d4ce7fd..e260064c 100644 --- a/frontend/templates/notification/pledge_charged/full.txt +++ b/frontend/templates/notification/pledge_charged/full.txt @@ -1,4 +1,19 @@ -{% load humanize %}An Ungluing! +{% load humanize %}{% if transaction.donation %}{% ifequal transaction.host 'credit' %}Your Unglue.it transaction has completed and ${{transaction.max_amount|default:"0"}} has been deducted from your Unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %}{% if transaction.max_amount > transaction.amount %}Your transaction for ${{transaction.max_amount|default:"0"}} has completed. Your credit card has been charged ${{transaction.amount}} and the rest has been deducted from your unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %}Your Unglue.it credit card transaction has completed and your credit card has been charged ${{ transaction.amount|default:"0" }}. {% endif %}{% endifequal %} + +Your donation of ${{transaction.max_amount|default:"0"}} to the Free Ebook Foundation will support our effort to release {{ transaction.campaign.work.title }} to the world in an unglued ebook edition. We'll email you if the campaign succeeds, and when the ebook is available for download. If you'd like to visit the campaign page, click here: +https://{{ current_site.domain }}{% url 'work' transaction.campaign.work_id %} + +In case the campaign for {{ transaction.campaign.work.title }} does not succeed, we'll use your donation in support of other ungluing campaigns which qualify for charitable support. + +The Free Ebook Foundation is a US 501(c)3 non-profit organization. Our tax ID number is 61-1767266. Your gift is tax deductible to the full extent provided by the law. + +For more information about the Free Ebook Foundation, visit https://ebookfoundation.org/ + +Thank you again for your generous support. + +{{ transaction.campaign.rightsholder }} and the Unglue.it team + +{% else %}An Ungluing! Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. Your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}. @@ -13,4 +28,4 @@ https://{{ current_site.domain }}{% url 'work' transaction.campaign.work_id %} Thank you again for your support. {{ transaction.campaign.rightsholder }} and the Unglue.it team - +{% endif %} diff --git a/frontend/templates/notification/pledge_charged/notice.html b/frontend/templates/notification/pledge_charged/notice.html index 7f623b8e..e225eb47 100644 --- a/frontend/templates/notification/pledge_charged/notice.html +++ b/frontend/templates/notification/pledge_charged/notice.html @@ -7,10 +7,37 @@ {% endblock %} {% block comments_graphical %} - Hooray! The campaign for {{ transaction.campaign.work.title }} has succeeded. Your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}. Thank you again for your help. +{% if transaction.donation %} +{% if transaction.host == 'credit' %} + Your Unglue.it transaction has completed and ${{transaction.max_amount|floatformat:2|intcomma}} has been deducted from your Unglue.it credit balance. + You have ${{transaction.user.credit.available|default:"0"}} of credit left. +{% elif transaction.max_amount > transaction.amount %} + Your transaction for ${{transaction.max_amount|floatformat:2|intcomma}} has completed. + Your credit card has been charged ${{transaction.amount}} and the + rest has been deducted from your unglue.it credit balance. + You have ${{transaction.user.credit.available|intcomma}} of credit left. +{% else %} + Your Unglue.it credit card transaction has completed and your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}. +{% endif %} +{% else %} Hooray! The campaign for {{ transaction.campaign.work.title }} has succeeded. Your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}. Thank you again for your help. +{% endif %} {% endblock %} {% block comments_textual %} +{% if transaction.donation %} +

Your donation of ${{transaction.max_amount|default:"0"}} to the Free Ebook Foundation will support our effort to release {{ transaction.campaign.work.title }} to the world in an unglued ebook edition. We'll email you if the campaign succeeds, and when the ebook is available for download. If you'd like to visit the campaign page, click here.

+ +

In case the campaign for {{ transaction.campaign.work.title }} does not succeed, we'll use your donation in support of other ungluing campaigns which qualify for charitable support.

+ +

The Free Ebook Foundation is a US 501(c)3 non-profit organization. Our tax ID number is 61-1767266. Your gift is tax deductible to the full extent provided by the law.

+ +

For more information about the Free Ebook Foundation, visit https://ebookfoundation.org/

+ +

Thank you again for your generous support.

+ +

{{ transaction.campaign.rightsholder }} and the Unglue.it team

+ +{% else %}

Congratulations!

Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} has been charged to your credit card.

@@ -28,4 +55,5 @@

{{ transaction.campaign.rightsholder }} and the Unglue.it team

+{% endif %} {% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/pledge_charged/short.txt b/frontend/templates/notification/pledge_charged/short.txt index f4cf9fe6..72436257 100644 --- a/frontend/templates/notification/pledge_charged/short.txt +++ b/frontend/templates/notification/pledge_charged/short.txt @@ -1 +1 @@ -Your pledge to the campaign to unglue {{transaction.campaign.work.title}} has been charged. \ No newline at end of file +Your {% if transaction.donation %}donation{% else %}pledge{% endif %} for the campaign to unglue {{transaction.campaign.work.title}} has been charged. \ No newline at end of file diff --git a/frontend/templates/notification/pledge_you_have_pledged/full.txt b/frontend/templates/notification/pledge_you_have_pledged/full.txt index b5be79bc..1540f91a 100644 --- a/frontend/templates/notification/pledge_you_have_pledged/full.txt +++ b/frontend/templates/notification/pledge_you_have_pledged/full.txt @@ -17,7 +17,7 @@ Or the best idea: talk about it with those you love. We'll need lots of help fr If you want to change your pledge, just use the button at https://{{ current_site.domain }}{% url 'work' transaction.campaign.work_id %} -If you have any problems with your pledge, don't hesitate to contact us at support@gluejar.com +If you have any problems with your pledge, don't hesitate to contact us at unglueit@ebookfoundation.org Thanks for being part of Unglue.it. diff --git a/frontend/templates/notification/purchase_notgot_gift/full.txt b/frontend/templates/notification/purchase_notgot_gift/full.txt index 6813dd45..fdcbc1ae 100644 --- a/frontend/templates/notification/purchase_notgot_gift/full.txt +++ b/frontend/templates/notification/purchase_notgot_gift/full.txt @@ -14,7 +14,7 @@ You can send the link yourself to make sure that it gets to the right place. You can also "regift" the ebook to a different email address. To do so, FIRST log in to the {{ gift.giver }} account on Unglue.it, and then click on https://{{ current_site.domain }}{% url 'receive_gift' gift.acq.nonce %} -If you have any problems or questions, don't hesitate to contact Unglue.it support at support@gluejar.com +If you have any problems or questions, don't hesitate to contact Unglue.it support at unglueit@ebookfoundation.org the Unglue.it team diff --git a/frontend/templates/notification/rights_holder_accepted/full.txt b/frontend/templates/notification/rights_holder_accepted/full.txt new file mode 100644 index 00000000..9f3f679e --- /dev/null +++ b/frontend/templates/notification/rights_holder_accepted/full.txt @@ -0,0 +1,14 @@ +The Rights Holder Agreement, reproduced in plain text below, for {{ rights_holder.rights_holder_name }} has been accepted and is now an official Unglue.it rights holder. + +Here's what to do next: Find on Unglue.it. On the More... tab of the book page, you'll now see an option to claim the book. Once you've claimed the book, you can edit its metadata. + +If you can't find your books Unglue.it, that's okay. You can add your books to Unglue.it directly - use this link: https://unglue.it{% url 'rightsholders' %}#add_your_books + +Need help with any of this? Email us at rights@ebookfoundation.org and we'll do our best to help. + +The Unglue.it team + +################## +{{ agreement }} +################## +{{ signature }} \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_accepted/notice.html b/frontend/templates/notification/rights_holder_accepted/notice.html new file mode 100644 index 00000000..0a4a534b --- /dev/null +++ b/frontend/templates/notification/rights_holder_accepted/notice.html @@ -0,0 +1,4 @@ +{% extends "notification/notice_template.html" %} +{% block comments_textual %} + You are now an approved rights holder on Unglue.it. For your next step, find your works in our database and claim them or add them directly. +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_accepted/short.txt b/frontend/templates/notification/rights_holder_accepted/short.txt new file mode 100644 index 00000000..b38a1274 --- /dev/null +++ b/frontend/templates/notification/rights_holder_accepted/short.txt @@ -0,0 +1 @@ +You're now an accepted rights holder on Unglue.it. \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_claim/full.txt b/frontend/templates/notification/rights_holder_claim/full.txt index 507b12bd..a8cb20a3 100644 --- a/frontend/templates/notification/rights_holder_claim/full.txt +++ b/frontend/templates/notification/rights_holder_claim/full.txt @@ -3,7 +3,7 @@ You are now free to start a campaign to sell or unglue your work. If you're logged in, you will see the option to open a campaign at https://{{ current_site.domain }}/rightsholders . (You can also find this page by clicking on "Rights Holder Tools" at the bottom of any Unglue.it page.) -To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's page (https://{{ current_site.domain }}{% url 'work' claim.work_id %}). Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@gluejar.com) if you need any help with this. +To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's page (https://{{ current_site.domain }}{% url 'work' claim.work_id %}). Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@ebookfoundation.org) if you need any help with this. If you're running a Buy-to-Unglue or Thanks-for-Ungluing Campaign, now is the time to upload your digital files. For Buy-to-Unglue, you need to decide on revenue targets and pricing for individual and library licenses. @@ -11,13 +11,12 @@ If you're running a Pledge Campaign, you need to decide on a funding target, and Finally, think about how you're going to publicize your campaign: social media, newsletters, media contacts, professional organizations, et cetera. Have a plan for how to reach out to these potential supporters before you launch your campaign. Your supporters' sense of connection with you and your book is key to your campaign's success. Again, email us if you'd like help. -We're thrilled to be working with you. {% endifequal %} {% ifequal claim.status 'pending' %} -{{ claim.rights_holder }}'s claim to {{ claim.work.title }} (https://{{ current_site.domain }}{% url 'work' claim.work_id %}) on Unglue.it has been entered. Our team will examine the claim and get back to you soon. +{{ claim.rights_holder }}'s claim to {{ claim.work.title }} (https://{{ current_site.domain }}{% url 'work' claim.work_id %}) on Unglue.it has been entered. {% endifequal %} {% ifequal claim.status 'release' %} -{{ claim.rights_holder }}'s claim to {{ claim.work.title }} (https://{{ current_site.domain }}{% url 'work' claim.work_id %}) on Unglue.it has been released. email us (rights@gluejar.com) if you have any questions about this. +{{ claim.rights_holder }}'s claim to {{ claim.work.title }} (https://{{ current_site.domain }}{% url 'work' claim.work_id %}) on Unglue.it has been released. email us (rights@ebookfoundation.org) if you have any questions about this. {% endifequal %} The Unglue.it team \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_claim/notice.html b/frontend/templates/notification/rights_holder_claim/notice.html index 340844ee..c7bcf024 100644 --- a/frontend/templates/notification/rights_holder_claim/notice.html +++ b/frontend/templates/notification/rights_holder_claim/notice.html @@ -17,7 +17,7 @@

You are now free to start a campaign to sell or unglue your work. If you're logged in, you can open a campaign. (You can also find this page by clicking on "Rights Holder Tools" at the bottom of any Unglue.it page.)

-To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's work page. Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@gluejar.com) if you need any help with this. +To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's work page. Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@ebookfoundation.org) if you need any help with this.

If you're running a Buy-to-Unglue or Thanks-for-Ungluing Campaign, now is the time to upload your digital files. For Buy-to-Unglue, you need to decide on revenue targets and pricing for individual and library licenses.

@@ -25,12 +25,11 @@ If you're running a Pledge Campaign, you need to decide on a funding target, and

Finally, think about how you're going to publicize your campaign: social media, newsletters, media contacts, professional organizations, et cetera. Have a plan for how to reach out to these potential supporters before you launch your campaign. Your supporters' sense of connection with you and your book is key to your campaign's success. Again, email us if you'd like help. -We're thrilled to be working with you. {% endifequal %} {% ifequal claim.status 'pending' %} The claim for {{ claim.work.title }} will be examined, and we'll email you. Contact us if you need any help. {% endifequal %} {% ifequal claim.status 'release' %} - The claim for {{ claim.work.title }} has been released. Contact us at rights@gluejar.com if you have questions. + The claim for {{ claim.work.title }} has been released. Contact us at rights@ebookfoundation.org if you have questions. {% endifequal %} {% endblock %} diff --git a/frontend/templates/notification/rights_holder_created/full.txt b/frontend/templates/notification/rights_holder_created/full.txt index 50db688e..9c2516b0 100644 --- a/frontend/templates/notification/rights_holder_created/full.txt +++ b/frontend/templates/notification/rights_holder_created/full.txt @@ -1,11 +1,20 @@ -Your Platform Services Agreement has been accepted and you're now an official Unglue.it rights holder. +Your Rights Holder Agreement for {{ rights_holder.rights_holder_name }} has been received and Unglue.it staff is reviewing it. -Here's what to do next. Find your book(s) on Unglue.it. On the More... tab of the book page, you'll now see an option to claim the book. Do this. We'll follow up. Once we've approved your claim, you'll be able to run campaigns for the book. +Here's the information we received - we'll use this to verify that you really exist and can be relied upon to fulfill your obligations. Once we've reviewed and approved the agreement, you'll receive by email a digitally signed copy for your reference. -If your book isn't listed in Google Books (which powers our search), you won't be able to find it at Unglue.it. That's okay. You can submit your books for inclusion in Google's search results: https://books.google.com/googlebooks/publishers.html . We can also create a custom page for you; just notify us. +Rights Holder: {{ rights_holder.rights_holder_name }} +Unglue.it Username for Rights Holder: {{ rights_holder.owner.username }} +Business Address: +{{ rights_holder.address }} +Mailing Address: +{{ rights_holder.mailing }} +Tel: {{ rights_holder.telephone }} +Email: {{ rights_holder.email }} +Signer Name: {{ rights_holder.signer }} +Signer Title: {{ rights_holder.signer_title }} +Signature: {{ rights_holder.signature }} -You can also start thinking ahead about what you'd like your campaigns to look like and how you'd like to publicize them. Some good things to brainstorm: your campaign pitch; any photos or video you can include; compelling premiums you might be able to offer; what you want your target to be and how long you think your campaign should last; and how to share your campaign with your social networks (online and off) and media contacts. -Need help with any of this? We'd be delighted. Email us at rights@gluejar.com. We're thrilled to be working with you. +Need help with any of this? Email us at rights@ebookfoundation.org. The Unglue.it team \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_created/notice.html b/frontend/templates/notification/rights_holder_created/notice.html index 82ac0d44..ec3f99eb 100644 --- a/frontend/templates/notification/rights_holder_created/notice.html +++ b/frontend/templates/notification/rights_holder_created/notice.html @@ -1,4 +1,4 @@ {% extends "notification/notice_template.html" %} {% block comments_textual %} - You are now an approved rights holder on Unglue.it. For your next step, find your works in our database and claim them (under the More... tab). See your email for more details. + The Unglue.it rights holder agreement for {{ rights_holder.rights_holder_name }} has been received. Unglue.it staff will use the information you've supplied to verify that you really exist and can be relied upon to fulfill your obligations. Once we've reviewed and approved the agreement, you'll receive by email a digitally signed copy for your reference. {% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/rights_holder_created/short.txt b/frontend/templates/notification/rights_holder_created/short.txt index f570a67c..9a06815b 100644 --- a/frontend/templates/notification/rights_holder_created/short.txt +++ b/frontend/templates/notification/rights_holder_created/short.txt @@ -1 +1 @@ -You're now a confirmed rights holder on Unglue.it. \ No newline at end of file +Your Unglue.it rights holder agreement has been received. \ No newline at end of file diff --git a/frontend/templates/notification/wishlist_successful/full.txt b/frontend/templates/notification/wishlist_successful/full.txt index 7d466908..19676618 100644 --- a/frontend/templates/notification/wishlist_successful/full.txt +++ b/frontend/templates/notification/wishlist_successful/full.txt @@ -1,4 +1,4 @@ -{% if pledged %}You pledged toward it{% else %}You put it on your list{% endif %}, and now the campaign for {{ campaign.work.title}} (https://{{current_site.domain}}{% url 'work' campaign.work_id %}) has succeeded. +{% if pledged %}You supported it{% else %}You put it on your list{% endif %}, and now the campaign for {{ campaign.work.title}} (https://{{current_site.domain}}{% url 'work' campaign.work_id %}) has succeeded. {% ifequal campaign.type 1 %} You will notified when an Unglued ebook edition is available, within 90 days. {% if pledged %} diff --git a/frontend/templates/notification/wishlist_unglued_book_released/full.txt b/frontend/templates/notification/wishlist_unglued_book_released/full.txt index af503a51..50a7e925 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/full.txt +++ b/frontend/templates/notification/wishlist_unglued_book_released/full.txt @@ -24,9 +24,9 @@ The Creative Commons licensing terms for {{ work.title }} allow you to redistrib {% 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. +If you have any problems with this unglued ebook, please don't hesitate to let us know at unglueit@ebookfoundation.org. 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. +If you have any problems with these ebook files, please don't hesitate to let us know at unglueit@ebookfoundation.org. 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, diff --git a/frontend/templates/notification/wishlist_unsuccessful/full.txt b/frontend/templates/notification/wishlist_unsuccessful/full.txt index cc0c7733..ef7872c6 100644 --- a/frontend/templates/notification/wishlist_unsuccessful/full.txt +++ b/frontend/templates/notification/wishlist_unsuccessful/full.txt @@ -2,9 +2,7 @@ Alas. The campaign to unglue {{ campaign.work.title }} (https://{{current_site. If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. -Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}. - -There are also other books with active campaigns that need your help: https://unglue.it/campaigns/ending . +If you donated in support of this work, your donation will be used to support other campaigns that qualify for charitable support. Thank you for your support. diff --git a/frontend/templates/notification/wishlist_unsuccessful/notice.html b/frontend/templates/notification/wishlist_unsuccessful/notice.html index 2498cdce..3616b220 100644 --- a/frontend/templates/notification/wishlist_unsuccessful/notice.html +++ b/frontend/templates/notification/wishlist_unsuccessful/notice.html @@ -10,11 +10,7 @@ {% endblock %} {% block comments_textual %} - If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. - - Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your faves and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}. - - There are also other books with active campaigns that need your help. - + If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. If you donated in support of this work, your donation will be used to support other campaigns that qualify for charitable support. + Thank you for your support. {% endblock %} \ No newline at end of file diff --git a/frontend/templates/pdf/ask.html b/frontend/templates/pdf/ask.html index 0d15d2af..0daf8f47 100644 --- a/frontend/templates/pdf/ask.html +++ b/frontend/templates/pdf/ask.html @@ -25,10 +25,6 @@