')
+ assert 'class="navbar navbar-expand-md blog-topbar' in header
+ assert "blog-search" in header
+ assert "blog-search" not in body
+ assert 'id="navbar-user"' in resp.text
+ assert 'href="/"' in resp.text
+ assert f"/login?next=/project/{blog_env['project']}/blog/" in resp.text
def test_blog_page_404_without_manifest(no_blog_env: dict[str, str | TestClient]) -> None:
diff --git a/pygitweb/src/pygitweb/static/blog.js b/pygitweb/src/pygitweb/static/blog.js
index f516f40..d5d0a70 100644
--- a/pygitweb/src/pygitweb/static/blog.js
+++ b/pygitweb/src/pygitweb/static/blog.js
@@ -334,10 +334,10 @@ async function loadManifest(articleEl, contentBase, path) {
return manifest;
}
-function bindSearch(root, searchManifest) {
- const searchEl = root.querySelector(".blog-search");
- const resultsEl = root.querySelector(".blog-search-results");
- const container = root.querySelector(".blog-search-container");
+function bindSearch(searchManifest) {
+ const searchEl = document.querySelector(".blog-search");
+ const resultsEl = document.querySelector(".blog-search-results");
+ const container = document.querySelector(".blog-search-container");
if (!searchEl || !resultsEl || !container) {
return;
}
@@ -371,7 +371,7 @@ async function boot() {
} else {
searchManifest = await loadManifest(articleEl, contentBase, manifestPath);
}
- bindSearch(root, searchManifest);
+ bindSearch(searchManifest);
}
boot();
diff --git a/pygitweb/src/pygitweb/static/main.css b/pygitweb/src/pygitweb/static/main.css
index ade4049..e329a74 100644
--- a/pygitweb/src/pygitweb/static/main.css
+++ b/pygitweb/src/pygitweb/static/main.css
@@ -583,6 +583,66 @@ tbody tr {
}
}
+.blog-topbar {
+ background-color: var(--pgw-navbar-bg);
+ color: var(--pgw-navbar-text);
+ border-bottom: 1px solid var(--pgw-navbar-border);
+ overflow: visible;
+
+ > .container-xl {
+ display: grid;
+ grid-template-columns: 1fr minmax(16rem, 28rem) 1fr;
+ align-items: center;
+ column-gap: 1rem;
+ }
+
+ .navbar-brand {
+ justify-self: start;
+ margin: 0;
+
+ .text-reset,
+ .nav-link-title {
+ color: var(--pgw-navbar-text);
+ }
+ }
+
+ .blog-search-container {
+ width: 100%;
+ justify-self: center;
+ }
+
+ .navbar-nav {
+ justify-self: end;
+ }
+}
+
+@media (max-width: 768px) {
+ .blog-topbar > .container-xl {
+ grid-template-columns: 1fr auto;
+ grid-template-areas:
+ "brand account"
+ "search search";
+ row-gap: 0.5rem;
+ }
+
+ .blog-topbar .navbar-brand {
+ grid-area: brand;
+ }
+
+ .blog-topbar .navbar-nav {
+ grid-area: account;
+ }
+
+ .blog-topbar .blog-search-container {
+ grid-area: search;
+ }
+}
+
+.navbar-user-top {
+ border-top: 0;
+ position: relative;
+}
+
.navbar-user {
border-top-color: var(--pgw-navbar-border) !important;
@@ -1491,12 +1551,14 @@ pre {
top: 100%;
left: 0;
width: 100%;
- max-width: 28rem;
margin-top: 0.25rem;
display: none;
max-height: 70vh;
overflow-y: auto;
- z-index: 20;
+ z-index: 1030;
+ background-color: var(--pgw-bg-raised);
+ color: var(--pgw-text);
+ border: 1px solid var(--pgw-border);
}
.blog-search-results.show {
diff --git a/pygitweb/src/pygitweb/static/navbar-auth.js b/pygitweb/src/pygitweb/static/navbar-auth.js
index ac49e8b..b621a29 100644
--- a/pygitweb/src/pygitweb/static/navbar-auth.js
+++ b/pygitweb/src/pygitweb/static/navbar-auth.js
@@ -15,9 +15,15 @@
var profile = document.getElementById("navbar-user-profile");
var logout = document.getElementById("navbar-user-logout");
if (!link || !avatar || !nameEl || !metaEl) return;
+ function loginHref() {
+ return nav.getAttribute("data-login-href") || "/login";
+ }
function showAccountMenu() {
if (!menu) return;
- nav.classList.add("dropdown", "dropup");
+ nav.classList.add("dropdown");
+ if (nav.getAttribute("data-dropdown") !== "down") {
+ nav.classList.add("dropup");
+ }
link.setAttribute("data-bs-toggle", "dropdown");
link.setAttribute("aria-expanded", "false");
link.href = "#";
@@ -93,14 +99,14 @@
}
nav.setAttribute("data-logged-in", "false");
hideAccountMenu();
- link.href = "/login";
+ link.href = loginHref();
nameEl.textContent = "Guest";
metaEl.textContent = "Not signed in";
resetGuestAvatar();
})
.catch(function () {
hideAccountMenu();
- link.href = "/login";
+ link.href = loginHref();
resetGuestAvatar();
});
})();
diff --git a/pygitweb/src/pygitweb/static/theme.js b/pygitweb/src/pygitweb/static/theme.js
new file mode 100644
index 0000000..dc960da
--- /dev/null
+++ b/pygitweb/src/pygitweb/static/theme.js
@@ -0,0 +1,10 @@
+(function () {
+ function applyTheme(dark) {
+ document.documentElement.setAttribute("data-bs-theme", dark ? "dark" : "light");
+ }
+ var query = window.matchMedia("(prefers-color-scheme: dark)");
+ applyTheme(query.matches);
+ query.addEventListener("change", function (event) {
+ applyTheme(event.matches);
+ });
+})();
diff --git a/pygitweb/src/pygitweb/static_tests/test_navbar-auth.py b/pygitweb/src/pygitweb/static_tests/test_navbar-auth.py
index 8c845f3..8090f5e 100644
--- a/pygitweb/src/pygitweb/static_tests/test_navbar-auth.py
+++ b/pygitweb/src/pygitweb/static_tests/test_navbar-auth.py
@@ -86,12 +86,43 @@ def test_signed_in_user_gets_profile_and_sign_out(js: JsPage) -> None:
)
js.load("navbar-auth.js")
assert "dropdown" in js.classes("#navbar-user")
+ assert "dropup" in js.classes("#navbar-user")
assert js.attr("#navbar-user-link", "data-bs-toggle") == "dropdown"
assert js.prop("#navbar-user-profile", "href").endswith("/user")
assert "next=/" in js.prop("#navbar-user-logout", "href")
assert "d-none" not in js.classes("#navbar-user-menu")
+def test_top_navbar_menu_opens_downward(js: JsPage) -> None:
+ js.route("/auth/status", body={"auth_enabled": True, "username": "ada"})
+ js.set_html(
+ '
'
+ '
'
+ '
'
+ '
'
+ '
'
+ ''
+ "
"
+ )
+ js.load("navbar-auth.js")
+ assert "dropdown" in js.classes("#navbar-user")
+ assert "dropup" not in js.classes("#navbar-user")
+
+
+def test_signed_out_keeps_a_login_return_path(js: JsPage) -> None:
+ js.route("/auth/status", body={"auth_enabled": True, "username": ""})
+ js.set_html(
+ '
'
+ '
'
+ '
'
+ '
'
+ '
'
+ "
"
+ )
+ js.load("navbar-auth.js")
+ assert js.prop("#navbar-user-link", "href").endswith("/login?next=/project/demo/blog/")
+
+
def test_status_fetch_failure_sends_the_link_to_login(js: JsPage) -> None:
js.route("/auth/status", error="offline")
js.set_html(_NAV)
diff --git a/pygitweb/src/pygitweb/templates/blog.html b/pygitweb/src/pygitweb/templates/blog.html
index 97b271d..a740689 100644
--- a/pygitweb/src/pygitweb/templates/blog.html
+++ b/pygitweb/src/pygitweb/templates/blog.html
@@ -1,12 +1,59 @@
-{% extends "base.html" %}
-{% from "macros.html" import page_header %}
-{% block head %}
+
{% block title %}{{ title | default('PyGitWeb') }}{% endblock %}
+
+
+
+
+
+
+
-{% endblock %}
-{% block content %}
+
+
+
+
+
+
+
+
+{% from "macros.html" import page_header %}
-{% endblock %}
-{% block scripts %}
+
+
+
+
+
+
+