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

show beg always with an offer id; auto set the price for libraries

pull/1/head
eric 2014-02-20 16:53:30 -05:00
parent c7abcb357b
commit e8dc4121fa
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/templates/book_panel.html
View File

@ -48,7 +48,7 @@
<b>UNGLUED!</b>
{% ifequal work.last_campaign.type 3 %}
<p><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b> of thanks</p>
<p> by <b>{{ work.last_campaign.supporters_count }}</b> ungluers</p>
<p> from <b>{{ work.last_campaign.supporters_count }}</b> ungluers</p>
<p> and <b>{{ work.last_campaign.anon_count }}</b> others</p>
{% else %}
<p><b>On:</b> {{ deadline|date:"M d, Y" }}</p>

23
frontend/templates/work.html
View File

@ -710,17 +710,18 @@
<span class="menu-item-desc">You're welcome!</span>
</li>
{% else %}
<li class="first">
<a href="{% url thank work_id %}?offer_id={{work.last_campaign.individual_offer.id}}">
<span class="menu-item-price">${{ work.last_campaign.individual_offer.price|floatformat:0|intcomma }}</span>
<span class="menu-item-desc">{{ work.last_campaign.individual_offer.get_thanks_display }}</span>
</a>
</li>
<li class="last">
<a href="{% url thank work_id %}?offer_id={{work.last_campaign.library_offer.id}}">
<span class="menu-item-price">${{ work.last_campaign.library_offer.price|floatformat:0|intcomma }}</span>
<span class="menu-item-desc">{{ work.last_campaign.library_offer.get_thanks_display }}</span>
</a>
<li class="first last">
{% if request.user.library %}
<a href="{% url thank work_id %}?offer_id={{work.last_campaign.library_offer.id}}">
<span class="menu-item-price">${{ work.last_campaign.library_offer.price|floatformat:0|intcomma }}</span>
<span class="menu-item-desc">{{ work.last_campaign.library_offer.get_thanks_display }}</span>
</a>
{% else %}
<a href="{% url thank work_id %}?offer_id={{work.last_campaign.individual_offer.id}}">
<span class="menu-item-price">${{ work.last_campaign.individual_offer.price|floatformat:0|intcomma }}</span>
<span class="menu-item-desc">{{ work.last_campaign.individual_offer.get_thanks_display }}</span>
</a>
{% endif %}
</li>
{% endif %}
</ul>

2
frontend/views.py
View File

@ -2612,7 +2612,7 @@ class DownloadView(PurchaseView):
if not self.campaign or self.campaign.type != THANKS:
return False
elif self.user_license and self.user_license.thanked:
return False
return self.request.REQUEST.has_key('offer_id')
else:
return True