From db3f48ec75594a0fa170206576a0e8216eb38120 Mon Sep 17 00:00:00 2001 From: giles Date: Sat, 28 Feb 2026 23:03:46 +0000 Subject: [PATCH] Remove app_label text from root header, keep settings cog The word "settings" (app_label) was showing next to "Rose Ash 2.0" in the top bar. Removed that label while restoring the settings cog icon on the right side of the menu bar. Co-Authored-By: Claude Opus 4.6 --- shared/sexp/helpers.py | 6 +++++- shared/sexp/templates/layout.sexp | 12 +++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/shared/sexp/helpers.py b/shared/sexp/helpers.py index 56cda57..c808915 100644 --- a/shared/sexp/helpers.py +++ b/shared/sexp/helpers.py @@ -33,15 +33,19 @@ def get_asset_url(ctx: dict) -> str: def root_header_html(ctx: dict, *, oob: bool = False) -> str: """Build the root header row HTML.""" + rights = ctx.get("rights") or {} + is_admin = rights.get("admin") if isinstance(rights, dict) else getattr(rights, "admin", False) + settings_url = call_url(ctx, "blog_url", "/settings/") if is_admin else "" return render( "header-row", cart_mini_html=ctx.get("cart_mini_html", ""), blog_url=call_url(ctx, "blog_url", ""), site_title=ctx.get("base_title", ""), - app_label=ctx.get("app_label", ""), nav_tree_html=ctx.get("nav_tree_html", ""), auth_menu_html=ctx.get("auth_menu_html", ""), nav_panel_html=ctx.get("nav_panel_html", ""), + settings_url=settings_url, + is_admin=is_admin, oob=oob, ) diff --git a/shared/sexp/templates/layout.sexp b/shared/sexp/templates/layout.sexp index c61ae7f..416c640 100644 --- a/shared/sexp/templates/layout.sexp +++ b/shared/sexp/templates/layout.sexp @@ -97,7 +97,8 @@ (path :d "M6 9l6 6 6-6" :fill "currentColor")))) (defcomp ~header-row (&key cart-mini-html blog-url site-title app-label - nav-tree-html auth-menu-html nav-panel-html oob) + nav-tree-html auth-menu-html nav-panel-html + settings-url is-admin oob) (<> (div :id "root-row" :hx-swap-oob (if oob "outerHTML" nil) @@ -106,13 +107,14 @@ (when cart-mini-html (raw! cart-mini-html)) (div :class "font-bold text-5xl flex-1" (a :href (or blog-url "/") :class "flex justify-center md:justify-start items-baseline gap-2" - (h1 (or site-title "")) - (when app-label - (span :class "!text-2xl font-normal text-white" app-label)))) + (h1 (or site-title "")))) (nav :class "hidden md:flex gap-4 text-sm ml-2 justify-end items-center flex-0" (when nav-tree-html (raw! nav-tree-html)) (when auth-menu-html (raw! auth-menu-html)) - (when nav-panel-html (raw! nav-panel-html))) + (when nav-panel-html (raw! nav-panel-html)) + (when (and is-admin settings-url) + (a :href settings-url :class "justify-center cursor-pointer flex flex-row items-center gap-2 rounded bg-stone-200 text-black p-3" + (i :class "fa fa-cog" :aria-hidden "true")))) (~hamburger))) (div :class "block md:hidden text-md font-bold" (when auth-menu-html (raw! auth-menu-html)))))