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

pull/1/head
Raymond Yee 2012-07-16 11:56:13 -07:00
commit ba6762e781
34 changed files with 425 additions and 531 deletions

View File

@ -5,13 +5,15 @@ from django.contrib.auth.models import User
from regluit.core.models import Work
def other_users(user, how_many):
# do something more sophisitcated sometime later
count = User.objects.all().count()
# do something more sophisticated later?
# limit to candidates with nonempty wishlists
candidates = User.objects.filter(wishlist__wishes__gte=1).distinct()
count = candidates.count()
if count <= how_many :
user_list = User.objects.all()[0: count]
user_list = candidates[0: count]
else :
slice = random.random() * (count - how_many)
user_list = User.objects.all()[slice: slice+how_many]
user_list = candidates[slice: slice+how_many]
return user_list
def supporting_users(work, how_many):

View File

@ -17,7 +17,7 @@
<li><a href="{% url comment %}"><span>Latest Comments</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Most Wished</span></a></li>
<li><a href="{% url work_list 'new' %}"><span>Newly Wished</span></a></li>
<li><a href="{% url work_list 'recommended' %}"><span>Staff Picks</span></a></li>
<li><a href="{% url work_list 'recommended' %}"><span>Noteworthy</span></a></li>
<li class="last"><a href="{% url unglued_list 'recent' %}"><span>Ready to Read</span></a></li>
</ul>
</li>

View File

@ -1,22 +1,13 @@
{% with comment.content_object.id as id %}
{% with comment.user as user %}
{% extends "notification/notice_template.html" %}
<div class="comments clearfix">
{% block comments_book %}
<a href="{% url work comment.content_object.id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
{% endblock %}
<div class="comments_info clearfix">
<div class="comments_book">
<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_graphical">
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a>.</span>
</div>
</div>
{% block comments_graphical %}
<span><a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>.</span>
{% endblock %}
<div class="comments_textual">
{% block comments_textual %}
{{ comment.comment|linebreaksbr }}
</div>
</div>
{% endwith %}
{% endwith %}
{% endblock %}

View File

@ -1,41 +1,44 @@
{% comment %}
Note: this is NOT intended to render notices
django-notification {% with %} play poorly together. Don't use {% with %}
in child templates.
This is a model to use as a base for notice.html templates.
Copy/paste from here to your desired notice.html and fill in the specific content.
Using this template will allow notices.css to apply to all notices for a uniform style.
You can include notification/sharing_block.html into a notice.html to have
tweet, FB, email sharing show up. Include a {% url work your.local.work.id as work_url %} immediately prior.
{% endcomment %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
{% block comments_book %}
{% comment %}
Your cover image goes here. e.g.:
<a href="{% url work work.id %}"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
<a href="{{ work_url }}"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
modify as needed for your local context variables
{% endcomment %}
{% endblock %}
</div>
<div class="comments_graphical">
{% comment %}
<span class="comments_graphical">{% block comments_graphical %}{% comment %}
This is where you put your headline.
Brief text, graphics-oriented info like user avatars and campaign status icons.
e.g.:
<a href="{% url supporter supporter_username=user %}">
<a href="{{ supporter_url }}">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ comment.user.profile.pic_url }}" height="50" width="50" alt="Picture of {{ comment.user }}" title="{{ comment.user }}" />
{% else %}
<img class="user-avatar" src="/static/images/header/avatar.png" height="50" width="50" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
</a>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
{% endcomment %}
</div>
</div>
<div class="comments_textual">
<span><a href="{{ supporter_url }}">{{ comment.user.username }}</a> on <a href="{{ work_url }}?tab=2">{{ comment.content_object.title }}</a></span>{% endcomment %}{% endblock %}
<br /><i>{% now "M d Y, h:i A"%}</i><br />
</span>
<span class="comments_textual">
<hr />
{% block comments_textual %}
{% comment %}
This is where you put the textual part of your message.
Examples include the text of comments, details about credit card charges, etc.
{% endcomment %}
{% endblock %}
</span>
</div>
</div>

View File

@ -1,6 +1,6 @@
{% load humanize %}Congratulations!
Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} is charging your credit card.
Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will charge your credit card ${{ transaction.amount|intcomma }}.
Pledge Summary
Amount pledged: ${{ transaction.amount|intcomma }}
@ -8,7 +8,7 @@ Premium: {{ transaction.premium.description }}
We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ transaction.campaign.rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.
If you'd like to visit the project page, click here:
If you'd like to visit the campaign page, click here:
https://{{ site.domain }}{% url work transaction.campaign.work.id %}
Thank you again for your support.

