Merge branch 'master' into relaunch_ry

pull/1/head
Raymond Yee 2012-09-13 10:42:35 -07:00
commit b85fbfc78b
20 changed files with 86 additions and 56 deletions

View File

@ -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 %}

View File

@ -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>

View File

@ -1,30 +1,35 @@
{% extends "base.html" %}
{% block content %}
<div style="width: 80%; margin: 15px auto;" class="clearfix"><img style="float:left; margin-right: 10px;" width="100" height="85" src="/static/images/LOCKSSpreserved.png"></span><span>We are partnering with LOCKSS to safeguard unglued ebooks. The LOCKSS Program (Lots of Copies Keep Stuff Safe) is an open source, cooperative, distributed system for preserving and providing access to digital content. For more information, see <a href="http://www.lockss.org/">the LOCKSS web site</a>.
</div>
<div style="width: 80%; margin: 15px auto;" >
{% if ebook %}
<I>{{ work.title }}</i><br />
{% if authors|length = 1 %}
{{ authors.0 }}
{% else %}
{% if authors|length = 2 %}
{{ authors.0 }} and {{ authors.1 }}
{% else % }
{% for author in authors %}
{% if forloop.last %} and {{ author }}{% else %}{{ author }}, {% endif %}
{% endfor %}
{% endif %}
{% endif %}
<p>
<a rel="license" href="{{ work.last_campaign.license_url }}"><img alt="Creative Commons License" style="border-width:0" src="{{ ebook.rights_badge }}" /></a><br />This work is licensed under a <a rel="license" href="{{ work.last_campaign.license_url }}">{{ work.last_campaign.license }} License</a>.
</p>
<p>
<a href="{{ ebook.url }}">Download.</a>
</p>
{% else %}
When an unglued ebook for <I>{{ work.title }}</I> is available, the LOCKSS harvester will be able to download it here.
{% endif %}
</div>
<div style="width: 80%; margin: 15px auto;" class="clearfix">
<img style="float:left; margin-right: 10px;" width="100" height="85" src="/static/images/LOCKSSpreserved.png"><span>We are partnering with LOCKSS to safeguard unglued ebooks. The LOCKSS Program (Lots of Copies Keep Stuff Safe) is an open source, cooperative, distributed system for preserving and providing access to digital content. For more information, see <a href="http://www.lockss.org/">the LOCKSS web site</a>.</span>
</div>
<div style="width: 80%; margin: 15px auto;">
{% if ebooks %}
{% for ebook in ebooks %}
<div>
<I>{{ work.title }}</i><br />
{% if authors|length = 1 %}
{{ authors.0 }}
{% else %}
{% if authors|length = 2 %}
{{ authors.0 }} and {{ authors.1 }}
{% else % }
{% for author in authors %}
{% if forloop.last %} and {{ author }}{% else %}{{ author }}, {% endif %}
{% endfor %}
{% endif %}
{% endif %}
<p>
<a rel="license" href="{{ work.last_campaign.license_url }}"><img alt="Creative Commons License" style="border-width:0" src="{{ ebook.rights_badge }}" /></a><br />This work is licensed under a <a rel="license" href="{{ work.last_campaign.license_url }}">{{ work.last_campaign.license }} License</a>.
</p>
<p>
<a href="{{ ebook.url }}">Download.</a>
</p>
</div>
{% endfor %}
{% else %}
When an unglued ebook for <I>{{ work.title }}</I> is available, the LOCKSS harvester will be able to download it here.
{% endif %}
</div>
{% endblock %}

View File

@ -1,8 +1,8 @@
{% if work.last_campaign_status == 'SUCCESSFUL' %}
Great news, {{ user.username }}! {{ work.title }}, which you have supported on Unglue.it, is now available for download as an Unglued Ebook.
Great news! {{ work.title }}, which you have supported on Unglue.it, is now available for download as an Unglued Ebook.
{% else %}
Good News, {{ user.username }}! {{ work.title }}, which is on your wishlist, is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
Good News! {{ work.title }}, which is on your wishlist, is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
{% if work.ebooks.0.user %}
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).

