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

pull/1/head
Raymond Yee 2012-05-15 12:47:02 -07:00
commit 3027589a5d
15 changed files with 215 additions and 174 deletions

View File

@ -188,5 +188,6 @@ successful_campaign.connect(notify_successful_campaign)
# former seems too sausage-making, and might make people angry if they get
# notifications about claims they believe are false). If it's the former, the
# text should be revisited.
# 'campaign'
# 'site'
# 'claim'
# 'site'
# 'rightsholder' (the name of the rightsholder)

View File

@ -278,6 +278,10 @@ What does this mean for you? If you're a book lover, you can read unglued ebook
Unglued ebooks are a win-win solution for readers, libraries, and authors, publishers.
</dd>
<dt>Is the unglued ebook edition the same as one of the existing editions?</dt>
<dd>Not necessarily. Sometimes the existing editions include content that we can't get the rights to include in the unglued ebook, especially cover art or illustrations. Sometimes the unglued ebook edition will have improvements, like copy-editing fixes or bonus features. These differences, if any, will be specified in the Rights tab of the campaign page. In addition, all unglued ebooks include acknowledgements of supporters and information on their Creative Commons license.</dd>
<dt>How much does a book cost?</dt>
<dd>The author or publisher sets a price for giving the book to the world. Once you and your fellow ungluers raise enough money to meet that price, the unglued ebook is available at no charge, for everyone, everywhere!</dd>
@ -400,11 +404,11 @@ We strongly encourage you to include video. You can upload it to YouTube and em
<dt>What should I offer as premiums?</dt>
<dd>In addition to the required set of Unglue.it premiums, you're encouraged to sweeten the deal for your supporters by offering special premiums. Think about things that uniquely represent yourself or the work, that are appealing, and that you can deliver quickly and within your budget. For example, authors could consider offering skype sessions as premiums for libraries or schools that might want to plan an event around the unglued book.</dd>
{% comment %}
<dt>What can be offered as a premium? What items are prohibited as premiums?</dt>
<dd>TBA</dd>
{% endcomment%}
<dd>You can offer anything you are capable of delivering, so long as it is not illegal or otherwise restricted in the United States. For instance, your premiums may not include alcohol, drugs, or firearms. For full details, consult our <a href="/terms/">Terms of Use</a>.</dd>
<dt>Who is responsible for making sure a rights holder delivers premiums?</dt>
<dd>The rights holder.</dd>

View File

@ -19,7 +19,7 @@
<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=http://{{ site.domain }}{% url work campaign.work.id|urlencode:"" %}&text=Help%20me%20give%20{{ work.title|urlencode }}%20to%20the%20world%20at%20%40unglueit"><li>Tweet it!</li></a>
<a href="https://twitter.com/intent/tweet?url=http://{{ 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=http://{{ 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 />

View File

@ -1,19 +1,30 @@
{% load humanize %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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">
<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>
<div class="comments_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<div class="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 %}
<p>
text comments
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
<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=http://{{ 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=http://{{ 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 />
Thank you!
</div>
</div>

View File

@ -1,7 +1,7 @@
{% load humanize %}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 }}
Amount: {{ premium.amount|intcomma }}
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 %}

View File