View File

@ -1,39 +1,30 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
{% with transaction.campaign.work as work %}
{% with transaction.campaign.work.title as title %}
{% with transaction.campaign.rightsholder as rightsholder %}
{% with transaction.amount as amount %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work work.id %}"><img src="{{ work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Hooray! The campaign for {{ title }} has succeeded. Your credit card is being charged ${{ amount }}. Thank you again for your help.
</div>
</div>
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work transaction.campaign.work.id %}"><img src="{{ transaction.campaign.work.cover_image_small }}" alt="cover image for {{ transaction.campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Hooray! The campaign for <a href="{% url work transaction.campaign.work.id %}">{{ transaction.campaign.work.title }}</a> has succeeded. Your credit card is being charged ${{ transaction.amount }}. Thank you again for your help.
{% endblock %}
{% block comments_textual %}
<p>Congratulations!</p>
<p>Thanks to you and other ungluers, {{ title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will now charge your credit card.</p>
<p>Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} will now charge your credit card.</p>
<p>Pledge Summary :<br />
Amount pledged: {{ amount|intcomma }}<br />
<p><b>Pledge Summary</b><br />
Amount pledged: {{ transaction.amount|intcomma }}<br />
Premium: {{ transaction.premium.description }} <br />
</p>
<p>We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.
<p>We will notify you when the unglued ebook is available for you to read. If you've requested special premiums, the rights holder, {{ transaction.campaign.rightsholder }}, will be in touch with you via email to request any information needed to deliver your premium.
</p>
<p>For more information, visit the visit the <a href="{% url work transaction.campaign.work.id %}">project page</a>.
<p>For more information, visit the visit the <a href="{% url work transaction.campaign.work.id %}">campaign page</a>.
</p>
<p>Thank you again for your support.
</p>
<p>{{ rightsholder }} and the Unglue.it team
<p>{{ transaction.campaign.rightsholder }} and the Unglue.it team
</p>
</div>
</div>
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endblock %}

View File

@ -10,7 +10,7 @@ Amount pledged: ${{ transaction.amount|intcomma }}
Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}{% endif %}
{% if transaction.host|lower == 'amazon' %}{% if up_or_down == 'increased' %}
You will also receive an email from Amazon confirming this.
You will also receive an email from Amazon confirming that you've canceled your original pledge and authorized this one.
{% else %}{% if up_or_down == 'decreased' %}
Your Amazon Payments account may still show an authorization to Unglue.it for the entire amount of your earlier pledge, but never fear -- if the campaign succeeds, we'll only charge you ${{ transaction.amount|intcomma }}.
{% endif %}{% endif %}{% else %}{% endif %}

View File

@ -1,24 +1,23 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
{% with transaction.campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work transaction.campaign.work.id %}"><img src="{{ transaction.campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Your pledge for the campaign to unglue {{ title }} has been {% if up_or_down == 'canceled'%}canceled{% else %}modified{% endif %}.
</div>
</div>
{% if up_or_down == 'canceled' %}<div class="comments_textual">
{% block comments_book %}
<a href="{% url work transaction.campaign.work.id %}"><img src="{{ transaction.campaign.work.cover_image_small }}" alt="cover image for {{ transaction.campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Your pledge for the campaign to unglue {{ transaction.campaign.work.title }} has been {% if up_or_down == 'canceled'%}canceled{% else %}modified{% endif %}.
{% endblock %}
{% block comments_textual %}
{% if up_or_down == 'canceled' %}
Your canceled pledge was as follows:<br />
Amount: ${{ transaction.amount|intcomma }}<br />
Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}<br />
</div>{% else %}<div class="comments_textual">
{% else %}
Your new pledge is as follows:<br />
Amount: ${{ transaction.amount|intcomma }}<br />
Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% else %}None requested{% endif %}<br />
Thank you for your continued support of {{ title }}.
</div>{% endif %}
</div>
{% endwith %}
Thank you for your continued support of {{ transaction.campaign.work.title }}.
{% endif %}
{% endblock %}

View File

@ -1,5 +1,5 @@
{% load humanize %}{% with transaction.campaign.work.title as title %}{% with site.domain as domain %}{% with transaction.campaign.work.id as work_id %}
Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ title }}. If this campaign successfully raises ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
{% load humanize %}
Thank you, {{ transaction.user.username }}! You have pledged to unglue {{ transaction.campaign.work.title }}. If this campaign successfully raises ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y" }}, this book will be released in an unglued ebook edition for all to enjoy.
Pledge summary
Amount pledged: ${{ transaction.amount|intcomma }}
@ -7,22 +7,19 @@ Premium: {% if transaction.premium %}{{ transaction.premium.description }}{% els
You can help even more by sharing this campaign with your friends.
Facebook: https://www.facebook.com/sharer.php?u=https://{{ domain }}{% url work work_id %}
Facebook: https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work transaction.campaign.work.id %}
Twitter: https://twitter.com/intent/tweet?url=https://{{ domain }}{% url work work_id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21"
Twitter: https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work transaction.campaign.work.id %}&text=I%27m%20ungluing%20{{ title|urlencode }}%20at%20%40unglueit.%20Join%20me%21"
You can also embed a widget for {{ title }} in your web site by copy/pasting the following:
<iframe src="https://{{ domain }}/api/widget/{{ transaction.campaign.work.first_isbn_13 }}/" width="152" height="325" frameborder="0"></iframe>
You can also embed a widget for {{ transaction.campaign.work.title }} in your web site by copy/pasting the following:
<iframe src="https://{{ site.domain }}/api/widget/{{ transaction.campaign.work.first_isbn_13 }}/" width="152" height="325" frameborder="0"></iframe>
Or the best idea: talk about it with those you love. We'll need lots of help from lots of people to make this a success.
If you want to change your pledge, just use the button at https://{{ domain }}{% url work work_id %}
If you want to change your pledge, just use the button at https://{{ site.domain }}{% url work transaction.campaign.work.id %}
If you have any problems with your pledge, don't hesitate to contact us at support@gluejar.com
Thanks for being part of Unglue.it.
{{ transaction.campaign.rightsholder }} (rights holder for {{ title }}) and the Unglue.it team
{% endwith %}
{% endwith %}
{% endwith %}
{{ transaction.campaign.rightsholder }} (rights holder for {{ transaction.campaign.work.title }}) and the Unglue.it team

