Merge branch 'master' of github.com:Gluejar/regluit

core/signals.py

@@ -220,7 +220,7 @@ def handle_wishlist_added(supporter, work, **kwargs):
     """send notification to confirmed rights holder when someone wishes for their work"""
     claim = work.claim.filter(status="active")
     if claim:
-        notification.queue([claim.user], "new_wisher", {
+        notification.queue([claim[0].user], "new_wisher", {
             'supporter': supporter,
             'work': work
         }, True)

frontend/templates/base.html

@@ -99,8 +99,8 @@
         </div>
     </div>
 
-<div class="preview">
-Amazon has forced us to suspend crowdfunding. The <a href="http://wp.me/p2omBl-3B">full story is on our blog</a>! The <a href="/work/81724/">first unglued book</a> is almost ready.
+<div class="launch_top">
+It's here: our first unglued edition.  You can now <a href="/work/81724/download/" class="hijax">download <I>Oral Literature in Africa</I></a>.
 </div>
     {% block topsection %}{% endblock %}
     {% block content %}{% endblock %}

frontend/templates/download.html

@@ -22,6 +22,8 @@
                 {% with ebook.url as url %}
                     <a href="{{ url }}"><img src="{{ ebook.rights_badge }}"></a>
                     <a href="{{ url }}">{{ ebook.format }}</a>
+                    {% ifequal ebook.format 'mobi' %} (use for Kindle){% endifequal %}
+                    {% ifequal ebook.format 'epub' %} (use for Nook, Apple, Sony){% endifequal %}
                     {% if not forloop.last %}<br /><br />{% endif %}
                 {% endwith %}
             {% endfor %}		
@@ -35,19 +37,19 @@
         {% else %}
             <h4>Freely available editions</h4>
         {% endif %}
-        {% for edition in other_ebooks %}
-            <div class="ebook_download">
-                {% with edition.url as url %}
-                    <a href="{{ url }}"><img src="{{ edition.rights_badge }}"></a>
-                    <a href="{{ url }}">{{ edition.format }}</a>
+            {% for ebook in other_ebooks %}
+                {% with ebook.url as url %}
+                    <a href="{{ url }}"><img src="{{ ebook.rights_badge }}"></a>
+                    <a href="{{ url }}">{{ ebook.format }}</a>
+                    {% ifequal ebook.format 'mobi' %} (use for Kindle){% endifequal %}
+                    {% ifequal ebook.format 'epub' %} (use for Nook, Apple, Sony){% endifequal %}
                     {% if not forloop.last %}<br /><br />{% endif %}
                 {% endwith %}
-            </div>
-        {% endfor %}
+            {% endfor %}		
     </div>
     {% endif %}
 </div>
-{% if unglued_ebook or other_ebooks %}
+{% 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>

frontend/templates/work.html

@@ -15,7 +15,6 @@
 <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/hijax.js"></script>
 
 <script>
 var $j = jQuery.noConflict();

static/css/campaign.css

@@ -220,6 +220,7 @@ ul.tabs li.active a {
 }
 .book-detail-info > div.layout div.btn_support {
   float: right;
+  margin-top: 9px;
 }
 .book-detail-info > div.layout div.btn_support input {
   font-size: 15px;

static/css/manage_campaign.css

@@ -220,6 +220,7 @@ ul.tabs li.active a {
 }
 .book-detail-info > div.layout div.btn_support {
   float: right;
+  margin-top: 9px;
 }
 .book-detail-info > div.layout div.btn_support input {
   font-size: 15px;

static/css/sitewide.css

@@ -314,7 +314,7 @@ a.success:hover {
   clear: both;
   padding: 5px 10px;
   font-size: 13px;
-  line-height: 17px;
+  width: 90%;
 }
 .preview a {
   color: #8dc63f;
@@ -330,9 +330,8 @@ a.success:hover {
   clear: both;
   padding: 5px 10px;
   font-size: 13px;
-  line-height: 17px;
-  border-color: #8dc63f;
   width: 90%;
+  border-color: #8dc63f;
   margin: 10px auto 0 auto;
   font-size: 120%;
 }
@@ -353,7 +352,7 @@ a.success:hover {
   clear: both;
   padding: 5px 10px;
   font-size: 13px;
-  line-height: 17px;
+  width: 90%;
   width: 80%;
   margin: 10px auto;
 }

static/less/book_detail.less

@@ -62,6 +62,7 @@
 		
 		div.btn_support {
 			float: right;
+			margin-top: 9px;
 			
 			input {
 				font-size: @font-size-larger;

static/less/sitewide.less

@@ -10,9 +10,8 @@
     clear:both;
     padding: 5px 10px;
     font-size: @font-size-default;
+	width: 90%;
 
-    line-height: 17px;
-    
     a {
     	color: @call-to-action;
     }
@@ -21,7 +20,6 @@
 .launch_top {
 	.preview;
 	border-color: @green;
-	width: 90%;
     margin:10px auto 0 auto;
     font-size: 120%;