High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Remove inconsistent back chevron links and replace it with breadcrumbs.
Kailash Nadh128039ffb091
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 0f97c2fe..0c7a15ed 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -818,20 +818,41 @@ main {--avatar-accent: #e5b56f;}/* Components */-.page-header {- min-height: calc(1lh + 2 * var(--space-2) + 2px);- margin-bottom: var(--space-6);+.breadcrumbs {+ margin-block-end: var(--space-3);+ color: var(--muted-foreground);+ font-size: var(--text-8);- .back {- display: inline-flex;- align-items: center;+ ol {+ display: flex;+ flex-wrap: wrap;+ align-items: baseline;+ gap: var(--space-1) var(--space-2);+ list-style: none;+ margin: 0;+ padding: 0;+ }- .icon {- font-size: var(--text-1);- margin: 0;- }+ li {+ display: flex;+ gap: var(--space-2);+ min-width: 0;+ overflow-wrap: anywhere;}+ a {+ color: inherit;+ }++ a:hover {+ color: var(--foreground);+ }+}++.page-header {+ min-height: calc(1lh + 2 * var(--space-2) + 2px);+ margin-bottom: var(--space-6);+h1,h4 {margin-block-end: 0;diff --git a/static/admin/partials/list-form.html b/static/admin/partials/list-form.htmlindex aab0bff3..18affe73 100644--- a/static/admin/partials/list-form.html+++ b/static/admin/partials/list-form.html@@ -55,7 +55,6 @@{{- end }}</div><div class="hstack gap-3 justify-end">- <a href="{{ URI "/admin/lists" }}" class="button outline external">{{ $root.L.T "globals.buttons.back" }}</a>{{- if $canSave }}<button type="submit" data-variant="primary" data-testid="btn-save" data-spinner="small" :disabled="isLoading('lists.save')" :aria-busy="isLoading('lists.save')">{{ $root.L.T "globals.buttons.save" }}</button>{{- end }}diff --git a/static/admin/partials/subscriber-form.html b/static/admin/partials/subscriber-form.htmlindex e8f92f62..54aa2a39 100644--- a/static/admin/partials/subscriber-form.html+++ b/static/admin/partials/subscriber-form.html@@ -39,7 +39,6 @@{{- end }}</div><div class="hstack gap-3 justify-end">- <a href="{{ URI "/admin/subscribers" }}" class="button outline external">{{ $root.L.T "globals.buttons.back" }}</a>{{- if $canSave }}<button type="submit" data-variant="primary" data-testid="btn-save" :disabled="isLoading('subscribers.save')" :aria-busy="isLoading('subscribers.save')">{{ $root.L.T "globals.buttons.save" }}</button>{{- end }}diff --git a/static/admin/views/analytics.html b/static/admin/views/analytics.htmlindex 6c00d208..358e8829 100644--- a/static/admin/views/analytics.html+++ b/static/admin/views/analytics.html@@ -1,5 +1,6 @@{{ define "admin-campaign-analytics" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.campaigns") "URL" (URI "/admin/campaigns") "CanLink" (.Data.Can "campaigns:get" "campaigns:get_all"))) }}{{- $d := .Data -}}<script>diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.htmlindex 28a0a5e1..8bc7668a 100644--- a/static/admin/views/bounces.html+++ b/static/admin/views/bounces.html@@ -1,5 +1,6 @@{{ define "admin-bounces" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.subscribers") "URL" (URI "/admin/subscribers") "CanLink" (.Data.Can "subscribers:get" "subscribers:get_all"))) }}{{- $d := .Data -}}{{- $base := URI "/admin/subscribers/bounces" -}}{{- $source := $d.Page.Param "source" -}}diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.htmlindex 3c91c846..465c6a13 100644--- a/static/admin/views/campaign.html+++ b/static/admin/views/campaign.html@@ -1,5 +1,8 @@{{ define "admin-campaign" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "campaigns.newCampaign" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.Campaign.Name }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.campaigns") "URL" (URI "/admin/campaigns") "CanLink" (.Data.Can "campaigns:get" "campaigns:get_all"))) }}{{- $d := .Data -}}{{- $c := $d.Campaign -}}{{- $isNew := $d.IsNew -}}@@ -20,7 +23,6 @@<header class="row page-header"><div class="{{ if $showRight }}col-6{{ else }}col-12{{ end }}"><div class="hstack">- <a href="{{ URI "/admin/campaigns" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title{{ if eq $c.Status "cancelled" }} disabled{{ end }}">{{- if not $isNew }}{{ template "avatar-icon" dict "Kind" "campaign" "Name" $c.Name }}diff --git a/static/admin/views/forms.html b/static/admin/views/forms.htmlindex 8bf425df..6cc67f32 100644--- a/static/admin/views/forms.html+++ b/static/admin/views/forms.html@@ -1,5 +1,6 @@{{ define "admin-forms" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.lists") "URL" (URI "/admin/lists") "CanLink" true)) }}{{- $d := .Data -}}<script>const _lists = {{ ToJSON $d.PublicLists }};</script>diff --git a/static/admin/views/import.html b/static/admin/views/import.htmlindex 02a9d3a5..8bfa3890 100644--- a/static/admin/views/import.html+++ b/static/admin/views/import.html@@ -1,5 +1,6 @@{{ define "admin-import" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.subscribers") "URL" (URI "/admin/subscribers") "CanLink" (.Data.Can "subscribers:get" "subscribers:get_all"))) }}{{- $d := .Data -}}{{- $show := or (eq $d.Status.Status "none") (eq $d.Status.Status "") -}}diff --git a/static/admin/views/list-role.html b/static/admin/views/list-role.htmlindex 41d67f5b..6c093ab8 100644--- a/static/admin/views/list-role.html+++ b/static/admin/views/list-role.html@@ -1,8 +1,10 @@{{ define "admin-list-role" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "users.newListRole" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.Role.Name.String }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.users") "URL" (URI "/admin/users") "CanLink" (.Data.Can "users:get")) (dict "Label" (.L.T "users.listRoles") "URL" (URI "/admin/users/roles/lists") "CanLink" (.Data.Can "roles:get"))) }}{{- $d := .Data -}}{{- $canManage := $d.Can "roles:manage" -}}-{{- $base := URI "/admin/users/roles/lists" -}}<script>window._role = {{ ToJSON $d.Role }};@@ -11,7 +13,6 @@<section class="roles" x-data="roleForm({ type: 'list', isNew: {{ $d.IsNew }}, canManage: {{ $canManage }} })"><header class="page-header"><div class="hstack gap-1">- <a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title">{{- if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "list-role" "Name" $d.Role.Name.String }}{{ end }}<h1 class="page-title avatar-label">@@ -83,7 +84,6 @@</a></div><div class="hstack gap-3 justify-end">- <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a><button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button></div></footer>diff --git a/static/admin/views/list.html b/static/admin/views/list.htmlindex 7b269277..a0ac9187 100644--- a/static/admin/views/list.html+++ b/static/admin/views/list.html@@ -1,12 +1,14 @@{{ define "admin-list" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "lists.newList" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.List.Name }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.lists") "URL" (URI "/admin/lists") "CanLink" true)) }}{{- $d := .Data -}}<script>const _form = {{ if $d.IsNew }}null{{ else }}{{ ToJSON $d.List }}{{ end }};</script><section class="lists" x-data="listsView(_form)"><header class="page-header"><div class="hstack gap-1">- <a href="{{ URI "/admin/lists" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title{{ if eq $d.List.Status "archived" }} disabled{{ end }}">{{ if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "list" "Name" $d.List.Name }}{{ end }}<h1 class="page-title avatar-label">{{ if $d.IsNew }}{{ .L.T "lists.newList" }}{{ else }}{{ $d.List.Name }}{{ end }}</h1>diff --git a/static/admin/views/logs.html b/static/admin/views/logs.htmlindex 328fbe93..74eecf5c 100644--- a/static/admin/views/logs.html+++ b/static/admin/views/logs.html@@ -1,5 +1,6 @@{{ define "admin-logs" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "menu.settings") "URL" (URI "/admin/settings") "CanLink" (.Data.Can "settings:get"))) }}{{- $d := .Data -}}<section class="logs relative" x-data="logsView">diff --git a/static/admin/views/maintenance.html b/static/admin/views/maintenance.htmlindex 63564c89..da5751c4 100644--- a/static/admin/views/maintenance.html+++ b/static/admin/views/maintenance.html@@ -1,5 +1,6 @@{{ define "admin-maintenance" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "menu.settings") "URL" (URI "/admin/settings") "CanLink" (.Data.Can "settings:get"))) }}{{- $d := .Data -}}<section class="maintenance" x-data="maintenanceView">diff --git a/static/admin/views/media.html b/static/admin/views/media.htmlindex 83264475..73f57d2e 100644--- a/static/admin/views/media.html+++ b/static/admin/views/media.html@@ -1,5 +1,6 @@{{ define "admin-media" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.campaigns") "URL" (URI "/admin/campaigns") "CanLink" (.Data.Can "campaigns:get" "campaigns:get_all"))) }}{{ template "media-gallery" dict "Root" . "Mode" "manage" }}diff --git a/static/admin/views/roles.html b/static/admin/views/roles.htmlindex dee3a6a1..4608c832 100644--- a/static/admin/views/roles.html+++ b/static/admin/views/roles.html@@ -1,5 +1,6 @@{{ define "admin-roles" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.users") "URL" (URI "/admin/users") "CanLink" (.Data.Can "users:get"))) }}{{- $d := .Data -}}{{- $base := URI "/admin/users/roles" -}}{{- if eq $d.Type "list" }}{{ $base = URI "/admin/users/roles/lists" }}{{ end -}}diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.htmlindex d32ab3ee..f3fdc55f 100644--- a/static/admin/views/subscriber.html+++ b/static/admin/views/subscriber.html@@ -1,5 +1,8 @@{{ define "admin-subscriber" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "subscribers.newSubscriber" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.Subscriber.Email }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.subscribers") "URL" (URI "/admin/subscribers") "CanLink" (.Data.Can "subscribers:get" "subscribers:get_all"))) }}{{- $d := .Data -}}{{- $sub := $d.Subscriber -}}{{- $base := printf "%s/%d" (URI "/admin/subscribers") $sub.ID -}}@@ -12,7 +15,6 @@<header class="row page-header"><div class="col-6"><div class="hstack gap-1">- <a href="{{ URI "/admin/subscribers" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title{{ if eq $sub.Status "blocklisted" }} disabled{{ end }}">{{ if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "subscriber" "Name" (or $sub.Name $sub.Email) }}{{ end }}<h1 class="page-title avatar-label">diff --git a/static/admin/views/template.html b/static/admin/views/template.htmlindex 33b2772b..b572c9a3 100644--- a/static/admin/views/template.html+++ b/static/admin/views/template.html@@ -1,9 +1,11 @@{{ define "admin-template" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "templates.newTemplate" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.Template.Name }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.campaigns") "URL" (URI "/admin/campaigns") "CanLink" (.Data.Can "campaigns:get" "campaigns:get_all")) (dict "Label" (.L.T "globals.terms.templates") "URL" (URI "/admin/templates") "CanLink" (.Data.Can "templates:get"))) }}{{- $d := .Data -}}{{- $t := $d.Template -}}{{- $isNew := $d.IsNew -}}-{{- $base := URI "/admin/templates" -}}{{- $canManage := $d.Can "templates:manage" -}}<script>@@ -16,7 +18,6 @@<header class="row page-header"><div class="col-6"><div class="hstack gap-1">- <a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title">{{- if not $isNew }}{{- $kind := "campaign-template" -}}diff --git a/static/admin/views/templates.html b/static/admin/views/templates.htmlindex 584225e2..2b5e5a10 100644--- a/static/admin/views/templates.html+++ b/static/admin/views/templates.html@@ -1,5 +1,6 @@{{ define "admin-templates" -}}{{ template "admin-header" . }}+{{ template "breadcrumbs" dict "Root" . "Current" .Data.Title "Parents" (list (dict "Label" (.L.T "globals.terms.campaigns") "URL" (URI "/admin/campaigns") "CanLink" (.Data.Can "campaigns:get" "campaigns:get_all"))) }}{{- $d := .Data -}}{{- $base := URI "/admin/templates" -}}{{- $canManage := $d.Can "templates:manage" -}}diff --git a/static/admin/views/user-role.html b/static/admin/views/user-role.htmlindex d71fe35c..0d4f3610 100644--- a/static/admin/views/user-role.html+++ b/static/admin/views/user-role.html@@ -1,8 +1,10 @@{{ define "admin-user-role" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "users.newUserRole" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = .Data.Role.Name.String }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.users") "URL" (URI "/admin/users") "CanLink" (.Data.Can "users:get")) (dict "Label" (.L.T "users.userRoles") "URL" (URI "/admin/users/roles") "CanLink" (.Data.Can "roles:get"))) }}{{- $d := .Data -}}{{- $canManage := $d.Can "roles:manage" -}}-{{- $base := URI "/admin/users/roles" -}}<script>window._role = {{ ToJSON $d.Role }};@@ -11,7 +13,6 @@<section class="roles" x-data="roleForm({ type: 'user', isNew: {{ $d.IsNew }}, canManage: {{ $canManage }} })"><header class="page-header"><div class="hstack gap-1">- <a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title">{{- if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "user-role" "Name" $d.Role.Name.String }}{{ end }}<h1 class="page-title avatar-label">@@ -87,7 +88,6 @@</a></div><div class="hstack gap-3 justify-end">- <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a><button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button></div></footer>diff --git a/static/admin/views/user.html b/static/admin/views/user.htmlindex 017f5f6c..cd29b20f 100644--- a/static/admin/views/user.html+++ b/static/admin/views/user.html@@ -1,7 +1,9 @@{{ define "admin-user" -}}{{ template "admin-header" . }}+{{- $crumbTitle := .L.T "users.newUser" -}}+{{- if not .Data.IsNew }}{{ $crumbTitle = (or .Data.User.Name .Data.User.Username) }}{{ end -}}+{{ template "breadcrumbs" dict "Root" . "Current" $crumbTitle "Parents" (list (dict "Label" (.L.T "globals.terms.users") "URL" (URI "/admin/users") "CanLink" (.Data.Can "users:get"))) }}{{- $d := .Data -}}-{{- $base := URI "/admin/users" -}}{{- $canSave := $d.Can "users:manage" -}}<script>@@ -11,7 +13,6 @@<section class="users" x-data="userForm({ isNew: {{ $d.IsNew }}, canSave: {{ $canSave }} })"><header class="page-header"><div class="hstack gap-1">- <a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a><div class="avatar avatar-title{{ if eq $d.User.Status "disabled" }} disabled{{ end }}">{{- if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "user" "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}<h1 class="page-title avatar-label">@@ -110,7 +111,6 @@{{- end }}</div><div class="hstack gap-3 justify-end">- <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a>{{- if $canSave }}<button type="submit" data-variant="primary" data-testid="btn-save" :disabled="isLoading('users.save')" :aria-busy="isLoading('users.save')">{{ .L.T "globals.buttons.save" }}</button>{{- end }}