Skip to content

Build your personal knowledge base with Trilium Notes

feat(share): show the previous and next pages as labeled cards

Elian Doran08acd25fa553
diff --git a/apps/server/src/assets/translations/en/server.json b/apps/server/src/assets/translations/en/server.json
index 1fca577caf..6e984038b4 100644
--- a/apps/server/src/assets/translations/en/server.json
+++ b/apps/server/src/assets/translations/en/server.json
@@ -464,7 +464,10 @@
"logo-alt": "Logo",
"login": "Login",
"tab-title": "Tab title",
- "heading-link": "Link to This Section"
+ "heading-link": "Link to This Section",
+ "previous": "Previous",
+ "next": "Next",
+ "page-navigation": "Previous and next pages"
},
"hidden_subtree_templates": {
"text-snippet": "Text Snippet",
diff --git a/packages/share-theme/src/page/footer.css b/packages/share-theme/src/page/footer.css
index b00ff05f8a..f2a73bd057 100644
--- a/packages/share-theme/src/page/footer.css
+++ b/packages/share-theme/src/page/footer.css
@@ -1,47 +1,66 @@
#content-footer .navigation {
display: grid;
- grid-template-columns: repeat(2,1fr);
+ grid-template-columns: 1fr 1fr;
gap: 1rem;
margin-top: 3rem;
}
#content-footer .navigation a {
- border-radius: 3px;
- border: 2px solid var(--background-highlight);
- color: var(--text-primary);
display: flex;
- justify-content: center;
align-items: center;
- gap: 5px;
- overflow: hidden;
- padding: 8px 12px;
- user-select: none;
- transform: translateY(0);
- transition: transform 200ms ease, background-color 200ms ease, color 200ms ease;
+ gap: 0.5rem;
+ min-width: 0;
+ padding: 0.75rem 1rem;
+ border: 1px solid var(--background-highlight);
+ border-radius: 6px;
+ color: var(--text-primary);
+ transition: border-color 200ms ease;
}
#content-footer .navigation a:hover {
- background: var(--background-active);
- color: var(--text-menu-active);
+ border-color: var(--text-link);
text-decoration: none;
- transform: translateY(-2px);
}
-#content-footer .navigation a.previous {
- justify-self: flex-start;
+#content-footer .navigation a.next {
+ grid-column: 2;
+ justify-content: flex-end;
+ text-align: end;
}
-#content-footer .navigation a.next {
- justify-self: flex-end;
- grid-column: 2/3;
+#content-footer .navigation .tn-icon {
+ flex-shrink: 0;
+ font-size: 1.5rem;
+ color: var(--text-menu);
}
-#content-footer .navigation a.previous::before {
- content: "« ";
+#content-footer .navigation-text {
+ display: flex;
+ flex-direction: column;
+ min-width: 0;
+}
+
+#content-footer .navigation-label {
+ font-size: 0.85em;
+ color: var(--text-menu);
}
-#content-footer .navigation a.next::after {
- content: " »";
+#content-footer .navigation-title {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-weight: 500;
+ color: var(--text-link);
+}
+
+@media (max-width: 48em) {
+ #content-footer .navigation {
+ grid-template-columns: 1fr;
+ }
+
+ #content-footer .navigation a.next {
+ grid-column: 1;
+ }
}
#content-footer .navigation + #childLinks {
diff --git a/packages/share-theme/src/templates/prev_next.ejs b/packages/share-theme/src/templates/prev_next.ejs
index a36cb0212b..2da0131bb4 100644
--- a/packages/share-theme/src/templates/prev_next.ejs
+++ b/packages/share-theme/src/templates/prev_next.ejs
@@ -1,4 +1,20 @@
-<div class="navigation">
- <% if (prevNext.previous) { %><a class="previous" href="<%= prevNext.previous.href %>"><%= prevNext.previous.title %></a><% } %>
- <% if (prevNext.next) { %><a class="next" href="<%= prevNext.next.href %>"><%= prevNext.next.title %></a><% } %>
-</div>
+<nav class="navigation" aria-label="<%= t("share_theme.page-navigation") %>">
+ <% if (prevNext.previous) { %>
+ <a class="previous" href="<%= prevNext.previous.href %>">
+ <span class="tn-icon bx bx-chevron-left" aria-hidden="true"></span>
+ <span class="navigation-text">
+ <span class="navigation-label"><%= t("share_theme.previous") %></span>
+ <span class="navigation-title"><%= prevNext.previous.title %></span>
+ </span>
+ </a>
+ <% } %>
+ <% if (prevNext.next) { %>
+ <a class="next" href="<%= prevNext.next.href %>">
+ <span class="navigation-text">
+ <span class="navigation-label"><%= t("share_theme.next") %></span>
+ <span class="navigation-title"><%= prevNext.next.title %></span>
+ </span>
+ <span class="tn-icon bx bx-chevron-right" aria-hidden="true"></span>
+ </a>
+ <% } %>
+</nav>
diff --git a/packages/trilium-core/src/share/content_renderer.spec.ts b/packages/trilium-core/src/share/content_renderer.spec.ts
index 88e5cd44a5..62b98d07fa 100644
--- a/packages/trilium-core/src/share/content_renderer.spec.ts
+++ b/packages/trilium-core/src/share/content_renderer.spec.ts
@@ -344,7 +344,11 @@ describe("content_renderer", () => {
shareRootNote.getChildNotes()[0].getChildNotes()[0])));
expect(page.querySelector(".navigation .previous")?.getAttribute("href")).toBe("./navSite");
- expect(page.querySelector(".navigation .next")?.text).toBe("Second");
+ expect(page.querySelector(".navigation .next .navigation-label")?.text)
+ .toBe(t("share_theme.next"));
+ expect(page.querySelector(".navigation .next .navigation-title")?.text).toBe("Second");
+ expect(page.querySelector("nav.navigation")?.getAttribute("aria-label"))
+ .toBe(t("share_theme.page-navigation"));
});
it("anchors a heading spanning lines and lists it in the table of contents", () => {