From 0de46d0bb607c6255991263375196104cc9e6bd2 Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Tue, 18 Sep 2012 13:35:14 -0400
Subject: [PATCH 1/5] DRM-free logo

---
 frontend/templates/download.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/templates/download.html b/frontend/templates/download.html
index e8b6506b..861d7dc1 100644
--- a/frontend/templates/download.html
+++ b/frontend/templates/download.html
@@ -51,8 +51,8 @@
 </div>
 {% if unglued_ebooks or other_ebooks %}
     <div class="border">
-        <h3>How to download</h3>
-        <p>Ebooks you find at Unglue.it may be read on any device, and you're welcome to convert them to whatever electronic format is most useful to you.  While we can't cover every possible combination of readers, software, and formats you might use, here's some help for the most common cases.</p>
+        <a href="http://www.defectivebydesign.org/drm-free" style="float:right;"><img src="https://static.fsf.org/dbd/DRM-free/DRM-free150.png" alt="DefectiveByDesign.org" width="150" height="150" border="0" align="middle" /></a><h3>How to download</h3>
+        <p style="float:left" >Ebooks you find at Unglue.it may be read on any device, and you're welcome to convert them to whatever electronic format is most useful to you.  While we can't cover every possible combination of readers, software, and formats you might use, here's some help for the most common cases.</p>
         
         <h4>Any device</h4>
         <p>You may already have an app which reads our ebook formats.  If so, when you download the file, you will be given an option to open the file using that app.  You're done!</p>
@@ -114,9 +114,11 @@
         <p>Need help with something not listed here?  Email us at <a href="mailto:support@gluejar.com?Subject=Ebook%20downloading%20help">support@gluejar.com</a>.</p>
     </div>
 {% else %}
-    <p id="content-block">There are no freely available downloads of <I>{{ work.title }}</I> right now.  {% if not work in request.user.wishlist.works.all %}Would you like there to be? <a class="add-wishlist"><span class="work_id" id="w{{ work.id }}">Add this book to your wishlist.</span></a>{% else %}Ask your friends to add it to their wishlists!{% endif %}</p>
-    
-    <p>If you know of a Creative-Commons-licensed or US public domain edition of this book, you can add it through the <a href="{% url work work.id %}?tab=4">Rights tab of the book page</a>.</p>
+    <div class="border">
+        <p id="content-block">There are no freely available downloads of <I>{{ work.title }}</I> right now.  {% if not work in request.user.wishlist.works.all %}Would you like there to be? <a class="add-wishlist"><span class="work_id" id="w{{ work.id }}">Add this book to your wishlist.</span></a>{% else %}Ask your friends to add it to their wishlists!{% endif %}</p>
+        
+        <p>If you know of a Creative-Commons-licensed or US public domain edition of this book, you can add it through the <a href="{% url work work.id %}?tab=4">Rights tab of the book page</a>.</p>
+    </div>
 {% endif %}
 </div>
 </div>

From f581dd354b2b398175e262a548283c88520379e4 Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Tue, 18 Sep 2012 13:40:52 -0400
Subject: [PATCH 2/5] readmill support

---
 frontend/templates/download.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/templates/download.html b/frontend/templates/download.html
index 861d7dc1..b5b57f58 100644
--- a/frontend/templates/download.html
+++ b/frontend/templates/download.html
@@ -52,13 +52,25 @@
 {% if unglued_ebooks or other_ebooks %}
     <div class="border">
         <a href="http://www.defectivebydesign.org/drm-free" style="float:right;"><img src="https://static.fsf.org/dbd/DRM-free/DRM-free150.png" alt="DefectiveByDesign.org" width="150" height="150" border="0" align="middle" /></a><h3>How to download</h3>
-        <p style="float:left" >Ebooks you find at Unglue.it may be read on any device, and you're welcome to convert them to whatever electronic format is most useful to you.  While we can't cover every possible combination of readers, software, and formats you might use, here's some help for the most common cases.</p>
+        <p>Ebooks you find at Unglue.it may be read on any device, and you're welcome to convert them to whatever electronic format is most useful to you.  While we can't cover every possible combination of readers, software, and formats you might use, here's some help for the most common cases.</p>
         
         <h4>Any device</h4>
         <p>You may already have an app which reads our ebook formats.  If so, when you download the file, you will be given an option to open the file using that app.  You're done!</p>
         
         <p>If this doesn't work, use the instructions below for your device.</p>
         