@ -1,19 +1,20 @@
{% load humanize %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<p>
text comments
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
<div class="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>

View File

@ -1,19 +1,30 @@
{% with campaign.work.id as work_id %}
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<div class="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:
{% 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:
{% 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=http://{{ 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=http://{{ 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>
<p>
text comments
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
</div>
</div>
</div>
{% endwith %}
{% endwith %}

View File

@ -1,24 +1,17 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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">
Hooray! We're going to give {{ title }} to the world!
</div>
</div>
<div class="comments_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<p>Congratulations! You wished for it and pledged for it, and now the Campaign
for <a href="{% url work campaign.work.id %}?tab=2">{{ campaign.work.title}}</a> has succeeded.
You will notified when an Unglued ebook edition is
available, within 90 days.</p>
<p>You will be receiving notification about your Campaign
Premium(s) for <a href="{% url work campaign.work.id %}?tab=2">{{ campaign.work.title}}</a> directly from the RIGHTS HOLDER.
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
<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>
</div>
{% endwith %}

View File

@ -1,68 +1,76 @@
{% 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_book">
<a href="{% url work work.id %}"><img src="{{ work.cover_image_small }}" alt="cover image for {{ work.title }}" /></a>
</div>
<div class="comments_info">
<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 {{ 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 class="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.
</p>
{% else %}
<p>
Good News! <a href="{% url work work.id %}">{{ work.title }}</a> which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
</p>
{% if work.ebooks.0.user %}
<p>
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
</p>
{% endif %}
{% endif %}
<p>Here are the files available for download:</p>
<table>
<tr>
<th>File type</th>
<th>License</th>
<th>Host Site</th>
<th>URL</th>
</tr>
{% for ebook in work.ebooks %}
<tr>
<td>{{ ebook.get_format_display }}</td>
<td>{{ ebook.get_rights_display }}</td>
<td>{{ ebook.provider }}</td>
<td><a href="{{ ebook.url }}">{{ ebook.url|truncatechars:30 }}</a></td>
</tr>
{% endfor %}
</div>
<div class="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.
</p>
{% else %}
<p>
Good News! <a href="{% url work work.id %}">{{ work.title }}</a> which is on your wishlist is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
</p>
{% if work.ebooks.0.user %}
<p>
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
</p>
{% endif %}
{% endif %}
</table>
<p>
{% if work.ebooks.0.rights == 'PD-US' %}
A public domain ebook belongs to all of us. You can do anything you like with it.
{% else %}
The Creative Commons licensing terms for the ebook allow you to redistribute the files under the specified license terms. There's no DRM.
{% endif %}
</p>
<p>
{% if work.last_campaign_status == 'SUCCESSFUL' %}
If you have any problems with this unglued ebook, please don't hesitate to let us know at support@gluejar.com. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing.
{% else %}
If you have any problems with these ebook files, please don't hesitate to let us know at support@gluejar.com. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble.
{% endif %}
</p>
<p>
Thanks,
</p>
<p>
Your Tireless Unglue.it Staff
</p>
</div>
<p>Here are the files available for download:</p>
<table>
<tr>
<th>File type</th>
<th>License</th>
<th>Host Site</th>
<th>URL</th>
</tr>
{% for ebook in work.ebooks %}
<tr>
<td>{{ ebook.get_format_display }}</td>
<td>{{ ebook.get_rights_display }}</td>
<td>{{ ebook.provider }}</td>
<td><a href="{{ ebook.url }}">{{ ebook.url|truncatechars:30 }}</a></td>
</tr>
{% endfor %}
</table>
<p>
{% if work.ebooks.0.rights == 'PD-US' %}
A public domain ebook belongs to all of us. You can do anything you like with it.
{% else %}
The <a href="https://creativecommons.org/licenses">Creative Commons licensing terms</a> for the ebook allow you to redistribute the files under the specified license terms. There's no DRM. Consult <a href="https://creativecommons.org/licenses">CreativeCommons.org</a> for more details.
{% endif %}
</p>
<p>
{% if work.last_campaign_status == 'SUCCESSFUL' %}
If you have any problems with this unglued ebook, please don't hesitate to let us know at <a href="mailto:support@gluejar.com">support@gluejar.com</a>. And if you love being able to give this ebook for free to all of your friends, please consider supporting other ebooks for ungluing.
{% else %}
If you have any problems with these ebook files, please don't hesitate to let us know at <a href="mailto:support@gluejar.com">support@gluejar.com</a>. For example, if the file isn't what it says it is, or if the licensing or copyright status is misrepresented, we want to know as soon as possble.
{% endif %}
</p>
<p>
Thank you!
</p>
<p>
The Unglue.it team
</p>
</div>
</div>

View File

@ -1,19 +1,20 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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>
<div class="comments_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<p>
text comments
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
<div class="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 }}.
Thank you for your support.
</div>
</div>
</div>
{% endwith %}

View File

@ -1,19 +1,12 @@
{% with campaign.work.title as title %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
</div>
<div class="comments_info">
<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 class="comments_textual">
<p>
text comments
</p>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
</div>
</div>
</div>
</div>
{% endwith %}

View File

@ -1,4 +1,4 @@
Hooray! A rights holder, {{ rightsholder }}, has claimed {{ campaign.work.title }}, a work on your wishlist at Unglue.it.
Hooray! A rights holder, {{ rightsholder }}, has claimed {{ claim.work.title }}, a work on your wishlist at Unglue.it.
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.

View File

@ -1,19 +1,31 @@
{% with claim.work.id as work_id %}
{% with claim.work.title as title %}
<div class="comments clearfix">
<div class="comments_book">
<a href="{% url work campaign.work.id %}?tab=2"><img src="{{ campaign.work.cover_image_thumbnail }}" alt="cover image for {{ campaign.work.title }}" /></a>
<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>
<div class="comments_info">
<div class="comments_graphical">
</div>
<div class="comments_textual">
<div class="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="http://{{site.domain}}{% url work work_id %}?tab=2">Leave a comment</a> and tell your friends:
<p>
text comments
</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=http://{{ 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=http://{{ 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>
<p class="classname">Give ebooks to the world; give income to authors and publishers. Unglue.it</p>
</div>
Make sure {{ rightsholder }} knows how much you want to give this book to the world.
Thanks for your help!
</div>
</div>
</div>
{% endwith %}
{% endwith %}

View File

@ -7,7 +7,13 @@
<link type="text/css" rel="stylesheet" href="/static/css/campaign.css" />
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
<script type="text/javascript" src="/static/js/prefill_pledge.js"></script>
<script type="text/javascript">
var $j = jQuery.noConflict();
//give pledge box focus
$j(function() {
$j('#id_preapproval_amount').focus();
});
</script>
{% endblock %}
{% block doccontent %}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB