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

core/models.py

@@ -48,8 +48,8 @@ class CeleryTask(models.Model):
         
 class Claim(models.Model):
     STATUSES = ((
-        u'active', u'Claim has been registered and approved.'),
-        (u'pending', u'Claim is pending approval.'),
+        u'active', u'Claim has been accepted.'),
+        (u'pending', u'Claim is pending acceptance.'),
         (u'release', u'Claim has not been accepted.'),
     )
     created =  models.DateTimeField(auto_now_add=True)  

frontend/templates/book_panel.html

@@ -132,7 +132,7 @@
     	{% else %}{% ifequal status "INITIALIZED" %}
         <span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
 		{% else %}
-        <span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text"></span>
+        <span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">{{ status }}</span>
         {% endifequal %}{% endifequal %}
     </div>
     <div class="listview panelfront side1 icons">

frontend/templates/campaign_detail.html

@@ -36,7 +36,7 @@
     <form method="POST" action="{% url campaign_by_id pk=campaign.id %}"  onsubmit="test()">
         {% csrf_token %}
        {{form.as_p}}
-       <input type="submit" value="Pledge" id="pledgeBtn"/>
+       <input type="submit" value="Pledge" id="pledgeBtn" />
     </form>
     
     <!-- All associated transactions -->

frontend/templates/goodreads_display.html

@@ -101,7 +101,7 @@
         <p>Here are some of your books that you've put on your Goodreads shelves:</p>
         <ul id="id">
         {% for review in reviews|slice:":50" %}
-            <li><img src="{{review.book.small_image_url}}"/><a href="{{review.book.link}}">{{review.book.title}}</a></li>
+            <li><img src="{{review.book.small_image_url}}" /><a href="{{review.book.link}}">{{review.book.title}}</a></li>
         {% endfor %}
         </ul>
     {% endif %}

frontend/templates/librarything.html

@@ -13,7 +13,7 @@
     {% if books %}
     <ul>
     {% for book in books|slice:":50" %}
-      <li>{% if lt_api_key %}<img src="http://covers.librarything.com/devkey/{{lt_api_key}}/small/isbn/{{book.isbn}}"/>{% endif %}<img src="http://covers.openlibrary.org/b/isbn/{{book.isbn}}-S.jpg" />{{book.title.title}} | ISBN:{{book.isbn}} | Work ID:{{book.work_id}} | Book ID:{{book.book_id}}</li>
+      <li>{% if lt_api_key %}<img src="http://covers.librarything.com/devkey/{{lt_api_key}}/small/isbn/{{book.isbn}}" />{% endif %}<img src="http://covers.openlibrary.org/b/isbn/{{book.isbn}}-S.jpg" />{{book.title.title}} | ISBN:{{book.isbn}} | Work ID:{{book.work_id}} | Book ID:{{book.book_id}}</li>
     {% endfor %}
     </ul>
     {% endif %}

frontend/templates/notification/active_campaign/notice.html

@@ -1,7 +1,7 @@
 {% with campaign.work.id as id %}
 <div class="comments clearfix">
 	<div class="comments_book">
-    	<a href="{% url work id %}"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
+    	<a href="{% url work id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
 	</div>
 	
 	<div class="comments_info">

frontend/templates/notification/coment_on_commented/notice.html

@@ -3,7 +3,7 @@
 
 <div class="comments clearfix">
 	<div class="comments_book">
-    	<a href="{% url work id %}?tab=2"><img src="{{ comment.content_object.cover_image_thumbnail }}" alt="cover image for {{ comment.content_object.title }}" /></a>
+    	<a href="{% url work id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
 	</div>
 	
 	<div class="comments_info">

frontend/templates/notification/wishlist_comment/notice.html

@@ -3,7 +3,7 @@
 
 <div class="comments clearfix">
 	<div class="comments_book">
-    	<a href="{% url work id %}?tab=2"><img src="{{ comment.content_object.cover_image_thumbnail }}" alt="cover image for {{ comment.content_object.title }}" /></a>
+    	<a href="{% url work id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
 	</div>
 	
 	<div class="comments_info">

frontend/templates/pledge.html

@@ -73,7 +73,7 @@
             	{% endfor %}
          	</ul>
 
-	       <input type="submit" value="Pledge" id="pledgesubmit"/>    
+	       <input type="submit" value="Pledge" id="pledgesubmit" />    
     	</form>
     </div>
 

frontend/templates/pledge_modify.html

@@ -90,7 +90,7 @@
             	{% endfor %}
          	</ul>
 
-	       <input type="submit" value="Modify Pledge" id="pledgesubmit"/>    
+	       <input type="submit" value="Modify Pledge" id="pledgesubmit" />    
     	</form>
     </div>
 

frontend/templates/registration/password_reset_form.html

@@ -8,7 +8,7 @@ instructions for creating your new password.
 </p>
 <form method='post' action=''>{% csrf_token %}
 <p>
-        <input id="id_email" type="hidden" name="email" maxlength="75" value="{{request.user.email}}"/>
+        <input id="id_email" type="hidden" name="email" maxlength="75" value="{{request.user.email}}" />
     <input type='submit' value="Reset password" /></td></tr>
 </p>
 </form>

frontend/templates/work.html

@@ -101,9 +101,9 @@ $j(document).ready(function(){
 					      </div>
                           {% if status == 'ACTIVE' %}
                           {% if pledged %}
-                          	<div class="btn_support modify"><form action="{% url pledge_modify work_id=work.id %}" method="get"><input type="submit" value="Change Pledge"/></form></div>
+                          	<div class="btn_support modify"><form action="{% url pledge_modify work_id=work.id %}" method="get"><input type="submit" value="Change Pledge" /></form></div>
                           {% else %}
-                          	<div class="btn_support"><form action="{% url pledge work_id=work.id %}" method="get"><input type="submit" value="Support"/></form></div>
+                          	<div class="btn_support"><form action="{% url pledge work_id=work.id %}" method="get"><input type="submit" value="Support" /></form></div>
                           {% endif %}
                           {% endif %}
 					  </div>
@@ -246,13 +246,13 @@ $j(document).ready(function(){
  
                         <h4> Rights Information </h4>
                         {% if claimstatus == 'one_active' %}
-                          <p>This work has been claimed by {{ rights_holder_name }}.  The claim has been registered and approved by Unglue.It staff.</p>
+                          <p>This work has been claimed by {{ rights_holder_name }}.</p>
                         {% else %}
                           {% if claimstatus == 'disputed' %}
                             <p>Rights claims are pending.</p>
                           {% else %}
                             {% if claimstatus == 'one_pending' %}
-                              <p>This work has been claimed by {{ rights_holder_name }}.  The claim is being verified by Unglue.It staff.</p>                              
+                              <p>A claim for this work by {{ rights_holder_name }} is pending.</p>                              
                             {% else %}
                         	  {% if request.user.rights_holder.all.count %}
 	                        	Is this work yours?  Claim it: <br /><br />