Great
book
Excellent
", + CreatedAt: time.Date(2026, 10, 30, 0, 0, 0, 0, time.UTC), URL: "https://example.org/reviews/review-1", + }}, + }, + } + app, _ := newReviewProviderTestApp(t, provider) + searchPage := getPage(t, app, "/search?type=documents&search=La") + if !strings.Contains(searchPage.Find(`fieldset legend`).Text(), "Another service score") || + searchPage.Find(`#sort-by option[value="review-score-asc"]`).Text() != "Another service score (ascending)" { + t.Fatal("search filters and sort options must use the active review provider's name") + } + if searchPage.Find(`#list a[href="https://example.org/books/book-1"]`).Length() != 1 || + searchPage.Find(`#list a[href^="https://www.goodreads.com/book/"]`).Length() != 0 { + t.Fatal("cached search-result scores must use the configured provider") + } + // This document has a cached Goodreads non-match; it must still use the chosen provider. + detail := getBody(t, app, "/documents/unmatched") + if documentScorePlaceholders(t, detail).Length() != 1 || len(provider.scoreSlugs) != 0 || len(provider.reviewSlugs) != 0 { + t.Fatal("detail must defer lookups to the selected provider") + } + for _, path := range []string{"/documents/unmatched/score"} { + body := getBody(t, app, path) + page, err := goquery.NewDocumentFromReader(strings.NewReader(body)) + if err != nil { + t.Fatal(err) + } + link := page.Find(`li a[href="https://example.org/books/book-1"]`) + if link.Text() != "4.5" || !strings.Contains(body, "Another service rating") || strings.Contains(body, "goodreads.com") { + t.Fatalf("score must use the selected provider's labels, value and URL: %s", body) + } + } + body := getBody(t, app, "/documents/unmatched/reviews") + page, err := goquery.NewDocumentFromReader(strings.NewReader(body)) + if err != nil { + t.Fatal(err) + } + if page.Find("h2").Text() != "Another service user reviews" || + page.Find(`a[href="https://example.org/reviews/review-1"] time[datetime="2026-10-30"]`).Length() != 1 || + page.Find("article strong").Text() != "Reader" || + page.Find("i.bi-star-fill").Length() != 5 || page.Find("script").Length() != 0 { + t.Fatalf("reviews must render normalized provider data safely: %s", body) + } + if len(provider.scoreSlugs) != 1 || len(provider.reviewSlugs) != 1 || provider.reviewSlugs[0] != "unmatched" { + t.Fatal("expected calls through the provider interface") + } + if len(provider.reviewLanguages) != 1 || provider.reviewLanguages[0] != "en" { + t.Fatalf("expected the current UI language to reach alternative providers, got %q", provider.reviewLanguages) + } +} + +func TestDocumentScoreMarksZeroWithoutValuationsAsNotScored(t *testing.T) { + for _, tt := range []struct { + name string + count string + wantScore string + wantScored bool + }{ + {name: "zero valuations", count: "0", wantScore: "Not scored"}, + {name: "valuations exist", count: "650", wantScore: "0.00", wantScored: true}, + } { + t.Run(tt.name, func(t *testing.T) { + provider := &fakeReviewProvider{ + score: datasourcemodel.Score{ + Source: "Another service", Value: "0.00", Count: tt.count, + URL: "https://example.org/books/book-1", + }, + } + app, _ := newReviewProviderTestApp(t, provider) + page := getPage(t, app, "/documents/unmatched/score") + row := page.Find("li") + if tt.wantScored { + if got := strings.TrimSpace(row.Find("a").Text()); got != tt.wantScore { + t.Fatalf("expected score %q, got %q", tt.wantScore, got) + } + return + } + if got := strings.TrimSpace(row.Text()); got != tt.wantScore || row.Find("a").Length() != 0 { + t.Fatalf("expected unlinked %q label, got %q", tt.wantScore, got) + } + }) + } +} + +func newReviewProviderTestApp(t *testing.T, provider document.ReviewProvider) (*fiber.App, *index.BleveIndexer) { + t.Helper() + return newDataSourceProvidersTestApp(t, nil, provider, nil) +} + +func getBody(t *testing.T, app *fiber.App, path string) string { + t.Helper() + req := mustGetRequest(t, path) + req.Header.Set("Accept-Language", "en") + response, err := app.Test(req) + if err != nil { + t.Fatal(err) + } + defer response.Body.Close() + if response.StatusCode != http.StatusOK { + t.Fatalf("%s: status = %d, want %d", path, response.StatusCode, http.StatusOK) + } + body, err := io.ReadAll(response.Body) + if err != nil { + t.Fatal(err) + } + return string(body) +} + +func getPage(t *testing.T, app *fiber.App, path string) *goquery.Document { + t.Helper() + page, err := goquery.NewDocumentFromReader(strings.NewReader(getBody(t, app, path))) + if err != nil { + t.Fatal(err) + } + return page +} + +func documentScorePlaceholders(t *testing.T, html string) *goquery.Selection { + t.Helper() + page, err := goquery.NewDocumentFromReader(strings.NewReader(html)) + if err != nil { + t.Fatal(err) + } + return page.Find(`li[hx-get$="/score"]`) +} + +func TestDocumentReviewFractionalStars(t *testing.T) { + for _, tt := range []struct { + rating float64 + full int + empty int + width int + }{ + {rating: 0}, + {rating: 0.25, empty: 4, width: 25}, + {rating: 3.5, full: 3, empty: 1, width: 50}, + {rating: 4.25, full: 4, width: 25}, + {rating: 4.75, full: 4, width: 75}, + {rating: 4, full: 4, empty: 1}, + {rating: 5, full: 5}, + } { + t.Run(fmt.Sprint(tt.rating), func(t *testing.T) { + provider := &fakeReviewProvider{ + score: datasourcemodel.Score{Source: "Another service"}, + page: datasourcemodel.ReviewPage{Source: "Another service", Available: true, Reviews: []datasourcemodel.Review{ + {Reviewer: "Reader", Rating: tt.rating}, + }}, + } + app, _ := newReviewProviderTestApp(t, provider) + page := getPage(t, app, "/documents/linked/reviews") + stars := page.Find(`article span[role="img"]`) + if tt.rating == 0 { + if stars.Length() != 0 { + t.Fatal("unrated reviews must not display stars") + } + if page.Find("article header span.text-muted").Text() != "Not scored" { + t.Fatal("unrated reviews must display Not scored") + } + return + } + if page.Find("article header span.text-muted").Length() != 0 { + t.Fatal("scored reviews must not display the unrated label") + } + if label, _ := stars.Attr("aria-label"); label != fmt.Sprintf("%g/5", tt.rating) { + t.Fatalf("expected exact accessible rating, got %q", label) + } + if stars.ChildrenFiltered("i.bi-star-fill").Length() != tt.full || + stars.ChildrenFiltered("i.bi-star").Length() != tt.empty || + stars.Children().Length() != 5 { + t.Fatalf("unexpected full/empty star counts: %s", stars.Text()) + } + partial := stars.Find(".review-star-fill") + if tt.width == 0 { + if partial.Length() != 0 { + t.Fatal("whole ratings must not include a partial star") + } + } else if style, _ := partial.Attr("style"); style != fmt.Sprintf("width: %d%%", tt.width) || + stars.Find(`.review-star[aria-hidden="true"]`).Length() != 1 { + t.Fatalf("expected a %d%% decorative star fill, got %q", tt.width, style) + } + }) + } +} + +func TestDocumentReviewNotScoredTranslations(t *testing.T) { + provider := &fakeReviewProvider{ + score: datasourcemodel.Score{Source: "Another service"}, + page: datasourcemodel.ReviewPage{Source: "Another service", Available: true, Reviews: []datasourcemodel.Review{ + {Reviewer: "Reader", Text: "A review without a rating"}, + }}, + } + app, _ := newReviewProviderTestApp(t, provider) + for _, tt := range []struct { + lang string + text string + }{ + {"en", "Not scored"}, + {"de", "Nicht bewertet"}, + {"es", "Sin puntuar"}, + {"fr", "Non noté"}, + {"ru", "Не оценено"}, + } { + t.Run(tt.lang, func(t *testing.T) { + page := getPage(t, app, "/documents/linked/reviews?l="+tt.lang) + if got := page.Find("article header span.text-muted").Text(); got != tt.text { + t.Fatalf("expected %q, got %q", tt.text, got) + } + }) + } +} + +func TestDocumentScoreNoScoreTranslations(t *testing.T) { + provider := &fakeReviewProvider{score: datasourcemodel.Score{Source: "Another service"}} + app, _ := newReviewProviderTestApp(t, provider) + for _, locale := range []struct { + lang string + text string + }{ + {"en", "Not scored"}, + {"es", "Sin puntuar"}, + {"de", "Nicht bewertet"}, + {"fr", "Non noté"}, + {"ru", "Не оценено"}, + } { + for _, path := range []string{"/documents/unmatched/score"} { + t.Run(locale.lang+path, func(t *testing.T) { + req := mustGetRequest(t, path) + req.Header.Set("Accept-Language", locale.lang) + response, err := app.Test(req) + if err != nil { + t.Fatal(err) + } + + defer response.Body.Close() + mustReturnStatus(response, http.StatusOK, t) + page, err := goquery.NewDocumentFromReader(response.Body) + if err != nil { + t.Fatal(err) + } + score := page.Find("li").FilterFunction(func(_ int, item *goquery.Selection) bool { + return item.Find("i.bi-star-fill").Length() == 1 + }) + if strings.TrimSpace(score.Text()) != locale.text || score.Find("a").Length() != 0 { + t.Fatalf("expected localized no-score row %q, got %q", locale.text, score.Text()) + } + }) + } + } + if len(provider.reviewSlugs) != 0 { + t.Fatal("score requests must not fetch reviews") + } +} + +func TestDocumentReviewsLazyPlaceholder(t *testing.T) { + provider := &fakeReviewProvider{ + score: datasourcemodel.Score{Source: "Another service", Value: "3.82", URL: "https://example.org/books/book-1"}, + documentURL: "https://example.org/books/book-1", + } + app, _ := newReviewProviderTestApp(t, provider) + page := getPage(t, app, "/documents/linked") + target := page.Find("#document-reviews-linked") + if target.Length() != 1 || target.Is("[hx-get]") { + t.Fatal("expected an inactive reviews target before the rating loads") + } + if target.Find("h2").Text() != "Another service user reviews" { + t.Fatal("expected the reviews heading before the score loads") + } + if !target.Is(".document-detail-content > :last-child") { + t.Fatal("reviews must appear at the bottom of the document content") + } + page = getPage(t, app, "/documents/linked/score") + placeholder := page.Find(`#document-reviews-linked[hx-get="/documents/linked/reviews"][hx-trigger="intersect once"][hx-swap-oob="outerHTML"]`) + if placeholder.Length() != 1 { + t.Fatal("expected successful rating to enable reviews on intersection only") + } + if placeholder.Find("h2").Text() != "Another service user reviews" || placeholder.Find(`[aria-hidden="true"] h2`).Length() != 0 { + t.Fatal("the reviews heading must remain visible and accessible while reviews load") + } + skeletons := placeholder.Find(".border-top") + if skeletons.Length() != 2 || placeholder.Find(`div[aria-hidden="true"]`).Length() != 1 { + t.Fatal("expected two decorative review-shaped skeletons") + } + skeletons.Each(func(i int, skeleton *goquery.Selection) { + if skeleton.Find(".fs-5 .placeholder").Length() != 1 || + skeleton.Find("i.bi-star").Length() != 5 || + skeleton.Find(".placeholder.ms-auto").Length() != 1 || + skeleton.ChildrenFiltered("div").Length() != 6 { + t.Errorf("skeleton %d must include a name, five stars, a date and five text lines", i) + } + }) + if len(provider.reviewSlugs) != 0 { + t.Fatal("page and rating requests must not fetch reviews") + } +} + +func TestDocumentReviewsHeader(t *testing.T) { + for _, tt := range []struct { + name string + provider *fakeReviewProvider + slug string + want int + }{ + {name: "matched", provider: &fakeReviewProvider{documentURL: "https://example.org/books/book-1"}, slug: "linked", want: 1}, + {name: "zero score", provider: &fakeReviewProvider{score: datasourcemodel.Score{Value: "0.00"}, documentURL: "https://example.org/books/book-1"}, slug: "linked", want: 1}, + {name: "unavailable", provider: &fakeReviewProvider{scoreErr: errors.New("unavailable"), documentURL: "https://example.org/books/book-1"}, slug: "linked", want: 1}, + {name: "disabled", slug: "linked"}, + {name: "unmatched", provider: &fakeReviewProvider{}, slug: "unmatched"}, + {name: "not looked up", provider: &fakeReviewProvider{}, slug: "unlinked"}, + } { + t.Run(tt.name, func(t *testing.T) { + var provider document.ReviewProvider + if tt.provider != nil { + tt.provider.score.Source = "Another service" + provider = tt.provider + } + app, _ := newReviewProviderTestApp(t, provider) + page := getPage(t, app, "/documents/"+tt.slug) + header := page.Find(`#document-reviews-` + tt.slug + ` h2 a`) + if header.Length() != tt.want { + t.Fatalf("expected %d reviews headings, got %d", tt.want, header.Length()) + } + if tt.want == 1 { + url, _ := header.Attr("href") + if header.Text() != "Another service user reviews" || url != "https://example.org/books/book-1" { + t.Fatal("expected a linked provider reviews heading") + } + } + if tt.provider != nil && (len(tt.provider.scoreSlugs) != 0 || len(tt.provider.reviewSlugs) != 0) { + t.Fatal("rendering the heading must not make any API calls") + } + }) + } +} + +func TestDocumentReviewsDisabled(t *testing.T) { + app, _ := newReviewProviderTestApp(t, nil) + if getPage(t, app, "/background-progress").Find(".alert").Length() != 0 { + t.Fatal("disabled providers must not show incomplete review progress") + } + for _, slug := range []string{"linked", "unlinked", "unmatched"} { + body := getBody(t, app, "/documents/"+slug) + if got := documentScorePlaceholders(t, body).Length(); got != 0 { + t.Errorf("%s: expected no placeholder when reviews are disabled, got %d", slug, got) + } + if body := strings.TrimSpace(getBody(t, app, "/documents/"+slug+"/score")); body != "" { + t.Errorf("%s: expected empty response, got %q", slug, body) + } + if strings.Contains(body, "bi-star-fill") { + t.Errorf("%s: expected no score row when integration is disabled", slug) + } + if strings.Contains(body, `id="document-reviews-`) { + t.Errorf("%s: expected no reviews target when integration is disabled", slug) + } + } +} + +func TestDocumentScoreRendersNothingWhenUnavailable(t *testing.T) { + provider := &fakeReviewProvider{scoreErr: errors.New("unavailable")} + app, _ := newReviewProviderTestApp(t, provider) + if body := strings.TrimSpace(getBody(t, app, "/documents/linked/score")); body != "" { + t.Errorf("expected empty response, got %q", body) + } +} + +func TestDocumentReviewLinkEditor(t *testing.T) { + provider := &fakeReviewProvider{ + score: datasourcemodel.Score{Source: "Another service", Value: "3.82", URL: "https://example.org/books/book-1"}, + documentURL: "https://example.org/books/book-1", + canEditDocumentLink: true, + } + app, _ := newReviewProviderTestApp(t, provider) + adminCookie, err := login(app, "admin@example.com", "admin", t) + if err != nil { + t.Fatal(err) + } + for _, tt := range []struct { + name string + cookie *http.Cookie + want int + }{ + {name: "anonymous", cookie: &http.Cookie{}}, + {name: "administrator", cookie: adminCookie, want: 1}, + } { + t.Run(tt.name, func(t *testing.T) { + response, err := getRequest(tt.cookie, app, "/documents/linked/score", t) + if err != nil { + t.Fatal(err) + } + defer response.Body.Close() + mustReturnStatus(response, http.StatusOK, t) + page, err := goquery.NewDocumentFromReader(response.Body) + if err != nil { + t.Fatal(err) + } + control := page.Find(`li a[data-bs-toggle="collapse"][href="#edit-review-link-linked"]`) + if control.Length() != tt.want { + t.Fatalf("expected %d edit links, got %d", tt.want, control.Length()) + } + if tt.want == 0 { + if page.Find(`input[name="bookURL"]`).Length() != 0 { + t.Fatal("anonymous readers must not receive the editor") + } + return + } + if control.Text() != "" || + control.Find(`i.bi-pencil[alt="Edit Another service link"]`).Length() != 1 || + control.Filter(`[title="Edit Another service link"][aria-label="Edit Another service link"]`).Length() != 1 || + page.Find(`#edit-review-link-linked.collapse:not(.show)`).Length() != 1 || + page.Find(`form[hx-put="/documents/linked/review-link"][hx-target="this"]`).Length() != 1 || + page.Find(`label[for="document-book-url-linked"]`).Length() != 1 { + t.Fatal("expected accessible, initially collapsed Another service editor beside the score") + } + if value, _ := page.Find(`input[name="bookURL"]`).Attr("value"); value != "https://example.org/books/book-1" { + t.Fatalf("editor must be prefilled with the current link, got %q", value) + } + }) + } + + provider.scoreErr = errors.New("unavailable") + response, err := getRequest(adminCookie, app, "/documents/linked/score", t) + if err != nil { + t.Fatal(err) + } + defer response.Body.Close() + page, err := goquery.NewDocumentFromReader(response.Body) + if err != nil { + t.Fatal(err) + } + if !strings.Contains(page.Find("li").Text(), "Unable to load Another service score") || + page.Find(`input[name="bookURL"]`).Length() != 1 { + t.Fatal("an unavailable score must not prevent administrators from correcting the link") + } +} diff --git a/internal/webserver/embedded/css/display.css b/internal/webserver/embedded/css/display.css index 8c16977f..7de2cd82 100644 --- a/internal/webserver/embedded/css/display.css +++ b/internal/webserver/embedded/css/display.css @@ -347,6 +347,36 @@ main .form-control:focus { overflow: hidden; } +.review-content.clamp { + -webkit-line-clamp: 5; + line-clamp: 5; +} + +.document-reviews-loading { + display: none; +} + +.document-reviews.htmx-request .document-reviews-content { + display: none; +} + +.document-reviews.htmx-request .document-reviews-loading { + display: block; +} + +.review-star { + position: relative; + display: inline-block; +} + +.review-star-fill { + position: absolute; + top: 0; + left: 0; + overflow: hidden; + white-space: nowrap; +} + #searchbox-container .input-group .form-control:focus { box-shadow: none !important; } diff --git a/internal/webserver/embedded/images/goodreads.svg b/internal/webserver/embedded/images/goodreads.svg new file mode 100644 index 00000000..e42f54b6 --- /dev/null +++ b/internal/webserver/embedded/images/goodreads.svg @@ -0,0 +1 @@ + diff --git a/internal/webserver/embedded/js/datetime.js b/internal/webserver/embedded/js/datetime.js index d7a62386..476d0f0a 100644 --- a/internal/webserver/embedded/js/datetime.js +++ b/internal/webserver/embedded/js/datetime.js @@ -9,7 +9,7 @@ import(`./luxon.min.js${versionParam}`).then(({ DateTime }) => { const datetimeFormatter = () => { const datetime = document.querySelectorAll('time.locale'); datetime.forEach(function(element) { - let dt = DateTime.fromISO(element.textContent); + let dt = DateTime.fromISO(element.getAttribute('datetime') || element.textContent); if (dt.isValid) { if (element.classList.contains('relative')) { element.textContent = dt.toRelative({ locale: document.documentElement.lang }); @@ -25,7 +25,8 @@ import(`./luxon.min.js${versionParam}`).then(({ DateTime }) => { }); } - document.addEventListener('DOMContentLoaded', datetimeFormatter()); + datetimeFormatter(); + document.body.addEventListener('htmx:afterSwap', datetimeFormatter); const observer = new MutationObserver(datetimeFormatter); diff --git a/internal/webserver/embedded/js/document-reviews.js b/internal/webserver/embedded/js/document-reviews.js new file mode 100644 index 00000000..c7474fcb --- /dev/null +++ b/internal/webserver/embedded/js/document-reviews.js @@ -0,0 +1,31 @@ +"use strict"; + +const reviewsObserver = new ResizeObserver(entries => { + for (const { target: content } of entries) { + const button = content.nextElementSibling; + const expanded = button.getAttribute('aria-expanded') === 'true'; + button.hidden = !expanded && content.scrollHeight <= content.clientHeight; + } +}); + +function observeReviews() { + document.querySelectorAll('.review-content').forEach(content => { + reviewsObserver.observe(content); + }); +} + +observeReviews(); +document.body.addEventListener('htmx:afterSwap', observeReviews); + +document.body.addEventListener('click', event => { + const button = event.target.closest('.review-toggle'); + if (!button) { + return; + } + + const content = document.getElementById(button.getAttribute('aria-controls')); + const expanded = button.getAttribute('aria-expanded') !== 'true'; + content.classList.toggle('clamp', !expanded); + button.setAttribute('aria-expanded', String(expanded)); + button.textContent = expanded ? button.dataset.showLess : button.dataset.showMore; +}); diff --git a/internal/webserver/embedded/js/feedback.js b/internal/webserver/embedded/js/feedback.js index 466dbcd1..1ac58ff9 100644 --- a/internal/webserver/embedded/js/feedback.js +++ b/internal/webserver/embedded/js/feedback.js @@ -115,6 +115,28 @@ htmx.on('htmx:afterRequest', (evt) => { } }); +function showBackgroundProgressError(evt) { + const progress = evt.detail?.elt + if (!(progress instanceof HTMLElement) || progress.id !== 'background-progress') { + return + } + + const message = progress.dataset.errorMessage + if (!message) { + return + } + + const alert = document.createElement('div') + alert.className = 'alert alert-warning' + alert.setAttribute('role', 'alert') + alert.textContent = message + progress.replaceChildren(alert) +} + +htmx.on('htmx:sendError', showBackgroundProgressError) +htmx.on('htmx:responseError', showBackgroundProgressError) +htmx.on('htmx:timeout', showBackgroundProgressError) + const setUpWarningsListener = () => { document.querySelectorAll('[data-warning-once]').forEach((el) => { el.addEventListener('click', () => { diff --git a/internal/webserver/embedded/js/home-search.js b/internal/webserver/embedded/js/home-search.js index 0ff89fb5..0530e7ae 100644 --- a/internal/webserver/embedded/js/home-search.js +++ b/internal/webserver/embedded/js/home-search.js @@ -51,7 +51,7 @@ function collectPanelParams(panel, composeDateControls, type) { if (!el.name || el.disabled) return if ((el.type === "checkbox" || el.type === "radio") && !el.checked) return const value = String(el.value ?? "").trim() - if (value === "" || value === "0") return + if (value === "" || (value === "0" && el.tagName !== "SELECT")) return params.append(el.name, value) }) return params diff --git a/internal/webserver/embedded/js/search-filter-utils.js b/internal/webserver/embedded/js/search-filter-utils.js index 6e4e77c9..cf94a027 100644 --- a/internal/webserver/embedded/js/search-filter-utils.js +++ b/internal/webserver/embedded/js/search-filter-utils.js @@ -99,7 +99,7 @@ export function applyHiddenDatesToVisible(container) { } function hasValue(input) { - return input.value.trim() !== '' && input.value !== '0' + return input.value.trim() !== '' && (input.tagName === 'SELECT' || input.value !== '0') } function updateDateClearButtonState(dateControl) { @@ -112,7 +112,7 @@ function updateDateClearButtonState(dateControl) { function updateRangeClearButtonState(group) { const clearButton = group.querySelector('.clear-range-control') if (!clearButton) return - clearButton.disabled = !Array.from(group.querySelectorAll('input')).some(hasValue) + clearButton.disabled = !Array.from(group.querySelectorAll('input, select')).some(hasValue) } function resetDateControl(dateControl) { @@ -128,7 +128,7 @@ function resetDateControl(dateControl) { } function resetRangeGroup(group) { - group.querySelectorAll('input').forEach(input => { input.value = '' }) + group.querySelectorAll('input, select').forEach(input => { input.value = '' }) updateRangeClearButtonState(group) } @@ -201,14 +201,15 @@ export function initClearRangeControls(searchFilters) { const group = clearLink.closest('.input-group') if (!group) return - group.querySelectorAll('input').forEach(input => { + group.querySelectorAll('input, select').forEach(input => { input.addEventListener('input', () => updateRangeClearButtonState(group)) + input.addEventListener('change', () => updateRangeClearButtonState(group)) }) clearLink.addEventListener('click', (e) => { e.preventDefault() resetRangeGroup(group) - const firstInput = group.querySelector('input') + const firstInput = group.querySelector('input, select') if (firstInput) firstInput.dispatchEvent(new Event('input', { bubbles: true })) }) diff --git a/internal/webserver/embedded/translations/de.yml b/internal/webserver/embedded/translations/de.yml index de06e22e..5e32fd4b 100644 --- a/internal/webserver/embedded/translations/de.yml +++ b/internal/webserver/embedded/translations/de.yml @@ -17,6 +17,14 @@ "Illustrated": "Illustriert" "Illustrations": "Illustrationen" "Only illustrated": "Nur illustrierte" +"%s score": "%s-Bewertung" +"Review score": "Rezensionsbewertung" +"Clear %s score": "%s-Bewertung löschen" +"Clear review score": "Rezensionsbewertung löschen" +"%s score (ascending)": "%s-Bewertung (aufsteigend)" +"%s score (descending)": "%s-Bewertung (absteigend)" +"Review score (ascending)": "Rezensionsbewertung (aufsteigend)" +"Review score (descending)": "Rezensionsbewertung (absteigend)" "Reading time calculated using a speed of %s words per minute. You can change your reading speed in your profile.": "Lesezeit berechnet mit einer Geschwindigkeit von %s Wörtern pro Minute. Sie können die Lesegeschwindigkeit in Ihrem Profil ändern." "Reading time calculated using a speed of %s words per minute. Log in to customize this value": "Lesezeit berechnet mit einer Geschwindigkeit von %s Wörtern pro Minute. Melden Sie sich an, um diesen Wert anzupassen." "This filter only applies to EPUB documents": "Dieser Filter gilt nur für EPUB-Dokumente" @@ -163,7 +171,7 @@ "Click to upload a custom image": "Klicken Sie, um ein benutzerdefiniertes Bild hochzuladen" "Indexing in progress search results may not be accurate.": "Indexierung läuft die Suchergebnisse sind möglicherweise nicht genau." "Indexing in progress, search results may not be accurate.": "Indexierung läuft, Suchergebnisse sind möglicherweise nicht genau." -"Retrieving author information, author pages may not be complete yet.": "Autoreninformationen werden abgerufen, Autorenseiten sind möglicherweise noch unvollständig." +"Retrieving author information. Author pages may be incomplete, and author filters may not work yet.": "Autoreninformationen werden abgerufen. Autorenseiten sind möglicherweise unvollständig, und Autorenfilter funktionieren möglicherweise noch nicht." "Analyzing documents, search results and recommendations may not be accurate yet.": "Dokumente werden analysiert, Suchergebnisse und Empfehlungen sind möglicherweise noch nicht genau." "Author information progress": "Fortschritt der Autoreninformationen" "Related content analysis progress": "Fortschritt der Analyse verwandter Inhalte" @@ -171,7 +179,7 @@ "Keyword clean-up progress": "Fortschritt der Schlüsselwortbereinigung" "Indexing progress": "Indexierungsfortschritt" "Remaining time": "Verbleibende Zeit" -"Remaining time: %s": "Verbleibende Zeit: %s" +"%s left": "noch %s" "There was an error deleting the user please try again later": "Beim Löschen des Benutzers ist ein Fehler aufgetreten bitte versuchen Sie es später erneut." "A user with this username already exists": "Ein Benutzer mit diesem Benutzernamen existiert bereits." "A user with this email address already exists": "Ein Benutzer mit dieser E-Mail-Adresse existiert bereits." @@ -404,3 +412,20 @@ "A newer version of this document is available.": "Eine neuere Version dieses Dokuments ist verfügbar." "This document is no longer available. Its offline copy has been removed.": "Dieses Dokument ist nicht mehr verfügbar. Seine Offline-Kopie wurde entfernt." "Reload document": "Dokument neu laden" +"Edit %s link": "%s-Link bearbeiten" +"%s book URL": "%s-Buch-URL" +"Enter a valid %s book URL.": "Geben Sie eine gültige %s-Buch-URL ein." +"Unable to load %s score": "%s-Bewertung konnte nicht geladen werden" +"%s rating": "%s-Bewertung" +"%s user reviews": "%s-Nutzerrezensionen" +"Go to %s author page": "Zur Autorenseite auf %s" +"Show spoiler": "Spoiler anzeigen" +"Show more": "Mehr anzeigen" +"Show less": "Weniger anzeigen" +"No user reviews available in the current language": "Keine Nutzerrezensionen in der aktuellen Sprache verfügbar" +"No score": "Keine Bewertung" +"Not scored": "Nicht bewertet" +"%s ratings": "%s Bewertungen" +"Review information progress": "Fortschritt der Bewertungsinformationen" +"Review information is incomplete. Score filters may omit documents whose ratings have not been retrieved.": "Bewertungsinformationen sind unvollständig. Bewertungsfilter können Dokumente auslassen, deren Bewertungen noch nicht abgerufen wurden." +"Unable to retrieve background progress.": "Der Fortschritt der Hintergrundaufgaben konnte nicht abgerufen werden." diff --git a/internal/webserver/embedded/translations/es.yml b/internal/webserver/embedded/translations/es.yml index a14d6f25..bcfea15c 100644 --- a/internal/webserver/embedded/translations/es.yml +++ b/internal/webserver/embedded/translations/es.yml @@ -17,6 +17,14 @@ "Illustrated": "Ilustrado" "Illustrations": "Ilustraciones" "Only illustrated": "Solo ilustrados" +"%s score": "Puntuación de %s" +"Review score": "Puntuación de reseñas" +"Clear %s score": "Borrar puntuación de %s" +"Clear review score": "Borrar puntuación de reseñas" +"%s score (ascending)": "Puntuación de %s (ascendente)" +"%s score (descending)": "Puntuación de %s (descendente)" +"Review score (ascending)": "Puntuación de reseñas (ascendente)" +"Review score (descending)": "Puntuación de reseñas (descendente)" "Reading time calculated using a speed of %s words per minute. You can change your reading speed in your profile.": "Tiempo de lectura calculado en base a una velocidad de %s palabras por minuto. Puedes cambiarla en tu perfil." "Reading time calculated using a speed of %s words per minute. Log in to customize this value": "Tiempo de lectura calculado en base a una velocidad de %s palabras por minuto. Inicia sesión para personalizar este valor." "This filter only applies to EPUB documents": "Este filtro solo se aplica a documentos EPUB" @@ -160,14 +168,14 @@ "An error occurred while uploading the image": "Ocurrió un error al subir la imagen" "Click to upload a custom image": "Haz clic para subir una imagen personalizada" "Indexing in progress, search results may not be accurate.": "Indexando documentos, los resultados de búsqueda pueden no ser precisos." -"Retrieving author information, author pages may not be complete yet.": "Recuperando información de autores, las páginas de autor pueden estar incompletas." +"Retrieving author information. Author pages may be incomplete, and author filters may not work yet.": "Recuperando información de autores. Las páginas de autor pueden estar incompletas y los filtros de autor quizá no funcionen todavía." "Analyzing documents, search results and recommendations may not be accurate yet.": "Analizando documentos, los resultados de búsqueda y las recomendaciones pueden no ser precisos todavía." "Author information progress": "Progreso de información de autores" "Related content analysis progress": "Progreso del análisis de contenido relacionado" "Cleaning up overly common keywords, search results and recommendations may not be accurate yet.": "Limpiando palabras clave demasiado comunes, los resultados de búsqueda y las recomendaciones pueden no ser precisos todavía." "Keyword clean-up progress": "Progreso de la limpieza de palabras clave" "Indexing progress": "Progreso de indexación" -"Remaining time: %s": "Tiempo restante: %s" +"%s left": "quedan %s" "There was an error deleting the user, please try again later": "Hubo un error al borrar el usuario, por favor, vuelva a intentarlo más tarde" "A user with this username already exists": "Ya existe un usuario con ese nombre de usuario" "A user with this email address already exists": "Ya existe un usuario con esa dirección de correo electrónico" @@ -400,3 +408,20 @@ "A newer version of this document is available.": "Hay una versión más reciente de este documento disponible." "This document is no longer available. Its offline copy has been removed.": "Este documento ya no está disponible. Se ha eliminado su copia sin conexión." "Reload document": "Recargar documento" +"Edit %s link": "Editar enlace de %s" +"%s book URL": "URL del libro de %s" +"Enter a valid %s book URL.": "Introduce una URL válida de un libro de %s." +"Unable to load %s score": "No se pudo cargar la puntuación de %s" +"%s rating": "Puntuación en %s" +"%s user reviews": "Reseñas de usuarios de %s" +"Go to %s author page": "Ir a la página del autor en %s" +"Show spoiler": "Mostrar spoiler" +"Show more": "Mostrar más" +"Show less": "Mostrar menos" +"No user reviews available in the current language": "No hay reseñas de usuarios disponibles en el idioma actual" +"No score": "Sin puntuación" +"Not scored": "Sin puntuar" +"%s ratings": "%s valoraciones" +"Review information progress": "Progreso de la información de valoraciones" +"Review information is incomplete. Score filters may omit documents whose ratings have not been retrieved.": "La información de valoraciones está incompleta. Los filtros de puntuación pueden omitir documentos cuyas valoraciones aún no se han obtenido." +"Unable to retrieve background progress.": "No se pudo obtener el progreso de las tareas en segundo plano." diff --git a/internal/webserver/embedded/translations/fr.yml b/internal/webserver/embedded/translations/fr.yml index 71859694..1346ad3f 100644 --- a/internal/webserver/embedded/translations/fr.yml +++ b/internal/webserver/embedded/translations/fr.yml @@ -17,6 +17,14 @@ "Illustrated": "Illustré" "Illustrations": "Illustrations" "Only illustrated": "Seulement illustrés" +"%s score": "Note %s" +"Review score": "Note des avis" +"Clear %s score": "Effacer la note %s" +"Clear review score": "Effacer la note des avis" +"%s score (ascending)": "Note %s (croissante)" +"%s score (descending)": "Note %s (décroissante)" +"Review score (ascending)": "Note des avis (croissante)" +"Review score (descending)": "Note des avis (décroissante)" "Reading time calculated using a speed of %s words per minute. You can change your reading speed in your profile.": "Temps de lecture calculé avec une vitesse de %s mots par minute. Vous pouvez modifier votre vitesse de lecture dans votre profil." "Reading time calculated using a speed of %s words per minute. Log in to customize this value": "Temps de lecture calculé avec une vitesse de %s mots par minute. Connectez-vous pour personnaliser cette valeur." "This filter only applies to EPUB documents": "Ce filtre s'applique uniquement aux documents EPUB" @@ -161,14 +169,14 @@ "An error occurred while uploading the image": "Une erreur s'est produite lors du téléchargement de l'image" "Click to upload a custom image": "Cliquez pour télécharger une image personnalisée" "Indexing in progress, search results may not be accurate.": "Indexation en cours, les résultats de la recherche peuvent ne pas être précis." -"Retrieving author information, author pages may not be complete yet.": "Récupération des informations sur les auteurs, les pages auteur peuvent être incomplètes." +"Retrieving author information. Author pages may be incomplete, and author filters may not work yet.": "Récupération des informations sur les auteurs. Les pages auteur peuvent être incomplètes et les filtres par auteur peuvent ne pas encore fonctionner." "Analyzing documents, search results and recommendations may not be accurate yet.": "Analyse des documents, les résultats de recherche et les recommandations peuvent ne pas être précis pour le moment." "Author information progress": "Progression des informations sur les auteurs" "Related content analysis progress": "Progression de l'analyse du contenu associé" "Cleaning up overly common keywords, search results and recommendations may not be accurate yet.": "Nettoyage des mots-clés trop courants, les résultats de recherche et les recommandations peuvent ne pas être précis pour le moment." "Keyword clean-up progress": "Progression du nettoyage des mots-clés" "Indexing progress": "Progression de l'indexation" -"Remaining time: %s": "Temps restant: %s" +"%s left": "%s restant" "There was an error deleting the user, please try again later": "Une erreur s'est produite lors de supprimer l'utilisateur, veuillez réessayer ultérieurement" "A user with this username already exists": "Un utilisateur avec ce nom d'utilisateur existe déjà" "A user with this email address already exists": "Un utilisateur avec cette adresse e-mail existe déjà" @@ -402,3 +410,20 @@ "A newer version of this document is available.": "Une version plus récente de ce document est disponible." "This document is no longer available. Its offline copy has been removed.": "Ce document n'est plus disponible. Sa copie hors connexion a été supprimée." "Reload document": "Recharger le document" +"Edit %s link": "Modifier le lien %s" +"%s book URL": "URL du livre sur %s" +"Enter a valid %s book URL.": "Saisissez une URL de livre %s valide." +"Unable to load %s score": "Impossible de charger la note %s" +"%s rating": "Note %s" +"%s user reviews": "Avis des utilisateurs de %s" +"Go to %s author page": "Voir la page de l'auteur sur %s" +"Show spoiler": "Afficher le spoiler" +"Show more": "Afficher plus" +"Show less": "Afficher moins" +"No user reviews available in the current language": "Aucun avis utilisateur disponible dans la langue actuelle" +"No score": "Aucune note" +"Not scored": "Non noté" +"%s ratings": "%s notes" +"Review information progress": "Progression des informations d'évaluation" +"Review information is incomplete. Score filters may omit documents whose ratings have not been retrieved.": "Les informations d'évaluation sont incomplètes. Les filtres de note peuvent omettre les documents dont les évaluations n'ont pas encore été récupérées." +"Unable to retrieve background progress.": "Impossible de récupérer la progression des tâches en arrière-plan." diff --git a/internal/webserver/embedded/translations/ru.yml b/internal/webserver/embedded/translations/ru.yml index ae8fbbd6..7fd89c59 100644 --- a/internal/webserver/embedded/translations/ru.yml +++ b/internal/webserver/embedded/translations/ru.yml @@ -17,6 +17,14 @@ "Illustrated": "Иллюстрированное" "Illustrations": "Иллюстрации" "Only illustrated": "Только с иллюстрациями" +"%s score": "Оценка %s" +"Review score": "Оценка отзывов" +"Clear %s score": "Очистить оценку %s" +"Clear review score": "Очистить оценку отзывов" +"%s score (ascending)": "Оценка %s (по возрастанию)" +"%s score (descending)": "Оценка %s (по убыванию)" +"Review score (ascending)": "Оценка отзывов (по возрастанию)" +"Review score (descending)": "Оценка отзывов (по убыванию)" "Reading time calculated using a speed of %s words per minute. You can change your reading speed in your profile.": "Время чтения рассчитано при скорости %s слов в минуту. Изменить скорость чтения можно в профиле." "Reading time calculated using a speed of %s words per minute. Log in to customize this value": "Время чтения рассчитано при скорости %s слов в минуту. Войдите, чтобы изменить это значение." "This filter only applies to EPUB documents": "Этот фильтр применяется только к документам EPUB" @@ -162,14 +170,14 @@ "An error occurred while uploading the image": "Произошла ошибка при загрузке изображения" "Click to upload a custom image": "Нажмите, чтобы загрузить пользовательское изображение" "Indexing in progress, search results may not be accurate.": "Идёт индексация; результаты поиска могут быть неточными." -"Retrieving author information, author pages may not be complete yet.": "Получение информации об авторах; страницы авторов могут быть неполными." +"Retrieving author information. Author pages may be incomplete, and author filters may not work yet.": "Получение информации об авторах. Страницы авторов могут быть неполными, а фильтры по авторам могут пока не работать." "Analyzing documents, search results and recommendations may not be accurate yet.": "Анализ документов; результаты поиска и рекомендации могут быть пока неточными." "Author information progress": "Прогресс получения информации об авторах" "Related content analysis progress": "Прогресс анализа похожего контента" "Cleaning up overly common keywords, search results and recommendations may not be accurate yet.": "Очистка слишком часто встречающихся ключевых слов; результаты поиска и рекомендации могут быть пока неточными." "Keyword clean-up progress": "Прогресс очистки ключевых слов" "Indexing progress": "Прогресс индексации" -"Remaining time: %s": "Оставшееся время: %s" +"%s left": "осталось %s" "There was an error deleting the user, please try again later": "Ошибка при удалении пользователя. Повторите попытку позже." "A user with this username already exists": "Пользователь с таким именем уже существует" "A user with this email address already exists": "Пользователь с таким e‑mail уже существует" @@ -396,3 +404,20 @@ "A newer version of this document is available.": "Доступна новая версия этого документа." "This document is no longer available. Its offline copy has been removed.": "Этот документ больше недоступен. Его копия для чтения без подключения к сети удалена." "Reload document": "Перезагрузить документ" +"Edit %s link": "Изменить ссылку %s" +"%s book URL": "URL книги на %s" +"Enter a valid %s book URL.": "Введите корректный URL книги на %s." +"Unable to load %s score": "Не удалось загрузить рейтинг %s" +"%s rating": "Рейтинг %s" +"%s user reviews": "Отзывы пользователей %s" +"Go to %s author page": "Перейти на страницу автора в %s" +"Show spoiler": "Показать спойлер" +"Show more": "Показать больше" +"Show less": "Показать меньше" +"No user reviews available in the current language": "Нет отзывов пользователей на текущем языке" +"No score": "Нет оценки" +"Not scored": "Не оценено" +"%s ratings": "Оценок: %s" +"Review information progress": "Ход получения информации об оценках" +"Review information is incomplete. Score filters may omit documents whose ratings have not been retrieved.": "Информация об оценках неполная. Фильтры по оценкам могут пропускать документы, оценки которых ещё не получены." +"Unable to retrieve background progress.": "Не удалось получить состояние фоновых задач." diff --git a/internal/webserver/embedded/views/author/list.html b/internal/webserver/embedded/views/author/list.html index 043f3113..d715aea1 100644 --- a/internal/webserver/embedded/views/author/list.html +++ b/internal/webserver/embedded/views/author/list.html @@ -1,6 +1,6 @@ {{if ne .Author.Name ""}} {{if not .Author.RetrievedOn.IsZero}} - {{template "partials/author-summary" dict "Lang" .Lang "Author" .Author "Session" .Session "ImageVersion" .ImageVersion}} + {{template "partials/author-summary" dict "Lang" .Lang "Author" .Author "Session" .Session "ImageVersion" .ImageVersion "DataSourceLinks" .DataSourceLinks}} {{else}}
@@ -22,7 +22,7 @@
{{.Author.Name}}
{{end}}
diff --git a/internal/webserver/embedded/views/document/detail.html b/internal/webserver/embedded/views/document/detail.html
index e1c32a99..d8eac799 100644
--- a/internal/webserver/embedded/views/document/detail.html
+++ b/internal/webserver/embedded/views/document/detail.html
@@ -31,7 +31,7 @@
{{range .AuthorSummaries}} {{if not .Author.RetrievedOn.IsZero}} - {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" .Author "Session" $.Session "ImageVersion" .ImageVersion}} + {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" .Author "Session" $.Session "ImageVersion" .ImageVersion "DataSourceLinks" .DataSourceLinks}} {{else}} {{template "partials/author-summary-doc-detail-placeholder" dict "AuthorSlug" .Author.Slug}} {{end}} @@ -71,7 +71,7 @@
{{end}} {{if not $entry.Author.RetrievedOn.IsZero}} - {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" $entry.Author "Session" $.Session "ImageVersion" $entry.ImageVersion}} + {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" $entry.Author "Session" $.Session "ImageVersion" $entry.ImageVersion "DataSourceLinks" $entry.DataSourceLinks}} {{else}} {{template "partials/author-summary-doc-detail-placeholder" dict "AuthorSlug" $entry.Author.Slug}} {{end}} @@ -119,6 +119,13 @@
{{end}}
+ {{if .ReviewsEnabled}}
+ {{.Document.Title}}
{{template "partials/actions" dict "Lang" .Lang "Document" .Document "Session" .Session "FQDN" .fqdn "EmailSendingConfigured" .EmailSendingConfigured "DefaultAction" .DefaultAction "CanShare" .CanShare "PreferredEpub" .PreferredEpub "EmailFrom" .EmailFrom "ShareMaxRecipients" .ShareMaxRecipients "ShareCommentMaxSize" .ShareCommentMaxSize "ButtonSize" "btn-lg" "ButtonStyle" "btn-primary"}}
- {{template "partials/document-metadata" dict "Lang" .Lang "Document" .Document "Session" .Session "WordsPerMinute" .WordsPerMinute "IllustratedMinAmount" .IllustratedMinAmount}}
+ {{template "partials/document-metadata" dict "Lang" .Lang "Document" .Document "Session" .Session "WordsPerMinute" .WordsPerMinute "IllustratedMinAmount" .IllustratedMinAmount "ReviewsEnabled" .ReviewsEnabled}}
@@ -60,7 +60,7 @@ {{.Document.Title}}
{{range .AuthorSummaries}} {{if not .Author.RetrievedOn.IsZero}} - {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" .Author "Session" $.Session "ImageVersion" .ImageVersion}} + {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" .Author "Session" $.Session "ImageVersion" .ImageVersion "DataSourceLinks" .DataSourceLinks}} {{else}} {{template "partials/author-summary-doc-detail-placeholder" dict "AuthorSlug" .Author.Slug}} {{end}} @@ -71,7 +71,7 @@
{{.Document.Title}}
{{range $i, $entry := .IllustratorSummaries}} {{if eq $i 0}}{{end}} {{if not $entry.Author.RetrievedOn.IsZero}} - {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" $entry.Author "Session" $.Session "ImageVersion" $entry.ImageVersion}} + {{template "partials/author-summary-doc-detail" dict "Lang" $.Lang "Author" $entry.Author "Session" $.Session "ImageVersion" $entry.ImageVersion "DataSourceLinks" $entry.DataSourceLinks}} {{else}} {{template "partials/author-summary-doc-detail-placeholder" dict "AuthorSlug" $entry.Author.Slug}} {{end}} @@ -119,6 +119,13 @@
Words
+ {{if .DocumentLink.URL}}
+ {{template "partials/document-reviews-header" dict "Lang" .Lang "Source" .DocumentLink.Source "BookURL" .DocumentLink.URL "Slug" .Document.Slug "SupportedLanguages" .SupportedLanguages "ReviewLanguage" .Lang}}
+ {{end}}
+
+ {{end}}
Words
+{{if .ReviewsEnabled}} + +{{end}} diff --git a/internal/webserver/embedded/views/highlight/list.html b/internal/webserver/embedded/views/highlight/list.html index 97165746..af37ef6f 100644 --- a/internal/webserver/embedded/views/highlight/list.html +++ b/internal/webserver/embedded/views/highlight/list.html @@ -1,7 +1,7 @@{{t .Lang "Highlights"}}
- {{template "partials/count-and-sort" dict "Results" .Results "Lang" .Lang "SortURL" .SortURL "SortBy" .SortBy "AdditionalSortOptions" .AdditionalSortOptions "FilterIdPrefix" "highlight"}}
+ {{template "partials/count-and-sort" dict "Results" .Results "Lang" .Lang "DataSourceName" .DataSourceName "SortURL" .SortURL "SortBy" .SortBy "AdditionalSortOptions" .AdditionalSortOptions "FilterIdPrefix" "highlight"}}
@@ -28,7 +28,7 @@
- {{template "partials/document-metadata-filters" dict "Lang" .Lang "FilterIdPrefix" "highlight" "SearchFields" .SearchFields "AvailableLanguages" .AvailableLanguages "HasReflowableDocs" .HasReflowableDocs "HasFixedDocs" .HasFixedDocs}}
+ {{template "partials/document-metadata-filters" dict "Lang" .Lang "DataSourceName" .DataSourceName "ReviewSourceConfigured" .ReviewSourceConfigured "FilterIdPrefix" "highlight" "SearchFields" .SearchFields "AvailableLanguages" .AvailableLanguages "HasReflowableDocs" .HasReflowableDocs "HasFixedDocs" .HasFixedDocs}}
{{template "partials/search-filters-actions" dict "Lang" .Lang "ShowSearchButton" false}}
diff --git a/internal/webserver/embedded/views/layout.html b/internal/webserver/embedded/views/layout.html
index 027cd25d..8d2c1d5e 100644
--- a/internal/webserver/embedded/views/layout.html
+++ b/internal/webserver/embedded/views/layout.html
@@ -34,7 +34,7 @@
{{template "partials/navbar" .}}
{{t .L
{{.Author.Name}}
{{end}} + {{end}} + {{if or (index .Author.DataSourceLinks "website") .DataSourceLinks}}-
- {{if .Author.Website}}
+ {{with index .Author.DataSourceLinks "website"}}
- - {{t .Lang "Website"}} + {{t $.Lang "Website"}} {{end}} - {{if index .Author.WikipediaLink .Lang}} -
- - - {{t .Lang "Go to Wikipedia entry"}} - - {{end}} + {{template "partials/author-data-source-link" dict "Lang" .Lang "DataSourceLinks" .DataSourceLinks}}
{{.Author.Name}}
{{end}} + {{end}} + {{if or (index .Author.DataSourceLinks "website") .DataSourceLinks}}-
- {{if .Author.Website}}
+ {{with index .Author.DataSourceLinks "website"}}
- - {{t .Lang "Website"}} + {{t $.Lang "Website"}} {{end}} - {{if index .Author.WikipediaLink .Lang}} -
- - - {{t .Lang "Go to Wikipedia entry"}} - - {{end}} + {{template "partials/author-data-source-link" dict "Lang" .Lang "DataSourceLinks" .DataSourceLinks}}
+ {{if $progress.Error}}
+
+{{end}}
diff --git a/internal/webserver/embedded/views/partials/completed-list.html b/internal/webserver/embedded/views/partials/completed-list.html
index bf1304cd..b63e483c 100644
--- a/internal/webserver/embedded/views/partials/completed-list.html
+++ b/internal/webserver/embedded/views/partials/completed-list.html
@@ -12,7 +12,7 @@
{{t .Lang "Unable to retrieve background progress."}}
+ {{end}}
+ {{if $progress.Tasks}}
+
+ {{range $progress.Tasks}}
+ {{$label := "Indexing progress"}}
+ {{if eq .Kind "authors"}}{{$label = "Author information progress"}}
+ {{else if eq .Kind "textrank"}}{{$label = "Related content analysis progress"}}
+ {{else if eq .Kind "pruning"}}{{$label = "Keyword clean-up progress"}}
+ {{else if eq .Kind "data-sources"}}{{$label = "Review information progress"}}
+ {{end}}
+
+ {{end}}
+
+
+ {{end}}
+ {{t $.Lang $label}}{{if .Name}} ({{.Name}}){{end}}
+ {{$remaining := ""}}{{if gt .RemainingTime 0}}{{$remaining = t $.Lang "%s left" (remainingTime .RemainingTime)}}{{end}} +
+
+
+ {{if eq .Kind "data-sources"}}
+ {{t $.Lang "Review information is incomplete. Score filters may omit documents whose ratings have not been retrieved."}}
+ {{else if eq .Kind "authors"}} +{{t $.Lang "Retrieving author information. Author pages may be incomplete, and author filters may not work yet."}}
+ {{else if eq .Kind "textrank"}} +{{t $.Lang "Analyzing documents, search results and recommendations may not be accurate yet."}}
+ {{else if eq .Kind "pruning"}} +{{t $.Lang "Cleaning up overly common keywords, search results and recommendations may not be accurate yet."}}
+ {{else}} +{{t $.Lang "Indexing in progress, search results may not be accurate."}}
+ {{end}} +
- {{template "partials/sort" dict "SortURL" .SortURL "SortBy" .SortBy "Lang" .Lang "AdditionalSortOptions" .AdditionalSortOptions}}
+ {{template "partials/sort" dict "SortURL" .SortURL "SortBy" .SortBy "Lang" .Lang "DataSourceName" .DataSourceName "AdditionalSortOptions" .AdditionalSortOptions}}
{{end}}
diff --git a/internal/webserver/embedded/views/partials/count-and-sort.html b/internal/webserver/embedded/views/partials/count-and-sort.html
index 1bfd8ca7..544e211f 100644
--- a/internal/webserver/embedded/views/partials/count-and-sort.html
+++ b/internal/webserver/embedded/views/partials/count-and-sort.html
@@ -8,6 +8,6 @@
{{if gt .Results.TotalHits 0}}
- {{template "partials/sort" dict "SortURL" .SortURL "SortBy" .SortBy "Lang" .Lang "AdditionalSortOptions" .AdditionalSortOptions}}
+ {{template "partials/sort" dict "SortURL" .SortURL "SortBy" .SortBy "Lang" .Lang "DataSourceName" .DataSourceName "AdditionalSortOptions" .AdditionalSortOptions}}
{{end}}
diff --git a/internal/webserver/embedded/views/partials/docs-list-fragments.html b/internal/webserver/embedded/views/partials/docs-list-fragments.html
index 1230fc1a..a396824a 100644
--- a/internal/webserver/embedded/views/partials/docs-list-fragments.html
+++ b/internal/webserver/embedded/views/partials/docs-list-fragments.html
@@ -1,10 +1,10 @@
{{if and .Author (ne .Author.Name "")}}
{{else if .SeriesTitle}}
- {{template "partials/count-and-sort" dict "Results" .Results "Lang" .Lang "SortURL" .SortURL "SortBy" .SortBy "AdditionalSortOptions" .AdditionalSortOptions "FilterIdPrefix" "series"}}
+ {{template "partials/count-and-sort" dict "Results" .Results "Lang" .Lang "DataSourceName" .DataSourceName "SortURL" .SortURL "SortBy" .SortBy "AdditionalSortOptions" .AdditionalSortOptions "FilterIdPrefix" "series"}}
{{else}}
{{template "partials/search-type-tabs" .}}
diff --git a/internal/webserver/embedded/views/partials/docs-list-item.html b/internal/webserver/embedded/views/partials/docs-list-item.html
index 94beb0ed..70dd7a84 100644
--- a/internal/webserver/embedded/views/partials/docs-list-item.html
+++ b/internal/webserver/embedded/views/partials/docs-list-item.html
@@ -71,7 +71,7 @@