Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-show DAISY on books page with ocaid when no read/borrow options #723

Merged
merged 5 commits into from
Jan 10, 2018
Merged

Re-show DAISY on books page with ocaid when no read/borrow options #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24071e0
addresses #721, shows daisy download if there's an ocaid but no lendi…
mekarpeles Jan 4, 2018
d6499d5
fixing and simplifying editions page re: @tfmorris's code review
mekarpeles Jan 7, 2018
f6d9ce5
fixed loanstatus to check if borrowable if not editions_page
mekarpeles Jan 7, 2018
b8e32b8
reducing duplicate worldcat code
mekarpeles Jan 7, 2018
a82a6ad
fixing loan status if no ocaid, was showing daisy download link
mekarpeles Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions openlibrary/macros/DownloadOptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
$def with(page)

$ downloadbook = page.get_ia_download_link(".pdf")
$ pdfbw = page.get_ia_download_link("_bw.pdf")
$ epub = page.get_ia_download_link(".epub")
$ mobi = page.get_ia_download_link(".mobi")
$ kindle = "https://www.amazon.com/gp/digital/fiona/web-to-kindle?clientid=IA&itemid=XXX&docid=XXX"
$ djvutxt = page.get_ia_download_link("_djvu.txt")

$if downloadbook or djvutxt or epub or mobi:
<hr>
<div class="cta-section">
<p class="cta-section-title">Download Options</p>
<ul class="ebook-download-options">
$if downloadbook:
<li><a href="$downloadbook" title="Download a PDF from Internet Archive">PDF</a></li>
$if djvutxt:
<li><a href="$djvutxt" title="Download a text version from Internet Archive">Plain text</a></li>
$if epub:
<li><a href="$epub" title="Download an ePub from Internet Archive">ePub</a></li>
$if mobi:
<li><a href="$mobi" title="Download a MOBI file from Internet Archive">MOBI</a></li>
</ul>
</div>
161 changes: 77 additions & 84 deletions openlibrary/macros/LoanStatus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
$def with (page, ebook_text, user, current_and_available_loans, contributor, line_break = '', editions_page=False, isbn=None, oclc_numbers=None)

$# TODO construct list of available formats from available_loans
$def with (page, user, editions_page=False)

$ work = page.works and page.works[0]

$if current_and_available_loans:
$ current_loans = current_and_available_loans[0]
$else:
$ current_loans = []

$ meta_fields = page.get_ia_meta_fields() or {}
$ contributor = meta_fields.get('contributor')
$ user_loan = None
$ waiting_loan = ctx.user and ctx.user.get_waiting_loan_for(page)
$ my_turn_to_borrow = waiting_loan and waiting_loan['status'] == 'available' and waiting_loan['position'] == 1
$ realtime_availability = page.get_realtime_availability()
$ availability = realtime_availability.get('status', 'error')
$ wlsize = realtime_availability.get('num_waitlist', 0)
$ waiting_loan = ctx.user and ctx.user.get_waiting_loan_for(page)
$ my_turn_to_borrow = waiting_loan and waiting_loan['status'] == 'available' and waiting_loan['position'] == 1
$ current_and_available_loans = []

$if page.get('ocaid'):
$ current_and_available_loans = page.get_current_and_available_loans()
$ user_loan = None
$if ctx.user:
$for current_loan in current_and_available_loans[0]:
$if current_loan['user'] == ctx.user.key:
$ user_loan = current_loan
$ break
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SUGGESTION: No space needed, I think, between $ and break.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this may be required, otherwise it treats break as a variable, I think this is a weird quirk (http://webpy.org/templetor)


$ current_loans = current_and_available_loans[0] if current_and_available_loans else []

$ user_loan = None
$if user:
$for current_loan in current_loans:
$if current_loan['user'] == user.key:
Expand All @@ -25,81 +30,69 @@

$ borrow_link = page.url() + '/borrow'

<div class="btn-notice" id="read-options">
$if user_loan:
<p>
<a href="$borrow_link" title="Borrow from $contributor"
data-userid="$(user_loan['userid'])" id="read_ebook"
class="borrow-btn borrow-link">Read eBook</a>
</p>
$ return_url = page.url().rsplit('/', 1)[0] + '/do_return/borrow'
<form action="$return_url" method="post" class="waitinglist-form return-book">
<input type="hidden" name="action" value="return" />
<input type="submit" value="Return eBook" class="submit unwait-btn" id="return_ebook"/>
</form>
$:macros.daisy(page)
$if user_loan:
<p>
<a href="$borrow_link" title="Borrow from $contributor"
data-userid="$(user_loan['userid'])" id="read_ebook"
class="borrow-btn borrow-link">Read eBook</a>
</p>
$ return_url = page.url().rsplit('/', 1)[0] + '/do_return/borrow'
<form action="$return_url" method="post" class="waitinglist-form return-book">
<input type="hidden" name="action" value="return" />
<input type="submit" value="Return eBook" class="submit unwait-btn" id="return_ebook"/>
</form>

$elif (availability == 'borrow_available') or my_turn_to_borrow:
<p>
<a href="$borrow_link" title="Borrow from $contributor" id="borrow_ebook" class="borrow-btn borrow-link">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QUESTION: Do we need to html-escape and/or quote-escape $contributor?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No -- if we ran $: this would render the block as html. Using $ by itself should safely escape

Borrow eBook
</a>
</p>

$elif (availability == 'borrow_unavailable'):
$if waiting_loan:
<p>
$ spot = ctx.user.get_waiting_loan_for(page)['position']
$if spot == 1:
You are <strong>next</strong> on the waiting list
$else:
You are <strong>#$(spot)</strong> of $(wlsize) on the waiting list.
</p>
<form method="POST" action="$borrow_link" class="leave-waitlist waitinglist-form">
<input type="hidden" name="action" value="leave-waitinglist"/>
<input type="submit" class="submit unwait-btn" id="unwaitlist_ebook" value="Leave waiting list"/>
</form>

$elif (availability == 'borrow_available') or my_turn_to_borrow:
<p>
<a href="$borrow_link" title="Borrow from $contributor" id="borrow_ebook" class="borrow-btn borrow-link">
Borrow eBook
</a>
</p>
$:macros.daisy(page)
$else:
<p>
$("Readers waiting for this title: %s" % wlsize if wlsize else "You'll be next in line.")
</p>
<form method="POST" action="$borrow_link" class="join-waitlist waitinglist-form">
<input type="hidden" name="action" value="join-waitinglist"/>
<input type="submit" class="submit wait-btn" id="waitlist_ebook" value="Join waiting list"/>
</form>

$else:
$if waiting_loan:
<p>
$ spot = ctx.user.get_waiting_loan_for(page)['position']
$if spot == 1:
You are <strong>next</strong> on the waiting list
$else:
You are <strong>#$(spot)</strong> of $(wlsize) on the waiting list.
</p>
<form method="POST" action="$borrow_link" class="leave-waitlist waitinglist-form">
<input type="hidden" name="action" value="leave-waitinglist"/>
<input type="submit" class="submit unwait-btn" id="unwaitlist_ebook" value="Leave waiting list"/>
</form>
$:macros.daisy(page)
$else:
<p>
$("Readers waiting for this title: %s" % wlsize if wlsize else "You'll be next in line.")
</p>
<form method="POST" action="$borrow_link" class="join-waitlist waitinglist-form">
<input type="hidden" name="action" value="join-waitinglist"/>
<input type="submit" class="submit wait-btn" id="waitlist_ebook" value="Join waiting list"/>
</form>
$:macros.daisy(page)
$elif page.get('ocaid') and not page.is_access_restricted() and editions_page:
$ viewbook = "//%s/stream/XXX?ref=ol" % bookreader_host()
<p class="primary-cta"><a href="$viewbook.replace('XXX', page.ocaid)" title="Use BookReader to read online" class="read-btn">Read eBook</a></p>

$if editions_page:
$ checkedout = current_and_available_loans[0] if current_and_available_loans else []
$if checkedout and not user_loan:
$if work and work.edition_count > 1:
<div class="check-availability">
<p>
Other editions of this book may be available:
</p>
<p class="check-other-editions">
<a data-ol-link-track="EditionPageCheckOtherEditionsButton" href="$work.url()">Check Other Editions</a>
</p>
</div>
$elif (not page.get('ocaid') or page.is_access_restricted()) and editions_page:
<p class="smaller">No ebook available.</p>

$if editions_page:
$:macros.WorldcatLink(isbn=isbn, oclc_numbers=oclc_numbers)

$if editions_page:
$ share_links = ctx.get('share_links')
$if share_links:
<hr>
<div class="shareLinks cta-section">
<p class="cta-section-title">Share this book</p>
<ul class="shareLinks-list">
$for share_link in share_links:
$ track_tag = share_link['text'].replace(' ', '-')
<li>
<a href="$share_link['url']" class="sansserif large" target="_blank" data-ol-link-track="Share|$track_tag"><img alt="$(share_link['text'])" class="share-link" src="/static/images/$(share_link['text'].lower()).svg"/></a>
</li>
</ul>
</div>
$if editions_page and page.get('ocaid'):
$:macros.daisy(page)

</div>
$# If waitlisted, show other possible editions after daisy download link
$if (availability == 'borrow_unavailble'):
$ checkedout = current_and_available_loans[0] if current_and_available_loans else []
$if checkedout and not user_loan:
$if work and work.edition_count > 1:
<div class="check-availability">
<p>
Other editions of this book may be available:
</p>
<p class="check-other-editions">
<a data-ol-link-track="EditionPageCheckOtherEditionsButton" href="$work.url()">Check Other Editions</a>
</p>
</div>
15 changes: 15 additions & 0 deletions openlibrary/macros/SocialShare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$def with()

$ share_links = ctx.get('share_links')
$if share_links:
<hr>
<div class="shareLinks cta-section">
<p class="cta-section-title">Share this book</p>
<ul class="shareLinks-list">
$for share_link in share_links:
$ track_tag = share_link['text'].replace(' ', '-')
<li>
<a href="$share_link['url']" class="sansserif large" target="_blank" data-ol-link-track="Share|$track_tag"><img alt="$(share_link['text'])" class="share-link" src="/static/images/$(share_link['text'].lower()).svg"/></a>
</li>
</ul>
</div>
15 changes: 8 additions & 7 deletions openlibrary/macros/daisy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

$ daisy = page.get_ia_download_link("_daisy.zip")

<p class="print-disabled-download">
<a href="$page.url('/daisy')" title="Download Protected DAISY">
<meta itemprop="bookFormat" content="EBook/DAISY3"/>
Download ebook for print-disabled
<img src="/images/icons/icon-encrypto-sm.png" class="daisy-lock" width="8" height="12" alt="Download Protected DAISY"/>
</a>
</p>
$if daisy:
<p class="print-disabled-download">
<a href="$page.url('/daisy')" title="Download Protected DAISY">
<meta itemprop="bookFormat" content="EBook/DAISY3"/>
Download ebook for print-disabled
<img src="/images/icons/icon-encrypto-sm.png" class="daisy-lock" width="8" height="12" alt="Download Protected DAISY"/>
</a>
</p>
Loading