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

Merge branch 'master' into t4u_download

pull/1/head
eric 2014-02-21 13:18:04 -05:00
parent e66c54e3dc 7cf5d81b55
commit 92e870d2b7
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests.py
View File

@ -318,8 +318,8 @@ class BookLoaderTests(TestCase):
def test_ebook(self):
edition = bookloader.add_by_oclc('1246014')
# we've seen the public domain status of this book fluctuate. So if the ebook count is 2 then test
if edition.ebooks.count() == 2:
# we've seen the public domain status of this book fluctuate -- and the OCLC number can disappear. So if the ebook count is 2 then test
if edition is not None and edition.ebooks.count() == 2:
#self.assertEqual(edition.ebooks.count(), 2)
#ebook_epub = edition.ebooks.all()[0]
ebook_epub = edition.ebooks.filter(format='epub')[0]

2
frontend/templates/faq.html
View File

@ -559,7 +559,7 @@ Need more ideas? We're happy to work with rights holders personally to craft a
<h4>Funding</h4>
<dl>
<dt>What parameters are required for a campaign? </dt>
<dd>For a Pledge Campaign, you'll need to set funding goal and deadline. For a Buy-to-Unglue Campaign, you'll need a revenue goal and an initial effective date for the Creative Commons Licence. You'll also need to set prices for each type of license you plan to offer. For a Thanks-for-Ingluing campaign, you just need to decide on a suggested contribution.</dd>
<dd>For a Pledge Campaign, you'll need to set funding goal and deadline. For a Buy-to-Unglue Campaign, you'll need a revenue goal and an initial effective date for the Creative Commons License. You'll also need to set prices for each type of license you plan to offer. For a Thanks-for-Ingluing campaign, you just need to decide on a suggested contribution.</dd>
<dt>Can I change my funding/revenue goal?</dt>
<dd>While a campaign is in progress you may lower, but not raise, your funding or revenue goal.</dd>

2
frontend/templates/faq_t4u.html
View File

@ -23,7 +23,7 @@
<dt>Why should libraries support Thanks-for-Ungluing books?</dt>
<dd>Libraries that participate in Thanks-for-Ungluing campaigns make these books more accessible to their users. In addition:
<ol>
<li>Libraries receive proof of conveyance letters that can be used as evidence that the rights holder has conveyed the Creative Commons Licence. Unglue.it is carful to validate the rights claims of the participating creators.
<li>Libraries receive proof of conveyance letters that can be used as evidence that the rights holder has conveyed the Creative Commons License. Unglue.it is carful to validate the rights claims of the participating creators.
</li>
<li>Unglue.it users that have joined a library participating in unglue.it are never asked for contributions if their library has already done so.
</li>

2
frontend/templates/libraries.html
View File

@ -33,7 +33,7 @@ We’ve added "Buy-to-Unglue" campaigns to so that libraries can lend ebooks on
<dd>Starting an account, for yourself or your library, is free. Use it to help us distribute unglued and ungluing ebooks. </dd>
<dt>Become an Unglue.it participating library</dt>
<dd><ol><li><a href="{% url library_create %}">Make your library page</a> on Unglue.it. It takes just a few minutes. It's the first step towards becoming an Unglue.it participating library.</li>
<li>Review our <a href="https://www.docracy.com/0_uyw26qv9c/unglue-it-library-license-agreement">LIBRARY LICENCE AGREEMENT</a>. </li>
<li>Review our <a href="https://www.docracy.com/0_uyw26qv9c/unglue-it-library-license-agreement">LIBRARY LICENSE AGREEMENT</a>. </li>
<li>Once an agreement has been signed, we'll "approve" your library; you and your patrons can then buy Library Licenses for any ebook with a Buy-to-Unglue campaign. You can lend these ebooks to your patrons immediately using our free distribution platform.
The library license gives download access to one library member at a time for 14 days each, in multiple formats, from our platform or yours, if you have one. </li>
<li>Log in as the library, and add unglued and ungluing books to your library list. Buy licenses to our buy-to-unglue titles. </li>

7
settings/jenkins.py
View File

@ -84,10 +84,11 @@ GOODREADS_API_KEY = 'w8nsFplG3HFOeOLQ7rqfQ'
GOODREADS_API_SECRET = '8Dfl7nQ28VgzJctlVwf8m7zkPaWns4j79t0G9iFxbk'
# Amazon keys to permit S3 access
# s3_jenkins
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
AWS_ACCESS_KEY_ID = 'AKIAIRLBDIET3DFCNU4A'
AWS_SECRET_ACCESS_KEY = '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'
AWS_STORAGE_BUCKET_NAME = 'unglueit_files'
AWS_ACCESS_KEY_ID = 'AKIAJQGL74HQPHPFYJ5Q'
AWS_SECRET_ACCESS_KEY = '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'
AWS_STORAGE_BUCKET_NAME = 'jenkins-unglueit'
# use database as queuing service in development

2
settings/just.py
View File

@ -158,7 +158,7 @@ MAINTENANCE_MODE = False
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
AWS_ACCESS_KEY_ID = 'AKIAIYP6XRVAUWKQFT5Q'
AWS_SECRET_ACCESS_KEY = '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'
AWS_STORAGE_BUCKET_NAME = 'just_unglueit'
AWS_STORAGE_BUCKET_NAME = 'just-unglueit'
# if settings/local.py exists, import those settings -- allows for dynamic generation of parameters such as DATABASES
try:

2
settings/prod.py
View File

@ -155,7 +155,7 @@ MAINTENANCE_MODE = False
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
AWS_ACCESS_KEY_ID = 'AKIAIRLBDIET3DFCNU4A'
AWS_SECRET_ACCESS_KEY = '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'
AWS_STORAGE_BUCKET_NAME = 'unglueit_files'
AWS_STORAGE_BUCKET_NAME = 'unglueit-files'
# we should suppress Google Analytics outside of production
SHOW_GOOGLE_ANALYTICS = True