View File

@ -1,28 +1,22 @@
{% load humanize %}{% with transaction.campaign.work.title as title %}{% with transaction.campaign.work.id as work_id %}{% with transaction.amount as amount %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work transaction.campaign.work.id %}?tab=2"><img src="{{ transaction.campaign.work.cover_image_thumbnail }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
You've just pledged ${{ amount|intcomma }} to <a href="{% url work work_id %}">{{ title }}</a>.
</div>
</div>
{% extends "notification/notice_template.html" %}
{% load humanize %}
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work transaction.campaign.work.id %}?tab=2"><img src="{{ transaction.campaign.work.cover_image_thumbnail }}" alt="cover image for {{ transaction.campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
You've just pledged ${{ transaction.amount|intcomma }} to <a href="{% url work transaction.campaign.work.id %}">{{ transaction.campaign.work.title }}</a>.
{% endblock %}
{% block comments_textual %}
<p>Thank you, {{ transaction.user.username }}!</p>
<p>You've just pledged ${{ amount|intcomma }} to <a href="{% url work work_id %}">{{ title }}</a>. If it reaches its goal of ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p>You've just pledged ${{ transaction.amount|intcomma }} to <a href="{% url work transaction.campaign.work.id %}">{{ transaction.campaign.work.title }}</a>. If it reaches its goal of ${{ transaction.campaign.target|intcomma }} by {{ transaction.campaign.deadline|date:"M d Y"}}, it will be unglued for all to enjoy.</p>
<p>You can help even more by sharing this campaign with your friends!</p>
<ul>
<a href="{% url emailshare 'pledge' %}?next={% url work work_id|urlencode:"" %}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work work_id|urlencode:"" %}&text=I%20just%20pledged%20to%20unglue%20{{ title|urlencode }}%20at%20%40unglueit.%20Will%20you%20join%20me%3F"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work work_id|urlencode:"" %}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul>
{% url work transaction.campaign.work.id as work_url %}
{% include "notification/sharing_block.html" %}
<p>Thanks for being part of Unglue.it.</p>
<p>The unglue.it team.</p>
</div>
</div>
{% endwith %}{% endwith %}{% endwith %}
{% endblock %}

View File

@ -1,14 +1,13 @@
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work claim.work.id %}"><img src="{{ claim.work.cover_image_small }}" alt="cover image for {{ claim.work.title }}" /></a>
</div>
<div class="comments_graphical">
Congratulations! Your claim to {{ claim.work.title }} has been approved.
</div>
</div>
{% extends "notification/notice_template.html" %}
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work claim.work.id %}"><img src="{{ claim.work.cover_image_small }}" alt="cover image for {{ claim.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Congratulations! Your claim to {{ claim.work.title }} has been approved.
{% endblock %}
{% block comments_textual %}
You are now free to run campaigns for this work. See your email for full details. Then get started on the <a href="/rightsholders/">rights holder tools page</a> (also available through a link at the bottom of every page). Contact us if you need any help.
</div>
</div>
{% endblock %}

View File

@ -1,5 +1,4 @@
<div class="comments clearfix">
<div class="comments_info clearfix">
{% extends "notification/notice_template.html" %}
{% block comments_textual %}
Congratulations! You are now an approved rights holder on Unglue.it. For your next step, find your works in our database and claim them (under the Rights tab). See your email for more details.
</div>
</div>
{% endblock %}

View File

@ -0,0 +1,6 @@
<ul>
<a href="{% url emailshare 'pledge' %}?next={{ work_url|urlencode:"" }}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{{ work_url|urlencode:"" }}&text=I%20just%20pledged%20to%20unglue%20{{ title|urlencode }}%20at%20%40unglueit.%20Will%20you%20join%20me%3F"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{{ work_url|urlencode:"" }}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul>

View File

@ -1,4 +1,4 @@
{% load humanize %}Congratulations, you wished for it, and now there is an active Campaign for {{ campaign.work.title }} to be unglued. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline }}, this book will be released under a Creative Commons license for everyone to enjoy.
{% load humanize %}Congratulations, you wished for it, and now there is an active Campaign for {{ campaign.work.title }} to be unglued. If ungluers like you pledge ${{ campaign.target|intcomma }} by {{ campaign.deadline }}, this book will be released under a Creative Commons license for everyone to enjoy.
You can help!