+        <h4>Readmill users</h4>
+        <p>If you're a <a href="http://readmill.com/">Readmill</a> member, you can send unglued ebooks to your iPad with one click.  Here you go:</p>
+        <div class="send-to-readmill" data-download-url="http://archive.org/download/OralLiteratureInAfrica/Oral_Literature_in_Africa.epub"; data-buy-url="https://unglue.it/work/81834/"; data-display="small" ></div>
+
+        <script type="text/javascript">
+        (function() {
+          var st = document.createElement('script'); st.type = 'text/javascript'; st.async = true;
+          st.src = 'https://platform.readmill.com/send.js';
+          var p = document.getElementsByTagName('script')[0]; p.parentNode.insertBefore(st, p);
+        })();
+        </script>
+        
         <h4>Android devices</h4>
         <p class="ebook_download logo"><img src="/static/images/aldiko_logo.png">Aldiko</p>
         

From efa3187535e8dc03924c32028bc96c5ef858e29b Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Wed, 19 Sep 2012 10:25:23 -0400
Subject: [PATCH 3/5] dynamically generate the readmill download url don't
 hardcode it you moron

---
 frontend/templates/download.html | 2 +-
 frontend/views.py                | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/templates/download.html b/frontend/templates/download.html
index b5b57f58..518b3b38 100644
--- a/frontend/templates/download.html
+++ b/frontend/templates/download.html
@@ -61,7 +61,7 @@
         
         <h4>Readmill users</h4>
         <p>If you're a <a href="http://readmill.com/">Readmill</a> member, you can send unglued ebooks to your iPad with one click.  Here you go:</p>
