-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9734 from merwhite11/1001/fulltext-search-box
Fulltext Suggestion Macro for 0 Results
- Loading branch information
Showing
19 changed files
with
571 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -102,7 +102,7 @@ | |
| }, | ||
| { | ||
| "path": "static/build/page-user.css", | ||
| "maxSize": "27KB" | ||
| "maxSize": "27.05KB" | ||
| } | ||
| ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| $def with(query, results, page=1) | ||
|
|
||
| $def render_snippet(query, doc): | ||
| $:macros.FulltextSuggestionSnippet(query, doc=doc) | ||
|
|
||
| $if results and results.get('hits'): | ||
| $ hits = results['hits'].get('hits', [])[:4] | ||
| $ num_found = commify(results['hits'].get('total', 0)) | ||
| $ ia_base_url = "https://archive.org" | ||
|
|
||
| $:macros.LoadingIndicator(_("Checking for Search Inside matches")) | ||
| <div id="fulltextSuggestions" class="fulltext-suggestions"> | ||
| <div class="fulltext-suggestions__header"> | ||
| <a class="fulltext-suggestions__icon" data-ol-link-track="SearchInsideSuggestion|SeeAllClick" href="/search/inside?$urlencode(dict(q=query))" title="$_('Search Inside Icon')"> | ||
| <img src="/static/images/icons/icon_search-inside.svg" | ||
| width="30" height="30" | ||
| alt="$_('search inside icon')"/> | ||
| </a> | ||
| <h3 class="fulltext-suggestions__title"> | ||
| <a data-ol-link-track="SearchInsideSuggestion|SeeAllClick" | ||
| href="/search/inside?$urlencode(dict(q=query))">$_("Search Inside")</a> — $_('%(book_count)s books found with matching passages', book_count=num_found) | ||
| </h3> | ||
| </div> | ||
| $for doc in hits: | ||
| $if doc.get('edition'): | ||
| $:macros.FulltextSearchSuggestionItem(doc['edition'], snippet=render_snippet(query, doc)) | ||
| <h3 class="fulltext-suggestions__footer"> | ||
| <a class="fulltext-suggestions__footer-link" data-ol-link-track="SearchInsideSuggestion|SeeAllClick" | ||
| href="/search/inside?$urlencode(dict(q=query))">$_('See all %(results_count)s Search Inside Matches', results_count=num_found) | ||
| <span class="fulltext-suggestions__right-chevron"> | ||
| <img src="/static/images/icons/right-chevron.svg" alt="$_('right chevron')"/> | ||
| </span> | ||
| </a> | ||
| </h3> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| $def with (doc, snippet=None, attrs=None, blur=False) | ||
|
|
||
| $code: | ||
| max_rendered_authors = 9 | ||
| doc_type = ( | ||
| 'infogami_work' if doc.get('type', {}).get('key') == '/type/work' else | ||
| 'infogami_edition' if doc.get('type', {}).get('key') == '/type/edition' else | ||
| 'solr_work' if not doc.get('editions') else | ||
| 'solr_edition' | ||
| ) | ||
|
|
||
| selected_ed = doc | ||
| if doc_type == 'solr_edition': | ||
| selected_ed = doc.get('editions')[0] | ||
|
|
||
| book_url = doc.url() if doc_type.startswith('infogami_') else doc.key | ||
| if doc_type == 'solr_edition': | ||
| work_edition_url = book_url + '?edition=' + urlquote('key:' + selected_ed.key) | ||
| else: | ||
| book_provider = get_book_provider(doc) | ||
| if book_provider and doc_type.endswith('_work'): | ||
| work_edition_url = book_url + '?edition=' + urlquote(book_provider.get_best_identifier_slug(doc)) | ||
| else: | ||
| work_edition_url = book_url | ||
|
|
||
| work_edition_all_url = work_edition_url | ||
| if '?' in work_edition_url: | ||
| work_edition_all_url += '&mode=all' | ||
| else: | ||
| work_edition_all_url += '?mode=all' | ||
|
|
||
| edition_work = None | ||
| if doc_type == 'infogami_edition' and 'works' in doc: | ||
| edition_work = doc['works'][0] | ||
|
|
||
| full_title = selected_ed.get('title', '') + (': ' + selected_ed.subtitle if selected_ed.get('subtitle') else '') | ||
| if doc_type == 'infogami_edition' and edition_work: | ||
| full_work_title = edition_work.get('title', '') + (': ' + edition_work.subtitle if edition_work.get('subtitle') else '') | ||
| else: | ||
| full_work_title = doc.get('title', '') + (': ' + doc.subtitle if doc.get('subtitle') else '') | ||
|
|
||
| $ blur_cover = "fsi__bookcover-img-blur" if blur else "" | ||
|
|
||
| <div class="fsi" itemscope itemtype="https://schema.org/Book" $:attrs> | ||
| <div class="fsi__main"> | ||
| <span class="fsi__book-cover"> | ||
| $ cover = get_cover_url(selected_ed) or "/images/icons/avatar_book-sm.png" | ||
| <a data-ol-link-track="SearchInsideSuggestion|BookClick" href="$work_edition_url"> | ||
| <img class="fsi__book-cover-img $blur_cover" | ||
| itemprop="image" | ||
| src="$cover" | ||
| alt="$_('Cover of: %(title)s', title=full_title)" | ||
| title="$_('Cover of: %(title)s', title=full_title)" /> | ||
| </a> | ||
| </span> | ||
| <div class="fsi__book-details"> | ||
| <div class="fsi__title-author"> | ||
| <h3 class="fsi__book-title" itemprop="name"> | ||
| <a itemprop="url" data-ol-link-track="SearchInsideSuggestion|BookClick" href="$work_edition_url">$full_title</a> | ||
| </h3> | ||
| <p class="fsi__book-author" itemprop="author" itemscope itemtype="https://schema.org/Organization"> | ||
| $ authors = None | ||
| $if doc_type == 'infogami_work': | ||
| $ authors = doc.get_authors() | ||
| $elif doc_type == 'infogami_edition': | ||
| $ authors = edition_work.get_authors() if edition_work else doc.get_authors() | ||
| $elif doc_type.startswith('solr_'): | ||
| $if 'authors' in doc: | ||
| $ authors = doc['authors'] | ||
| $elif 'author_key' in doc: | ||
| $ authors = [ { 'key': '/authors/' + key, 'name': name } for key, name in zip(doc['author_key'], doc['author_name']) ] | ||
| $if not authors: | ||
| <em>$_('Unknown author')</em> | ||
| $else: | ||
| $code: | ||
| author_data = [ | ||
| { | ||
| 'name': a.get('name') or a.get('author', {}).get('name'), | ||
| 'url': (a.get('url') or a.get('key') or a.get('author', {}).get('url') or a.get('author', {}).get('key')) | ||
| } | ||
| for a in authors | ||
| ] | ||
| $:macros.BookByline(author_data, limit=max_rendered_authors, overflow_url=work_edition_url, attrs='class="results"') | ||
| </p> | ||
| </div> | ||
| $if snippet: | ||
| $:snippet | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| $def with (q, doc=None) | ||
|
|
||
| $ ia = doc.get('fields', {}).get('identifier', [''])[0] | ||
| $ ia_base_url = "https://archive.org" | ||
| $ availability = doc.get('availability', {}) | ||
| $ snippet = doc.get('highlight', {}).get('text', [''])[0] | ||
| $ page_nums = doc.get('fields', {}).get('page_num', []) | ||
| $if len(page_nums) == 1 and isinstance(page_nums[0], list): | ||
| $ page_nums = page_nums[0] | ||
| $ page = ', '.join(str(num) for num in page_nums) | ||
|
|
||
| $if snippet: | ||
| <div class="fsi-snippet"> | ||
| $if snippet: | ||
| <div class="fsi-snippet__main"> | ||
| <div class="fsi-snippet__quotation-mark">$_('❝')</div> | ||
| <a class="fsi-snippet__link" href="$ia_base_url/details/$ia" data-ol-link-track="SearchInsideSuggestion|QuoteClick"> | ||
| …$:(snippet.replace("<", "«").replace(">", "»").replace("{{{", "<mark class='highlight'><strong>").replace("}}}", "</strong></mark>"))… | ||
| </a> | ||
| <div class="fsi-snippet__quotation-mark">$_('❞')</div> | ||
| $if page: | ||
| <div class="fsi-snippet__page-num" href="$ia_base_url/details/$ia"> | ||
| <a data-ol-link-track="SearchInsideSuggestion|QuoteClick">$_('Page: %(page)s', page=page)</a> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.