View File

@ -1,24 +1,15 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
{% with campaign.work.id as id %}
{% with campaign.work.title as title %}
<div class="comments clearfix">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
<span>The rights holder, {{ active_claim.rights_holder.rights_holder_name }}, has launched a campaign for <a href="{% url work id %}">{{ title }}</a>!</span>
</div>
</div>
{% block comments_graphical %}
<span>The rights holder, {{ campaign.rightsholder }}, has launched a campaign for <a href="{% url work campaign.work.id %}">{{ campaign.work.title }}</a>!</span>
{% endblock %}
<div class="comments_textual">
<div>Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d, Y" }}, <I>{{ title }}</i> will be released under a <a href="http://creativecommons.org">Creative Commons</a> license for all to enjoy.</div>
<div>You can help! <a href="{% url pledge work_id=id %}">Pledge</a> any amount, and use the sharing options on the <a href="{% url work id %}">campaign page</a> to tell your friends.</a></div>
</div>
</div>
{% endwith %}
{% endwith %}
{% block comments_textual %}
<div>Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target|intcomma }} by {{ campaign.deadline|date:"M d, Y" }}, <I>{{ campaign.work.title }}</i> will be released under a <a href="http://creativecommons.org">Creative Commons</a> license for all to enjoy.</div>
<div>You can help! <a href="{% url pledge campaign.work.id %}">Pledge</a> any amount, and use the sharing options on the <a href="{% url work campaign.work.id %}">campaign page</a> to tell your friends.</a></div>
{% endblock %}

View File

