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

Merge newfoundation

foundation/faq
nicholas antonov 2018-05-01 01:40:54 -04:00
parent 55cdd17388 d78b5bf1b1
commit 43ccd03a00
9 changed files with 511 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/forms/__init__.py
View File

@ -292,7 +292,9 @@ class OfferForm(forms.ModelForm):
class CampaignPurchaseForm(forms.Form):
anonymous = forms.BooleanField(required=False, label=_("Make this purchase anonymous, please"))
anonymous = forms.BooleanField(required=False,
label_suffix='',
label=_("Make this purchase anonymous"))
offer_id = forms.IntegerField(required=False)
offer = None
library_id = forms.IntegerField(required=False)
@ -357,7 +359,8 @@ class CampaignPurchaseForm(forms.Form):
class CampaignThanksForm(forms.Form):
anonymous = forms.BooleanField(
required=False,
label=_("Make this contribution anonymous, please")
label_suffix='',
label=_("Make this contribution anonymous")
)
preapproval_amount = forms.DecimalField(
required = True,
@ -391,7 +394,10 @@ class CampaignPledgeForm(forms.Form):
def amount(self):
return self.cleaned_data["preapproval_amount"] if self.cleaned_data else None
anonymous = forms.BooleanField(required=False, label=_("Make this support anonymous, please"))
anonymous = forms.BooleanField(
required=False,
label_suffix='',
label=_("Make this support anonymous"))
ack_name = forms.CharField(
required=False,
max_length=64,

15
frontend/templates/base.html
View File

@ -1,9 +1,10 @@
<!DOCTYPE html>
{% load truncatechars %}{% load sass_tags %}
<html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="referrer" content="origin" />
<title>unglue.it {% block title %}{% endblock %}</title>
<link REL="SHORTCUT ICON" HREF="/static/images/favicon.ico">
@ -19,7 +20,6 @@
<script type="text/javascript" src="{{ jquery_home }}"></script>
<script type="text/javascript" src="/static/js/jquery.cookie.js"></script>
<script type="text/javascript" src="/static/scss/foundation/dist/js/foundation.js"></script>
<script type="text/javascript" src="/static/js/watermark_init.js"></script>
<script type="text/javascript" src="/static/js/watermark_change.js"></script>
<script defer type="text/javascript" src="/static/js/sitewide1.js"></script>
@ -58,7 +58,7 @@
</div>
<div id="header-search-bar">
<form action="{% url 'search' %}" method="get">
<input type="text" placeholder="Search" id="nowatermark" size="25" onfocus="imgfocus()" onblur="imgblur(15)" class="inputbox" name="q" value="{{ q }}"></input>
<input role="search" type="text" placeholder="Search" id="nowatermark" size="25" onfocus="imgfocus()" onblur="imgblur(15)" class="inputbox" name="q" value="{{ q }}"></input>
<i class="fa fa-search"></i>
</form>
</div>
@ -143,14 +143,6 @@
{% block content %}{% endblock %}
{% block footer %}
<div class="footer hide utilityheaders">
<ul>
<li><a href="{% url 'about' %}">Team</a></li>
<li><a href="https://blog.unglue.it">Blog</a></li>
<li><a href="{% url 'terms' %}">Terms of Use</a></li>
<li><a href="{% url 'faq' %}">General FAQ</a></li>
</ul>
</div>
<div class="footer utilityheaders">
<div class="column">
<span>About Unglue.it</span>
@ -216,5 +208,6 @@
</script>
{% endif %}
{% endblock %}
<script type="text/javascript" src="/static/scss/foundation/dist/js/foundation.js"></script>
</body>
</html>

256
frontend/templates/download.html
View File

@ -21,132 +21,84 @@ $j(document).ready(function() {
</script>
{% endblock %}
{% block extra_css %}
<link type="text/css" rel="stylesheet" href="{% sass_src 'scss/download.scss' %}" />
{% endblock %}
{% block avatar %}
<img class="user-avatar" src="/static/images/header/avatar.png" height=36 width="36" alt="private" title="private" />
{% endblock %}
{% block content %}
<div class="download_container">
<div id="lightbox_content">
<div id="download_content">
<span id="dropboxjs" data-app-key="{{ dropbox_key }}"></span>
{% if show_beg %}
{% if work.last_campaign.ask_money %}
<div class="border" style="padding: 10px; min-height: 18em">
<div id="askblock">
<div>Please help us thank the creators for making <a href="{% url 'work' work.id %}">{{ work.title }}</a> free. The amount is up to you.</div>
<div class="rh_ask">
{{ work.last_campaign.description|safe }}
<div class="clearfix"></div>
</div>
<div id="askblock" class="card">
<div>Say thank you for making <a href="{% url 'work' work.id %}">{{ work.title }}</a> free.</div>
<form class="askform" method="POST" action="{% url 'thank' work.id %}#">
{% csrf_token %}
{{ form.non_field_errors }}
<div class="contrib_amount">Amount: {{ form.preapproval_amount.errors }}${{ form.preapproval_amount }}</div>
<div style="text-align: center;"><input name="pledge" type="submit" value="Say Thank You" id="contribsubmit" class="loader-gif" /></div>
<div id="anoncontribbox"><I>{{ form.anonymous.label_tag }}</I> {{ form.anonymous.errors }}{{ form.anonymous }}</div>
<div class="input-group">
{{ form.preapproval_amount.errors }}
<span class="input-group-label">$</span>
<input class="input-group-field" type="number" min="0.99" max="1999.99" step="1.00"
id="id_preapproval_amount" name="preapproval_amount"
value="{{ form.preapproval_amount.value }}">
<div class="input-group-button">
<input name="pledge" type="submit" class="button loader-gif" value="Say Thanks" id="contribsubmit">
</div>
</div>
<div id="anoncontribbox">
{{ form.anonymous.errors }}{{ form.anonymous }}
<i class="inline-block">{{ form.anonymous.label_tag }}</i>
</div>
{% if request.user.credit.available > 0 %}
<div > You have an available credit of ${{ request.user.credit.available|intcomma }} which will be applied to your contribution.</div>
{% endif %}
</form>
</div>
<div class="rh_ask">
{{ work.last_campaign.description|safe }}
</div>
</div>
{% else %}
<div class="border" style="padding: 10px">
<div class="rh_ask">
{{ work.last_campaign.description|safe }}
</div>
<div class="clearfix"></div>
</div>
{% endif %}
{% endif %}
{% if user_license.thanked %}
<div style="text-align: center; padding: 20px;">
<div style="background: #edf3f4; padding: 10px; width:35%; display: inline; ">
<div>
You have supported this free book!
</div>
</div>
{% endif %}
{% if lib_thanked %}
<div style="text-align: center; padding: 20px;">
<div style="background: #edf3f4; padding: 10px; width:35%; display: inline; ">
<div>
Your library has supported this free book!
</div>
</div>
{% endif %}
{% if amount %}
<div style="text-align: center; padding: 20px;">
<div style="background: #edf3f4; padding: 10px; width:35%; display: inline; ">
<div>
Your contribution of ${{amount}} is confirmed.
{% if request.session.receipt %}
A confirmation is being sent to {{ request.session.receipt }}.
{% endif %}
</div>
</div>
{% endif %}
{% if source %}
{% else %}
<div class="border">
<h2 style="width:60%">Downloads for <I><a href="{% url 'work' work.id %}">{{ work.title }}</a></i></h2>
<div class="sharing ebook_download_container">
<h3 class="jsmod-title"><span>Share</span></h3>
<ul class="social menu">
{% with site.domain as domain %}
<a href="https://www.facebook.com/sharer.php?u=https://{{ site.domain }}{% url 'work' work.id|urlencode:"" %}"><li class="facebook first"><span>Facebook</span></li></a>
<a href="https://twitter.com/intent/tweet?url=https://{{ site.domain }}{% url 'work' work.id|urlencode:"" %}&amp;text=I%27m%20enjoying%20{{ work.title|urlencode }}%2C%20a%20free%2C%20non%2DDRM%20ebook%2E%20You%20can%20too%21"><li class="twitter"><span>Twitter</span></li></a>
{% endwith %}
{% if request.user.is_authenticated %}<a href="{% url 'emailshare' 'downloaded' %}?next={% url 'work' work.id %}"><li class="email"><span>Email</span></li></a>{% endif %}
<a id="embed2"><li class="embed"><span>Embed</span></li></a>
<div id="widgetcode2">Copy/paste this into your site:<br /><textarea rows="7" cols="22">&lt;iframe src="https://{{ request.META.HTTP_HOST }}/api/widget/{{ work.first_isbn_13 }}/" width="152" height="325" frameborder="0"&gt;&lt;/iframe&gt;</textarea></div>
</ul>
</div>
{% if xfer_url or can_kindle %}
<div class="one_click clearfix">
<h3>One-click options</h3>
{% if mac_ibooks and xfer_url %}
<div id="mac_ibooks" title="{{ work.id }}" >
<div class="btn_support mac_ibooks"><a href="{{ xfer_url }}">Load to iBooks</a></div>
</div>
{% endif %}
{% if can_kindle %}
<div id="kindle_div">
{% if request.user.is_authenticated and request.user.profile.kindle_email %}
<div class="yes_js">
<div id="kindle" class="btn_support authenticated" title="{{ work.id }}" >
<a>Send to Kindle</a>
</div>
</div>
<div class="no_js">
<form method="POST" class="btn_support" action="{% url 'send_to_kindle' work.id 0 %}">
<input type="submit" value="Send to Kindle">
</form>
</div>
{% else %}
<div class="btn_support kindle {% if request.user.is_anonymous %}modify{% endif %}">
<a href="{% url 'kindle_config_download' work.id %}">Set up Kindle </a>
</div>
{% endif %}
</div>
{% endif %}
{% if xfer_url %}
{% if iOS %}
<div id="marvin" title="{{ work.id }}" >
<div class="btn_support marvin"><a href="marvinhttp://{{ xfer_url|urlencode }}">Load to Marvin</a></div>
</div>
{% endif %}
{% endif %}
{% if can_kindle %}{% if not request.user.is_authenticated %}
<div style="clear:left"> You'll need an unglue.it account to <i>Send to Kindle</i>.</div>
{% endif %}{% endif %}
</div>
{% endif %}
<div class="download-body">
<h1 class="h2">Downloads for <I><a href="{% url 'work' work.id %}">{{ work.title }}</a></i></h1>
<div class="ebook_download_container">
{% if testmode %}
<i>Download links for uploaded files will appear here when campaign is launched.</i>
{% endif %}
{% if unglued_ebooks or other_ebooks or acq %}
{% if unglued_ebooks %}
<h3>Download the unglued edition</h3>
<h2 class="h4">Download the unglued edition</h2>
<div class="ebook_download">
{% for ebook in unglued_ebooks %}
<a href="{% url 'download_ebook' ebook.id %}">
@ -162,25 +114,40 @@ $j(document).ready(function() {
{% endif %}
{% if other_ebooks %}
{% if unglued_ebook %}
<h4>Download other freely available editions</h4>
<h2 class="h4">Download other freely available editions</h2>
{% else %}
<h4>Download freely available editions</h4>
<h2 class="h4">Download freely available editions</h2>
{% endif %}
<div class="ebook_download">
{% for ebook in other_ebooks %}
<a href="{% url 'download_ebook' ebook.id %}">
<img src="{{ ebook.rights_badge }}" alt="{{ ebook.rights}}" title="{{ ebook.rights}}" /></a>
<a href="{% url 'download_ebook' ebook.id %}"><img src="/static/images/{{ ebook.format }}32.png" height="32" alt="{{ ebook.format }} at {{ebook.provider}}" title="{{ ebook.format }} at {{ebook.provider}}" /></a>
<a href="{% url 'download_ebook' ebook.id %}">{{ ebook.format }} {% if ebook.version_label %} ({{ ebook.version_label }}) {% endif %} at {{ ebook.provider }}</a>
{% if ebook.is_direct %}<a class="dropbox-saver" href="{{ ebook.download_url }}" data-filename="unglueit-{{ work.id }}.{{ ebook.format }}"></a>{% endif %}
{% if not forloop.last %}<br /><br />{% endif %}
<div class="download_option flexible card">
<a href="{% url 'download_ebook' ebook.id %}" class="download-label h4">
<span class="hide-for-medium" >
{{ebook.format}}:
</span>
<img class="hide-for-small-only" src="/static/images/{{ ebook.format }}32.png" height="32" alt="{{ ebook.format }} at {{ebook.provider}}" title="{{ ebook.format }} at {{ebook.provider}}" />
<span class="hide-for-small-only" >
{{ ebook.format }} {% if ebook.version_label %} ({{ ebook.version_label }}) {% endif %} at {{ ebook.provider }}
</span>
</a>
<a href="{% url 'download_ebook' ebook.id %}" class="download-centered hide-for-medium">
<i class="fa fa-download fa-2x" title="Download {{ebook.format}}"></i>
</a>
{% if ebook.is_direct %}
<span class="dropbox_download_option download-centered" >
<a class="dropbox-saver download-centered" href="{{ ebook.download_url }}" data-filename="unglueit-{{ work.id }}.{{ ebook.format }}"></a>
</span>
<span class="download-centered hide-for-small-only">
<img src="{{ ebook.rights_badge }}" class="" alt="{{ ebook.rights}}" title="{{ ebook.rights}}" />
</span>
{% endif %}
</div>
{% endfor %}
</div>
{% endif %}
{% if acq %}
{% if work.last_campaign.type == 2 %}
<h3>Download your ebook{% if acq.lib_acq %}{% if acq.on_reserve %}, on reserve for you at{% else %}, on loan to you at{% endif %} {{ acq.lib_acq.user.library }}{% endif %}</h3>
<h2 class="h4">Download your ebook{% if acq.lib_acq %}{% if acq.on_reserve %}, on reserve for you at{% else %}, on loan to you at{% endif %} {{ acq.lib_acq.user.library }}{% endif %}</h2>
<div class="ebook_download">
<a href="{{ formats.epub }}"><img src="/static/images/epub32.png" height="32" alt="epub" title="epub" /></a>
<a href="{{ formats.epub }}">EPUB</a> (for iBooks, Nook, Kobo)
@ -193,20 +160,60 @@ $j(document).ready(function() {
{% endif %}
{% endif %}
{% else %}
<div class="border">
<div class="card">
<p id="content-block">There are no freely available downloads of <I>{{ work.title }}</I> right now. {% if not work in request.user.wishlist.works.all %}Would you like there to be? <a class="add-wishlist"><span class="work_id" id="w{{ work.id }}">Add this book to your wishlist.</span></a>{% else %}Ask your friends to add it to their favorites!{% endif %}</p>
<p>If you know of a Creative-Commons-licensed or US public domain edition of this book, you can add it through the <a href="{% url 'work' work.id %}?tab=4">More... tab of the book page</a>.</p>
</div>
</div>
{% endif %}
{% if xfer_url or can_kindle %}
<div class="one_click clearfix">
<h2 class="h4">One-click options</h2>
{% if mac_ibooks and xfer_url %}
<div id="mac_ibooks" title="{{ work.id }}" >
<div class="btn_support mac_ibooks"><a href="{{ xfer_url }}">Load to iBooks</a></div>
</div>
{% endif %}
{% if can_kindle %}
<div id="kindle_div">
{% if request.user.is_authenticated and request.user.profile.kindle_email %}
<div class="yes_js">
<div id="kindle" class="authenticated" title="{{ work.id }}" >
<a class="button success" >Send to Kindle</a>
</div>
</div>
<div class="no_js">
<form method="POST" action="{% url 'send_to_kindle' work.id 0 %}">
<input class="button success" type="submit" value="Send to Kindle">
</form>
</div>
{% else %}
<a class="button secondary" href="{% url 'kindle_config_download' work.id %}">Set up Send to Kindle </a>
{% endif %}
</div>
{% endif %}
{% if xfer_url %}
{% if iOS %}
<div id="marvin" title="{{ work.id }}" >
<a class="button success" href="marvinhttp://{{ xfer_url|urlencode }}">Load to Marvin</a>
</div>
{% endif %}
{% endif %}
{% if can_kindle %}{% if not request.user.is_authenticated %}
<div> You'll need an unglue.it account to <i>Send to Kindle</i>.</div>
{% endif %}{% endif %}
</div>
{% endif %}
<div class="clearfix"></div>
</div>
{% if unglued_ebooks or other_ebooks or acq %}
<div class="border">
<h3>Need instructions?</h3>
<div class="instructions">
<div id="iOS_app_div"{% if iOS_app %} class="active"{% endif %}>
<h2 class="h4">Need Instructions?</h2>
<ul class="accordion flex_ul" data-accordion data-allow-all-closed="true" data-multi-expand="true">
<li class="accordion-item {% if iOS_app %}is-active{% endif %}" data-accordion-item style="order: {% if iOS_app %} 0 {% else %} 1 {% endif %}">
<a href="#" class="accordion-title">iOS App</a>
<div class="accordion-content" data-tab-content>
<p>
Looks like you're using an embedded browser inside an iOS app. (Maybe you followed a link in Twitter or Facebook?)
</p>
@ -227,25 +234,27 @@ $j(document).ready(function() {
Not on iOS? Try the instructions for <a class="android other_instructions">Android</a>, <a class="desktop other_instructions">desktop computers</a>, or <a class="ereader other_instructions">ereaders (Kindle, Nook, Kobo, etc.)</a>.
</p>
</div>
<div id="ios_div"{% if iOS %}{% if not iOS_app %} class="active"{% endif %}{% endif %}>
</li>
<li class="accordion-item {% if iOS_app %}{% if not iOS_app %}is-active{% endif %}{% endif %}" data-accordion-item style="order: {% if iOS_app %}{% if not iOS_app %} 0 {% else %} 2 {% endif %} {% else %} 2 {% endif %}">
<a href="#" class="accordion-title">iOS</a>
<div class="accordion-content" data-tab-content>
<h4>iOS devices</h4>
{% if formats.epub %}
<p>
You may already have an app which reads ebooks. Download the <a href="{{ formats.epub }}">epub file</a> and see if you're offered an option for opening the file. If so, you're done! If not...
</p>
<p class="ebook_download logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<p class="logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<ul>
<li><a href="https://itunes.apple.com/us/app/ibooks/id364709193?mt=8">Download the free iBooks app</a> from the App Store.</li>
<li>Download the <a href="{{ formats.epub }}">epub file</a>.</li>
<li>You will be given the option of opening the file in iBooks.</li>
</ul>
<p class="ebook_download logo"><img src="/static/images/marvin_logo.jpg" alt="Marvin Logo" />Marvin is a great way to read ebooks. </p>
<p class="logo"><img src="/static/images/marvin_logo.jpg" alt="Marvin Logo" />Marvin is a great way to read ebooks. </p>
<ul>
<li><a href="https://itunes.apple.com/us/app/marvin-ebook-reader-for-epub/id667361209?ls=1&mt=8">Install Marvin</a> from the App Store.</li>
<li>Click the "Load to Marvin" button above.</li>
</ul>
<p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />So is Aldiko.</p>
<p class="logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />So is Aldiko.</p>
<ul>
<li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
@ -257,7 +266,7 @@ $j(document).ready(function() {
<p>
You may already have an app which reads ebooks. Download the <a href="{{ formats.pdf }}">pdf file</a> and see if you're offered an option for opening the file. If so, you're done! If not...
</p>
<p class="ebook_download logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<p class="logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<ul>
<li><a href="https://itunes.apple.com/us/app/ibooks/id364709193?mt=8">Download the free iBooks app</a> from the App Store.</li>
<li>Download the <a href="{{ formats.pdf }}">pdf file</a>.</li>
@ -280,14 +289,16 @@ $j(document).ready(function() {
Not on iOS? Try the instructions for <a class="android other_instructions">Android</a>, <a class="desktop other_instructions">desktop computers</a>, or <a class="ereader other_instructions">ereaders (Kindle, Nook, Kobo, etc.)</a>.
</p>
</div>
<div id="android_div"{% if android %} class="active"{% endif %}>
</li>
<li class="accordion-item {% if android %}is-active{% endif %}" data-accordion-item style="order: {% if android %} 0 {% else %} 3 {% endif %}">
<a href="#" class="accordion-title">Android</a>
<div class="accordion-content" data-tab-content>
<h4>Android devices</h4>
{% if formats.epub %}
<p>
You may already have an app which reads ebooks. Download the <a href="{{ formats.epub }}">epub file</a> and see if you're offered an option for opening the file. If so, you're done! If not...
</p>
<p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
<p class="logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
<ul>
<li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
@ -298,7 +309,7 @@ $j(document).ready(function() {
<p>
You may already have an app which reads ebooks. Download the <a href="{{ formats.pdf }}">pdf file</a> and see if you're offered an option for opening the file. If so, you're done! If not...
</p>
<p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
<p class="logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
<ul>
<li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
@ -322,8 +333,10 @@ $j(document).ready(function() {
Not on Android? Try the instructions for <a class="ios other_instructions">iPhone/iPad</a>, <a class="desktop other_instructions">desktop computers</a>, or <a class="ereader other_instructions">ereaders (Kindle, Nook, Kobo, etc.)</a>.
</p>
</div>
<div id="desktop_div"{% if desktop %} class="active"{% endif %}>
</li>
<li class="accordion-item {% if desktop %}is-active{% endif %}" data-accordion-item style="order: {% if desktop %} 0 {% else %} 4 {% endif %}">
<a href="#" class="accordion-title">Desktop</a>
<div class="accordion-content" data-tab-content>
<h4>Reading on a {% if mac_ibooks %}Mac{% else %}PC, Mac, or Linux{% endif %}</h4>
{% if formats.pdf %}
<p>
@ -331,13 +344,13 @@ $j(document).ready(function() {
</p>
{% elif formats.epub %}
{% if mac_ibooks %}
<p class="ebook_download logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<p class="logo"><img src="/static/images/ibooks_logo.jpg" alt="iBooks Logo" />iBooks</p>
<ul>
<li>The iBooks app is pre-installed with your system software.</li>
<li>Download the <a href="{{ formats.epub }}">epub file</a>. You should be offered the choice to open it in iBooks</li>
</ul>
{% endif %}
<p class="ebook_download logo"><img src="/static/images/calibre_logo.png" alt="Calibre Logo" />Calibre</p>
<p class="logo"><img src="/static/images/calibre_logo.png" alt="Calibre Logo" />Calibre</p>
<ul>
<li><a href="http://calibre-ebook.com/download">Download the free Calibre app.</a></li>
<li>Download the <a href="{{ formats.epub }}">epub file</a>.</li>
@ -345,7 +358,7 @@ $j(document).ready(function() {
<li>You can <a href="http://blog.marvinapp.com/post/53438723356">use a Calibre plugin</a> to manage files on reader apps.
</ul>
{% elif formats.mobi %}
<p class="ebook_download logo"><img src="/static/images/calibre_logo.png" alt="Calibre Logo" />Calibre</p>
<p class="logo"><img src="/static/images/calibre_logo.png" alt="Calibre Logo" />Calibre</p>
<ul>
<li><a href="http://calibre-ebook.com/download">Download the free Calibre app.</a></li>
<li>Download the <a href="{{ formats.mobi }}">mobi file</a>.</li>
@ -365,8 +378,10 @@ $j(document).ready(function() {
Not on a desktop computer, or want to "side-load" ebooks onto a device or app? Try the instructions for <a class="ios other_instructions">iPhone/iPad</a>, <a class="android other_instructions">Android</a>, or <a class="ereader other_instructions">ereaders (Kindle, Nook, Kobo, etc.)</a>.
</p>
</div>
<div id="ereader_div"{% if desktop %} class="active"{% endif %}>
</li>
<li class="accordion-item {% if desktop %}is-active{% endif %}" data-accordion-item style="order: {% if desktop %} 0 {% else %} 5 {% endif %}">
<a href="#" class="accordion-title">E-Readers</a>
<div class="accordion-content" data-tab-content>
<h4>Ereaders (Kindle, Nook, Kobo, etc.)</h4>
{% if formats.mobi or formats.pdf or formats.epub %}
@ -402,22 +417,29 @@ $j(document).ready(function() {
Not using an ereader? Try the instructions for <a class="ios other_instructions">iPhone/iPad</a>, <a class="android other_instructions">Android</a>, or <a class="desktop other_instructions">desktop computers</a>.
</p>
</div>
<div id="ereader_div" class="active">
</li>
<li class="accordion-item {% if desktop %}is-active{% endif %}" data-accordion-item style="order: {% if desktop %} 0 {% else %} 6 {% endif %}">
<a href="#" class="accordion-title">Dropbox</a>
<div class="accordion-content" data-tab-content>
<h4>Dropbox</h4>
<p class="other_instructions_paragraph"> Dropbox is a good way to share your ebooks between desktop, tablet and smartphone. If you see a dropbox button above, click it to load your books into your dropbox folder. Then load the file into your reader application on your device.
</p>
</div>
</div>
<br />
</li>
</ul>
<div class="download_footer card">
<h4>Need more help?</h4>
<p><a href="{% url 'feedback' %}?page={{request.build_absolute_uri|urlencode:""}}">Ask us a question!</a></p>
<div>
<a href="http://www.defectivebydesign.org/drm-free"><img src="/static/images/DRM-free150.png" alt="DefectiveByDesign.org" border="0" align="middle" /></a> All downloads from Unglue.it are DRM free. Hooray!
<a href="https://www.defectivebydesign.org/drm-free">
<img src="/static/images/DRM-free150.png" alt="DefectiveByDesign.org" border="0" align="middle" />
</a>
<span>
All downloads from Unglue.it are DRM free. Hooray!
</span>
</div>
</div>
{% else %}
{% endif %}
{% endif %}
</div>

2
settings/common.py
View File

@ -45,7 +45,7 @@ MEDIA_ROOT = ''
MEDIA_URL = '/media/'
# set once instead of in all the templates
JQUERY_HOME = "/static/js/jquery-1.7.1.min.js"
JQUERY_HOME = "/static/js/jquery-1.12.4.min.js"
JQUERY_UI_HOME = "/static/js/jquery-ui-1.8.16.custom.min.js"
CKEDITOR_UPLOAD_PATH = ''

5
static/js/jquery-1.12.4.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

5
static/js/sitewide1.js
View File

@ -48,8 +48,9 @@ $j(document).ready(function() {
new Foundation.DropdownMenu($j(element), {});
});
document.querySelectorAll('[data-responsive-menu]').forEach(element => {
new Foundation.ResponsiveToggle(element, {});
document.querySelectorAll('[data-accordion]').forEach(element => {
console.log(element);
new Foundation.Accordion($j(element), {'data-multi-expand': true});
});
});

164
static/scss/download.scss
View File

@ -1,85 +1,11 @@
@import "variables.scss";
@import "social_share.scss";
@import 'settings';
@import 'foundation';
.download_container {
width: 75%;
margin: auto;
}
#lightbox_content a {
color: $medium-blue;
}
#lightbox_content .signuptoday a {
color: white;
}
#lightbox_content h2, #lightbox_content h3, #lightbox_content h4 {
margin-top: 15px;
}
#lightbox_content h2 a {
font-size: $font-size-larger*1.25;
}
#lightbox_content .ebook_download {
a {
margin: auto 5px auto 0;
font-size: $font-size-larger;
}
img {
vertical-align: middle;
}
}
#lightbox_content .logo {
img {
@include one-border-radius(7px);
height: 50px;
width: 50px;
margin-right: 5px;
}
font-size: $font-size-larger;
}
#lightbox_content .one_click, #lightbox_content .ebook_download_container {
@include one-border-radius(5px);
margin-left: -.25%;
padding: 0.5%;
padding-bottom: 15px;
margin-bottom: 5px;
width: 74%;
h3 {
margin-top: 5px;
}
}
#lightbox_content .one_click {
border: solid 2px $call-to-action;
}
#lightbox_content .ebook_download_container {
border: solid 2px $blue-grey;
}
#lightbox_content a.add-wishlist .on-wishlist, #lightbox_content a.success, a.success:hover {
text-decoration: none;
color: $text-blue;
}
#lightbox_content a.success, a.success:hover {
cursor: default;
}
#lightbox_content ul {
padding-left: 50px;
li {
margin-bottom: 4px;
}
.download-body {
width: 100%;
}
.border {
@ -131,3 +57,85 @@
font-size: $font-size-larger;
}
}
//
.download_option.flexible {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
padding: 7px 5px;
i {
vertical-align: middle;
}
.h4 {
margin-bottom: 0px;
}
}
.ebook_download {
display: flex;
flex-direction: column;
}
.flex_ul {
display: flex;
flex-direction: column;
}
.askform {
max-width: 400px;
}
.download_footer {
padding: 15px;
}
.download_container {
margin: 0px 10px;
}
.dropbox_download_option {
min-width: 122px;
}
.download_option > * {
flex: 1;
}
.download-centered {
display: flex;
justify-content: center;
}
@include breakpoint (medium) {
.download_container {
width: 75%;
margin: auto;
}
#download_content {
display: flex;
flex-direction: row;
flex-wrap: wrap;
.rh_ask, #askblock {
padding: 15px;
flex: 1 0 50%;
}
}
.download-label {
display: flex;
flex-direction: row;
align-items: center;
}
}

7
static/scss/global.scss
View File

@ -85,3 +85,10 @@
margin-left: 0;
}
}
/* Utility classes */
.inline-block {
display: inline-block;
}

52
static/scss/sitewide4.scss
View File

@ -2,7 +2,6 @@
@import "variables.scss";
@import "mixins.scss";
@import "download.scss";
@import "buttons.scss";
@import "bootstrap-social.scss";
@import "font-awesome.min.css";
@ -876,38 +875,10 @@ li.checked {
}
}
.one_click {
float: left;
& > div {
float: left;
#kindle a, .kindle a , #marvin a, .marvin a, #mac_ibooks a, .mac_ibooks a{
font-size: $font-size-larger;
padding: 9px 0;
}
div {
margin: 0 10px 0 0;
}
}
}
.ebook_download_container {
clear: left;
}
.other_instructions_paragraph {
display: none;
}
#iOS_app_div, #ios_div {
/* JS overrides display: none on instructions if it's enabled
if JS isn't enabled, they are not on an iOS device, so no need to
clutter up the download instructions with this
*/
display: none;
}
.yes_js {
display: none;
}
@ -917,34 +888,11 @@ li.checked {
font-size: 15px;
}
.contrib_amount {
padding: 10px;
font-size: $font-size-header;
text-align: center;
}
#id_preapproval_amount {
width: 50%;
line-height: 30px;
font-size: $font-size-larger;
}
#askblock {
float:right;
min-width:260px;
background: $pale-blue;
padding: 10px;
width:30%
}
.rh_ask {
font-size: $font-size-larger;
width:65%;
}
#contribsubmit {
text-align: center;
font-size: $font-size-header;
margin: 0 0 10px;
cursor: pointer;
}
#anoncontribbox {
padding-bottom: 10px;
}