-        <div class="send-to-readmill" data-download-url="http://archive.org/download/OralLiteratureInAfrica/Oral_Literature_in_Africa.epub"; data-buy-url="https://unglue.it/work/81834/"; data-display="small" ></div>
+        <div class="send-to-readmill" data-download-url="{{ unglued_epub_url }}"; data-buy-url="{{ base_url }}{% url work work.id %}"; data-display="small" ></div>
 
         <script type="text/javascript">
         (function() {
diff --git a/frontend/views.py b/frontend/views.py
index 5cdb3580..4fec2b4b 100755
--- a/frontend/views.py
+++ b/frontend/views.py
@@ -2065,10 +2065,13 @@ def download(request, work_id):
 
     unglued_ebooks = work.ebooks().filter(edition__unglued=True)
     other_ebooks = work.ebooks().filter(edition__unglued=False)
+    unglued_epub_url = unglued_ebooks.filter(format='epub')[0].url
 
     context.update({
         'unglued_ebooks': unglued_ebooks,
-        'other_ebooks': other_ebooks
+        'other_ebooks': other_ebooks,
+        'unglued_epub_url': unglued_epub_url,
+        'base_url': settings.BASE_URL
     })
     
     return render(request, "download.html", context)

From 5419c869ed3114434ace9f6c528f786dabe44315 Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Wed, 19 Sep 2012 12:08:27 -0400
Subject: [PATCH 4/5] now the readmill script works on the lightbox too

---
 frontend/templates/download.html | 12 ++----------
 frontend/templates/work.html     |  4 ++--
 static/js/hijax.js               |  4 ++++
 static/js/readmill.js            |  5 +++++
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 static/js/readmill.js

diff --git a/frontend/templates/download.html b/frontend/templates/download.html
index 518b3b38..923050ce 100644
--- a/frontend/templates/download.html
+++ b/frontend/templates/download.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block extra_js %}
-<script type="text/javascript" src="/static/js/wishlist.js"></script>
+<script type="text/javascript" src="/static/js/readmill.js"></script>
 {% endblock %}
 
 {% block content %}
@@ -61,16 +61,8 @@
         
         <h4>Readmill users</h4>
         <p>If you're a <a href="http://readmill.com/">Readmill</a> member, you can send unglued ebooks to your iPad with one click.  Here you go:</p>
-        <div class="send-to-readmill" data-download-url="{{ unglued_epub_url }}"; data-buy-url="{{ base_url }}{% url work work.id %}"; data-display="small" ></div>
+        <div class="send-to-readmill" data-download-url="{{ unglued_epub_url }}"; data-buy-url="{{ base_url }}{% url work work.id %}"; data-display="small" onload="/static/js/readmill.js"></div>
 
-        <script type="text/javascript">
-        (function() {
-          var st = document.createElement('script'); st.type = 'text/javascript'; st.async = true;
-          st.src = 'https://platform.readmill.com/send.js';
-          var p = document.getElementsByTagName('script')[0]; p.parentNode.insertBefore(st, p);
-        })();
-        </script>
-        
         <h4>Android devices</h4>
         <p class="ebook_download logo"><img src="/static/images/aldiko_logo.png">Aldiko</p>
         
diff --git a/frontend/templates/work.html b/frontend/templates/work.html
index 36b1f1e2..9b1ae1d3 100644
--- a/frontend/templates/work.html
+++ b/frontend/templates/work.html
@@ -7,14 +7,14 @@
 <link type="text/css" rel="stylesheet" href="/static/css/campaign.css"  />
 {% endblock %}
 
-{% block base_js %}
-<script type="text/javascript" src="{{ jquery_home }}"></script>
+{% block extra_js %}
 <script type="text/javascript" src="{{ jquery_ui_home }}"></script>
 <script type="text/javascript" src="/static/js/wishlist.js"></script>
 <script type="text/javascript" src="/static/js/tabs4.js"></script>
 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
 <script type="text/javascript" src="/static/js/counter.js"></script>
 <script type="text/javascript" src="/static/js/embed.js"></script>
+<script type="text/javascript" src="/static/js/readmill.js"></script>
 
 <script>
 var $j = jQuery.noConflict();
diff --git a/static/js/hijax.js b/static/js/hijax.js
index f108e5cd..d97922aa 100644
--- a/static/js/hijax.js
+++ b/static/js/hijax.js
@@ -8,6 +8,10 @@ $j(document).ready(function() {
         event.preventDefault();
 		$j("#lightbox").load( $j(this).attr("href") + " #lightbox_content");
 		
+		if ($j(this).attr("href").substr(-9,8) == "download") {
+		    jQuery.getScript('/static/js/readmill.js');
+		}
+		
 		// fade-out rest of page elements on expand
 		$j('#js-topsection').css({"opacity": "0.07"});
 		$j('.launch_top').css({"opacity": "0.07"});
diff --git a/static/js/readmill.js b/static/js/readmill.js
new file mode 100644
index 00000000..a3e3a764
--- /dev/null
+++ b/static/js/readmill.js
@@ -0,0 +1,5 @@
+(function() {
+  var st = document.createElement('script'); st.type = 'text/javascript'; st.async = true;
+  st.src = 'https://platform.readmill.com/send.js';
+  var p = document.getElementsByTagName('script')[0]; p.parentNode.insertBefore(st, p);
+})();
\ No newline at end of file

From 756c1da430dfff21310a7f1383543088609ffe3c Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Wed, 19 Sep 2012 12:37:37 -0400
Subject: [PATCH 5/5] download page test needs to cover readmill addition and
 new unglued flag handling

---
 core/tests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/tests.py b/core/tests.py
index 99e78a5c..cd64f31a 100755
--- a/core/tests.py
+++ b/core/tests.py
@@ -615,6 +615,7 @@ class DownloadPageTest(TestCase):
 
         e1 = models.Edition()
         e1.work = w
+        e1.unglued = True
         e2 = models.Edition()
         e2.work = w
         e1.save()
@@ -623,7 +624,7 @@ class DownloadPageTest(TestCase):
         eb1 = models.Ebook()
         eb1.url = "http://example.com"
         eb1.edition = e1
-        eb1.unglued = True
+        eb1.format = 'epub'
         
         eb2 = models.Ebook()
         eb2.url = "http://example2.com"
@@ -634,5 +635,5 @@ class DownloadPageTest(TestCase):
         
         anon_client = Client()
         response = anon_client.get("/work/%s/download/" % w.id)
-        self.assertContains(response, "http://example.com", count=2)
+        self.assertContains(response, "http://example.com", count=3)
         self.assertContains(response, "http://example2.com", count=2)
\ No newline at end of file