@ -1,20 +1,13 @@
{% with comment.content_object.id as id %}
{% with comment.user as user %}
{% extends "notification/notice_template.html" %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<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_graphical">
<a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a>
</div>
</div>
{% block comments_book %}
<a href="{% url work comment.content_object.id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
{% endblock %}
<div class="comments_textual">
{% block comments_graphical %}
<a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a> has made a comment on <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>
{% endblock %}
{% block comments_textual %}
{{ comment.comment|linebreaksbr }}
</div>
</div>
{% endwith %}
{% endwith %}
{% endblock %}

View File

@ -1,41 +1,5 @@
{% comment %}
Note: this is NOT intended to render notices
{% extends "notification/notice_template.html" %}
This is a model to use as a base for notice.html templates.
Copy/paste from here to your desired notice.html and fill in the specific content.
Using this template will allow notices.css to apply to all notices for a uniform style.
{% endcomment %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
{% comment %}
Your cover image goes here. e.g.:
<a href="{% url work work.id %}"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
modify as needed for your local context variables
Should possibly say something.
{% endcomment %}
</div>
<div class="comments_graphical">
{% comment %}
This is where you put your headline.
Brief text, graphics-oriented info like user avatars and campaign status icons.
e.g.:
<a href="{% url supporter supporter_username=user %}">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ comment.user.profile.pic_url }}" height="50" width="50" alt="Picture of {{ comment.user }}" title="{{ comment.user }}" />
{% else %}
<img class="user-avatar" src="/static/images/header/avatar.png" height="50" width="50" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
</a>
<span><a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a></span>
{% endcomment %}
</div>
</div>
<div class="comments_textual">
{% comment %}
This is where you put the textual part of your message.
Examples include the text of comments, details about credit card charges, etc.
{% endcomment %}
</div>
</div>

View File

@ -1,14 +1,14 @@
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
</div>
<div class="comments_graphical">
The campaign for {{ campaign.work.title }} is almost over.
</div>
</div>
{% extends "notification/notice_template.html" %}
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
The campaign for {{ campaign.work.title }} is almost over.
{% endblock %}
{% block comments_textual %}
The campaign for {{ campaign.work.title }} will end on {{ campaign.deadline }}. It needs ${{ campaign.left }} more before it can be unglued for all to enjoy.<br /><br />
{% if pledged %}
@ -17,13 +17,8 @@
You can help us give this book to the world by <a href="{% url pledge work_id=campaign.work.id %}">pledging</a> or by sharing this campaign with your friends.
{% endif %}
<ul>
<a href="{% url emailshare 'pledge' %}?next={% url work campaign.work.id|urlencode:"" %}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work campaign.work.id|urlencode:"" %}&text=Help%20me%20give%20{{ campaign.work.title|urlencode }}%20to%20the%20world%20at%20%40unglueit"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work campaign.work.id|urlencode:"" %}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul><br />
{% url work campaign.work.id as work_url %}
{% include "notification/sharing_block.html" %}
Thank you!
</div>
</div>
{% endblock %}

View File

@ -1,30 +1,24 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
</div>
<div class="comments_graphical">
{% endblock %}
{% block comments_graphical %}
<img src="/static/images/images/icon-book-37by25-{{ campaign.work.percent_unglued }}.png" alt="almost-unglued icon" title="almost-unglued icon" />
<span>The campaign to unglue a book you've wishlisted, {{ campaign.work.title}}, is close to succeeding!</span>
{% endcomment %}
</div>
</div>
{% endblock %}
<div class="comments_textual">
{% block comments_textual %}
{% if pledged %}
Your pledge is helping us reach the campaign's target price of {{ campaign.target }}. Will you help again by sharing this campaign with your friends?
{% else %}
You can help us give this book to the world by <a href="{% url pledge work_id=campaign.work.id %}">pledging</a> or by sharing this campaign with your friends.
{% endif %}
<ul>
<a href="{% url emailshare 'pledge' %}?next={% url work campaign.work.id|urlencode:"" %}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work campaign.work.id|urlencode:"" %}&text=Help%20me%20give%20{{ campaign.work.title|urlencode }}%20to%20the%20world%20at%20%40unglueit"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work campaign.work.id|urlencode:"" %}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul><br />
{% url work campaign.work.id as work_url %}
{% include "notification/sharing_block.html" %}
Thank you!
</div>
</div>
{% endblock %}

View File

