Merge branch 'master' into simpler_download

core/tests.py

@@ -698,7 +698,7 @@ class DownloadPageTest(TestCase):
         
         anon_client = Client()
         response = anon_client.get("/work/%s/download/" % w.id, follow=True)
-        self.assertContains(response, "/download_ebook/%s/"% eb1.id, count=4) #the extra is readmill
+        self.assertContains(response, "/download_ebook/%s/"% eb1.id, count=3) # no extra now, readmill not for google books?
         self.assertContains(response, "/download_ebook/%s/"% eb2.id, count=3)
 
 

frontend/templates/campaign_list.html

@@ -76,7 +76,7 @@ location.hash = "#2";
                 </div>
                 <div id="content-block-content">
                     {% ifequal campaign_list.count 0 %}
-                    There aren't any {{ pub_lang|ez_lang_name }} ungluing campaigns active yet.  If you're an author, publisher, or other rights holder, you can <a href="/faq/rightsholders">start one</a>.
+                    There aren't any {{ pub_lang|ez_lang_name }} ungluing campaigns active right now.  If you're an author, publisher, or other rights holder, you can <a href="/faq/rightsholders">start one</a>.
                     {% else %}
                     {% lazy_paginate 20 campaign_list using "campaign_list" %}
 

frontend/views.py

@@ -2441,7 +2441,8 @@ def download(request, work_id):
     
     try:
         readmill_epub_ebook = work.ebooks().filter(format='epub').exclude(provider='Google Books')[0]
-        readmill_epub_url = settings.BASE_URL_SECURE + reverse('download_ebook',args=[readmill_epub_ebook.id])
+        #readmill_epub_url = settings.BASE_URL_SECURE + reverse('download_ebook',args=[readmill_epub_ebook.id])
+        readmill_epub_url = readmill_epub_ebook.url
     except:
         readmill_epub_url = None
     agent = request.META['HTTP_USER_AGENT']