View File

@ -8,7 +8,7 @@
<a href="#overview">Overview</a><br />
</div>
<div>
<a href="#press">All Press Coverage</a><br />
<a href="#press">Press Coverage</a><br />
<a href="#blogs">Blog Coverage (Highlights)</a><br />
</div>
<div>
@ -17,6 +17,7 @@
</div>
<div>
<a href="#images">Logos &amp; Images</a><br />
<a href="#releases">Press Releases</a><br />
</div>
<div class="pressemail">
Additional press questions? Please email <a href="mailto:press@gluejar.com">press@gluejar.com</a>.
@ -180,6 +181,10 @@ Creative Commons offers a variety of other licenses, many of them with even less
<a id="blogs"></a><h2>Blog Coverage (Highlights)</h2>
<div class="pressarticles">
<div>
<a href="http://www.thedigitalshift.com/2012/09/roy-tennant-digital-libraries/first-book-comes-unglued/">First Book Comes Unglued</a><br />
The Digital Shift (Library Journal/School Library Journal) - September 12, 2012<br />
</div>
<div>
<a href="http://davidbrin.blogspot.com/2012/07/transparency-secrecy-and-copyright-for.html">Transparency, Secrecy, and Copyright for the Modern Age</a><br />
Contrary Brin - July 1, 2012<br />
@ -339,7 +344,7 @@ Creative Commons offers a variety of other licenses, many of them with even less
<p>You can also <a href="http://eepurl.com/fKLfI">subscribe</a> to our newsletter.</p>
<a id="images"></a><h2>Logos &amp; Images</h2>
<div class="pressimages">
<div class="pressimages clearfix">
<div class="outer">
<div><a href="/static/images/logo.png"><img src="/static/images/logo.png" alt="big logo" /></a></div>
<div class="text"><p>Full logo, 161px x 70px</p></div>
@ -369,11 +374,30 @@ Creative Commons offers a variety of other licenses, many of them with even less
<div class="text"><p>300 ppi screenshot of a search result page, in panel view. As with the supporter page, users can toggle between views.</p></div>
</div>
</div>
<br /><br /><br /><br /><br /><br />
<div>
<a id="releases"></a><h2>Press Releases</h2>
<div class="pressarticles">
<div>
<a href="/static/pdfs/OLAUngluedEbookRelease.pdf">Oral Literature in Africa unglued ebook released</a><br />September 12, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaselaunchoverall.pdf">Main launch announcement</a><br />May 17, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaseBuddingReader.pdf">Launch announcement: Budding Reader campaign</a><br />May 17, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaseMikeLaser.pdf">Launch announcement: Michael Laser campaign</a><br />May 17, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaseJoeNassise.pdf">Launch announcement: Joseph Nassise campaign</a><br />May 17, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaseOpenBook.pdf">Launch announcement: Open Book Publishers campaign</a><br />May 17, 2012
</div>
<div>
<a href="/static/pdfs/PressReleaseNancyRawles.pdf">Launch announcement: Nancy Rawles campaign</a><br />May 17, 2012
</div>
{% comment %}
should have logos at a variety of resolutions and also in greyscale
{% endcomment %}
</div>
<br /><br /><br /><br /><br /><br />
{% endblock %}

View File

@ -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();

View File

@ -1964,12 +1964,12 @@ def lockss(request, work_id):
"""
work = safe_get_work(work_id)
try:
ebook = work.ebooks().filter(unglued=True)[0]
ebooks = work.ebooks().filter(edition__unglued=True)
except:
ebook = None
ebooks = None
authors = list(models.Author.objects.filter(editions__work=work).all())
return render(request, "lockss.html", {'work':work, 'ebook':ebook, 'authors':authors})
return render(request, "lockss.html", {'work':work, 'ebooks':ebooks, 'authors':authors})
def download(request, work_id):
context = {}

View File

@ -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;

View File

@ -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;

View File

@ -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;
}

View File

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

View File

@ -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%;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.