@ -1,20 +1,13 @@
{% with comment.content_object.id as id %}
{% with comment.user as user %}
{% extends "notification/notice_template.html" %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<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_graphical">
<a href="{% url supporter supporter_username=user %}">{{ comment.user.username }}</a> has made an official comment on <a href="{% url work id %}?tab=2">{{ comment.content_object.title }}</a>
</div>
</div>
{% block comments_book %}
<a href="{% url work comment.content_object.id %}?tab=2"><img src="{{ comment.content_object.cover_image_small }}" alt="cover image for {{ comment.content_object.title }}" /></a>
{% endblock %}
<div class="comments_textual">
{% block comments_graphical %}
<a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a> has made an official comment on <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>
{% endblock %}
{% block comments_textual %}
{{ comment.comment|linebreaksbr }}
</div>
</div>
{% endwith %}
{% endwith %}
{% endblock %}

View File

@ -1,20 +1,19 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
</div>
<div class="comments_graphical">
It's your last chance to claim one of the limited edition premiums for the campaign to unglue {{ campaign.work.title }}!
</div>
</div>
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
It's your last chance to claim one of the limited edition premiums for the campaign to unglue {{ campaign.work.title }}!
{% endblock %}
{% block comments_textual %}
Did you want one of the limited-edition premiums for the campaign to unglue {{ campaign.work.title }}? This is your last chance -- there's only one left!
Premium: {{ premium.description }}
Minimum pledge: {{ premium.amount|intcomma }}
If you'd like to claim the last one, pledge here: https://{{ site.domain }}{% url pledge work_id=campaign.work.id %}
</div>
</div>
{% endblock %}

View File

@ -1,31 +1,21 @@
{% extends "notification/notice_template.html" %}
{% load humanize %}
{% with campaign.work.id as work_id %}
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work work_id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target|intcomma }} for {{ title }}.
</div>
</div>
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Good news! The rights holder, {{ campaign.rightsholder }}, has lowered the target price to ${{ campaign.target|intcomma }} for {{ campaign.work.title }}.
{% endblock %}
{% block comments_textual %}
{% if pledged %}
Your pledge of {{ amount|intcomma }} is now going even farther toward helping {{ title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help again by sharing this campaign:
Your pledge of {{ amount|intcomma }} is now going even farther toward helping {{ campaign.work.title }} to reach its goal. Still, we can only unglue this book if the campaign succeeds. You can help again by sharing this campaign:
{% else %}
The target may be lower, but we still need your help to reach it. Pledges of any amount help. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge work_id=work_id %} . You can also help by sharing this campaign:
The target may be lower, but we still need your help to reach it. Pledges of any amount help. You can chip in towards giving this book to the world at https://{{ site.domain }}{% url pledge campaign.work.id %} . You can also help by sharing this campaign:
{% endif %}
<ul>
<a href="{% url emailshare 'pledge' %}?next={% url work work_id|urlencode:"" %}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work work_id|urlencode:"" %}&text=I%20just%20pledged%20to%20unglue%20{{ title|urlencode }}%20at%20%40unglueit.%20Will%20you%20join%20me%3F"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work work_id|urlencode:"" %}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul>
</div>
</div>
{% endwith %}
{% endwith %}
{% url work campaign.work.id as work_url %}
{% include "notification/sharing_block.html" %}
{% endblock %}

View File

@ -1,17 +1,14 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Hooray! We're going to give {{ title }} to the world!
</div>
</div>
{% extends "notification/notice_template.html" %}
<div class="comments_textual">
A book on your wishlist, {{ title }}, has met its goal price of {{ campaign.target }}, thanks to the support of ungluers like you. Unglue.it and the book's rights holder, {{ campaign.rightsholder }}, will be converting it to an unglued ebook edition and making it available for all the world to enjoy. If you've asked us to in your <a href="/notification/settings/">notification settings</a>, we'll tell you when the unglued ebook is ready.<br /><br />
Thank you again!
</div>
</div>
{% endwith %}
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Hooray! We're going to give <a href="{% url work campaign.work.id %}">{{ campaign.work.title }}</a> to the world!
{% endblock %}
{% block comments_textual %}
A book on your wishlist, {{ campaign.work.title }}, has met its goal price of {{ campaign.target }}, thanks to the support of ungluers like you. Unglue.it and the book's rights holder, {{ campaign.rightsholder }}, will be converting it to an unglued ebook edition and making it available for all the world to enjoy. If you've asked us to in your <a href="/notification/settings/">notification settings</a>, we'll tell you when the unglued ebook is ready.<br /><br />
Thank you again!
{% endblock %}

View File

@ -1,23 +1,15 @@
{% extends "notification/notice_template.html" %}
{% load truncatechars %}
{% comment %}
Note: this is NOT intended to render notices
This is a model to use as a base for notice.html templates.
Copy/paste from here to your desired notice.html and fill in the specific content.
Using this template will allow notices.css to apply to all notices for a uniform style.
{% endcomment %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
{% block comments_book %}
<a href="{% url work work.id %}"><img src="{{ work.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
</div>
<div class="comments_graphical">
<span><a href="{% url work work.id %}">{{ work.title }}</a> is now available for download</span>
</div>
</div>
{% endblock %}
<div class="comments_textual">
{% block comments_graphical %}
<span><a href="{% url work work.id %}">{{ work.title }}</a> is now available for download</span>
{% endblock %}
{% block comments_textual %}
{% if work.last_campaign_status == 'SUCCESSFUL' %}
<p>
Great News! <a href="{% url work work.id %}">{{ work.title }}</a> which you have supported is now available for download as an Unglued Ebook.
@ -72,5 +64,4 @@ Using this template will allow notices.css to apply to all notices for a uniform
<p>
The Unglue.it team
</p>
</div>
</div>
{% endblock %}

View File

@ -1,15 +1,11 @@
{% with campaign.work.title as title %}
{% with campaign.rightsholder as rightsholder %}
Alas. The campaign to unglue {{ title }} (https://{{site.domain}}{% url work campaign.work.id %}) has not succeeded.
Alas. The campaign to unglue {{ campaign.work.title }} (https://{{site.domain}}{% url work campaign.work.id %}) has not succeeded.
If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums. You'll also receive an email from Amazon notifying you that your payment to Gluejar has been cancelled.
Still want to give {{ title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ title }}.
Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}.
There are also other books with active campaigns that need your help: https://unglue.it/campaigns/ending .
Thank you for your support.
{{ rightsholder }} (rights holder for {{ title }}) and the Unglue.it team
{% endwith %}{% endwith %}
{{ campaign.rightsholder }} (rights holder for {{ campaign.work.title }}) and the Unglue.it team

View File

@ -1,22 +1,19 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Alas. The campaign to unglue {{ title }} did not succeed.
</div>
</div>
{% extends "notification/notice_template.html" %}
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ campaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Alas. The campaign to unglue <a href="{% url work campaign.work.id %}">{{ campaign.work.title }}</a> did not succeed.
{% endblock %}
{% block comments_textual %}
If you pledged toward this work, your pledge will expire shortly and your credit card will not be charged, nor will you receive any premiums.
Still want to give {{ title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ title }}.
Still want to give {{ campaign.work.title }} to the world? Don't despair. Keep it on your wishlist and tell everyone why you love this book. The rights holder, {{ campaign.rightsholder }}, may run a campaign with different terms in the future. With your help, we may yet be able to unglue {{ campaign.work.title }}.
There are also <a href="https://unglue.it/campaigns/ending">other books with active campaigns</a> that need your help.
Thank you for your support.
</div>
</div>
{% endwith %}
{% endblock %}

View File

@ -1,12 +1,9 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
The rights holder, {{ campaign.rightsholder }}, has updated the campaign to unglue {{ title }}. For details, see the <a href="{% url work campaign.work.id %}">campaign page</a>.
</div>
</div>
</div>
{% endwith %}
{% extends "notification/notice_template.html" %}
{% block comments_book %}
<a href="{% url work campaign.work.id %}"><img src="{{ campaign.work.cover_image_small }}" alt="cover image for {{ cmapaign.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
The rights holder, {{ campaign.rightsholder }}, has updated the campaign to unglue {{ campaign.work.title }}. For details, see the <a href="{% url work campaign.work.id %}">campaign page</a>.
{% endblock %}

View File

@ -1,31 +1,22 @@
{% with claim.work.id as work_id %}
{% with claim.work.title as title %}
<div class="comments clearfix">
<div class="comments_info clearfix">
<div class="comments_book">
<a href="{% url work work_id %}"><img src="{{ claim.work.cover_image_small }}" alt="cover image for {{ title }}" /></a>
</div>
<div class="comments_graphical">
Hooray! {{ rightsholder }} is now an approved rights holder for {{ title }}.
</div>
</div>
{% extends "notification/notice_template.html" %}
<div class="comments_textual">
{% block comments_book %}
<a href="{% url work claim.work.id %}"><img src="{{ claim.work.cover_image_small }}" alt="cover image for {{ claim.work.title }}" /></a>
{% endblock %}
{% block comments_graphical %}
Hooray! {{ rightsholder }} is now an approved rights holder for {{ claim.work.title }}.
{% endblock %}
{% block comments_textual %}
What does this mean for you? Rights holders are the people who are legally authorized to license works. This means they're the only people who can run campaigns on Unglue.it.
{{ rightsholder }} may be running a campaign soon, or later, but isn't obligated to. Want to make that campaign happen? <a href="https://{{site.domain}}{% url work work_id %}?tab=2">Leave a comment</a> and tell your friends:
{{ rightsholder }} may be running a campaign soon, or later, but isn't obligated to. Want to make that campaign happen? <a href="https://{{site.domain}}{% url work claim.work.id %}?tab=2">Leave a comment</a> and tell your friends:
<ul>
<a href="{% url emailshare 'pledge' %}?next={% url work work_id|urlencode:"" %}"><li>Email it!</li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url work work_id|urlencode:"" %}&text=I%20just%20pledged%20to%20unglue%20{{ title|urlencode }}%20at%20%40unglueit.%20Will%20you%20join%20me%3F"><li>Tweet it!</li></a>
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url work work_id|urlencode:"" %}"><li>Share it on Facebook.</li></a>
<li>Best idea: talk about it with those you love.</li>
</ul>
{% url work claim.work.id as work_url %}
{% include "notification/sharing_block.html" %}
Make sure {{ rightsholder }} knows how much you want to give this book to the world.
Thanks for your help!
</div>
</div>
{% endwith %}
{% endwith %}
{% endblock %}

View File

@ -642,6 +642,7 @@ ul.support li span.menu-item-desc {
clear: both;
font-size: 15px;
font-weight: normal;
line-height: 19.5px;
}
ul.support li:hover {
color: #fff;

View File

@ -93,7 +93,7 @@
.comments {
clear: both;
padding: 5px;
margin: 0 5px 0 0;
margin: 0 5px 8px 0;
width: 95%;
}
.comments.row1 {
@ -142,6 +142,6 @@
.official {
border: 3px #B8DDE0 solid;
margin-top: 3px;
margin-bottom: 3px;
margin-bottom: 5px;
padding-left: 2px;
}

View File

@ -133,28 +133,39 @@ input[type="submit"] {
border: solid 3px #d6dde0;
margin: 3px auto;
}
.comments hr {
margin: 10px auto 5px;
color: #d6dde0;
background-color: #d6dde0;
height: 2px;
border: 0;
}
.comments .comments_book {
padding: 5px;
border: solid 5px #EDF3F4;
margin: 5px;
margin-right: 10px;
margin-bottom: 10px;
max-width: 80px;
}
.comments .comments_book img {
max-width: 80px;
}
.comments .comments_textual {
margin: auto 5px 7px;
padding: 10px 5px 5px;
}
.comments .comments_textual div {
margin-bottom: 5px;
}
.comments .comments_info {
border-bottom: solid 1px #d6dde0;
padding: 5px;
}
.comments .comments_info div {
float: left;
}
.comments .comments_info .comments_graphical {
margin: 5px;
padding-bottom: 5px;
padding: 5px auto;
}
.comments .comments_info span {
text-indent: 0;
}

View File

@ -375,6 +375,7 @@ ul.support li {
clear: both;
font-size: @font-size-larger;
font-weight: normal;
line-height: @font-size-larger*1.3;
}
}

View File

@ -3,7 +3,7 @@
.comments {
clear: both;
padding: 5px;
margin: 0 5px 0 0;
margin: 0 5px 8px 0;
//min-height: 105px;
width: 95%;
@ -65,6 +65,6 @@
.official {
border: 3px #B8DDE0 solid;
margin-top: 3px;
margin-bottom: 3px;
margin-bottom: 5px;
padding-left: 2px;
}

View File

@ -51,9 +51,18 @@ input[type="submit"] {
border: solid 3px @blue-grey;
margin: 3px auto;
hr {
margin: 10px auto 5px;
color: @blue-grey;
background-color: @blue-grey;
height:2px;
border: 0;
}
.comments_book {
.mediaborder;
margin: 5px;
margin-right: 10px;
margin-bottom: 10px;
max-width: 80px;
img {
@ -62,7 +71,7 @@ input[type="submit"] {
}
.comments_textual {
margin: auto 5px 7px;
padding: 10px 5px 5px;
div {
margin-bottom: 5px;
@ -71,15 +80,18 @@ input[type="submit"] {
.comments_info {
border-bottom: solid 1px @blue-grey;
padding: 5px;
div {
float: left;
}
.comments_graphical {
margin: 5px;
padding-bottom: 5px;
padding: 5px auto;
}
span {
text-indent: 0;
}
}
}