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
Add missing `disabled` subscriber status to admin UI rendering.
Kailash Nadhc467daedda00
diff --git a/i18n/en.json b/i18n/en.jsonindex a375aa15..f65090d7 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -716,6 +716,7 @@"subscribers.sentOptinConfirm": "Opt-in confirmation sent","subscribers.status.blocklisted": "Blocklisted","subscribers.status.confirmed": "Confirmed",+ "subscribers.status.disabled": "Disabled","subscribers.status.enabled": "Enabled","subscribers.status.subscribed": "Subscribed","subscribers.status.unconfirmed": "Unconfirmed",diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 2541a212..9a10900a 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -274,7 +274,8 @@ a:has(> .badge:only-child) {color: var(--tone-rose);}- &.status-blocklisted {+ &.status-blocklisted,+ &.status-disabled {color: var(--tone-red);}diff --git a/static/admin/partials/media-gallery.html b/static/admin/partials/media-gallery.htmlindex 998ba092..8666b372 100644--- a/static/admin/partials/media-gallery.html+++ b/static/admin/partials/media-gallery.html@@ -6,7 +6,7 @@{{- $canManage := $d.Can "media:manage" -}}<section class="media-files" x-data="mediaView({{ if $picker }}'picker'{{ else }}'manage'{{ end }})"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><div class="hstack"><h1 class="page-title">{{ $root.L.T "media.title" }}@@ -15,7 +15,7 @@{{- if $d.Provider }}<div class="text-lighter">{{ $d.Provider }}</div>{{ end }}</div></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end"><form method="get" action="{{ URI "/admin/campaigns/media" }}{{ if $picker }}/fragment{{ end }}" class="search-form">{{- $d.Page.FormFields "query" -}}<fieldset class="group">diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.htmlindex cfedfd40..ca5b8612 100644--- a/static/admin/views/campaigns.html+++ b/static/admin/views/campaigns.html@@ -8,7 +8,7 @@<section class="campaigns" x-data="campaignsView"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "globals.terms.campaigns" }}<span>({{ $d.Page.Total }})</span>@@ -18,7 +18,7 @@{{- if gt $d.Page.Page 1 }} {{ template "filter-badge" dict "Label" (.L.Ts "globals.terms.page" "n" (printf "%d" $d.Page.Page)) "URL" ($d.Page.FilterURL $base) }}{{ end }}</h1></div>- <div class="col-6 hstack justify-end">+ <div class="col-8 hstack justify-end"><form method="get" action="{{ $base }}" class="search-form">{{- $d.Page.FormFields "query" "page" -}}<fieldset class="group">diff --git a/static/admin/views/forms.html b/static/admin/views/forms.htmlindex 1625343c..307be249 100644--- a/static/admin/views/forms.html+++ b/static/admin/views/forms.html@@ -5,10 +5,10 @@<script>const _lists = {{ ToJSON $d.PublicLists }};</script><section class="forms" x-data="formsView(_lists)"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "forms.title" }}</h1></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end">{{- if $.ConfigJS.PublicSubscription.Enabled }}<a href="{{ $.ConfigJS.RootURL }}/subscription/form" target="_blank" rel="noopener noreferrer" class="button outline small" data-testid="url" title="{{ $.ConfigJS.RootURL }}/subscription/form">{{ Icon "arrow-up-right" }} {{ .L.T "forms.publicSubPage" }}diff --git a/static/admin/views/lists.html b/static/admin/views/lists.htmlindex fc518c6b..ce2b5e47 100644--- a/static/admin/views/lists.html+++ b/static/admin/views/lists.html@@ -11,7 +11,7 @@<section class="lists" x-data="listsView"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "globals.terms.lists" }}<span>({{ $d.Page.Total }})</span>@@ -28,7 +28,7 @@{{- if gt $d.Page.Page 1 }} {{ template "filter-badge" dict "Label" (.L.Ts "globals.terms.page" "n" (printf "%d" $d.Page.Page)) "URL" ($d.Page.FilterURL $base) }}{{ end }}</h1></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end"><form method="get" action="{{ URI "/admin/lists" }}" class="search-form">{{- $d.Page.FormFields "query" -}}<fieldset class="group">diff --git a/static/admin/views/roles.html b/static/admin/views/roles.htmlindex 164f30b9..a8018901 100644--- a/static/admin/views/roles.html+++ b/static/admin/views/roles.html@@ -6,7 +6,7 @@<section class="roles" x-data="rolesView({ type: {{ ToJSON $d.Type }} })"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><div class="hstack"><h1 class="page-title">{{ if eq $d.Type "list" }}{{ .L.T "users.listRoles" }}{{ else }}{{ .L.T "users.userRoles" }}{{ end }}@@ -14,7 +14,7 @@</h1></div></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end">{{- if $d.Can "roles:manage" }}<a href="{{ $base }}/new" class="button" data-variant="primary" data-testid="btn-new">{{ Icon "plus" }} {{ .L.T "globals.buttons.new" }}diff --git a/static/admin/views/settings.html b/static/admin/views/settings.htmlindex 0456f14c..238db88c 100644--- a/static/admin/views/settings.html+++ b/static/admin/views/settings.html@@ -10,13 +10,13 @@<form class="settings" @submit.prevent="onSubmit" x-data="settingsView(_settings, _userRoles, _listRoles)"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "settings.title" }}<span>({{ $d.Version }})</span></h1></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end"><div class="search-form settings-search"><fieldset class="group"><input type="search" x-ref="search" data-cy="search" @input="onSearch($event)"diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.htmlindex 818adbb3..d4b32f7f 100644--- a/static/admin/views/subscribers.html+++ b/static/admin/views/subscribers.html@@ -4,7 +4,7 @@{{- $subStatus := $d.Page.Param "subscription_status" -}}{{- $status := $d.Page.Param "status" -}}{{- $base := URI "/admin/subscribers" -}}-{{- $statusIcons := dict "confirmed" "check-circle" "blocklisted" "x-circle" "unsubscribed" "minus-circle" "unconfirmed" "help-circle" -}}+{{- $statusIcons := dict "confirmed" "check-circle" "blocklisted" "x-circle" "disabled" "pause-circle" "unsubscribed" "minus-circle" "unconfirmed" "help-circle" -}}{{- if $d.CurrentList }}{{ $base = printf "%s/lists/%d" (URI "/admin/subscribers") $d.CurrentList.ID }}{{ end -}}<script>@@ -19,7 +19,7 @@<section class="subscribers" x-data="subscribersView()"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "globals.terms.subscribers" }}<span>({{ $d.Page.Total }})</span>@@ -30,7 +30,7 @@{{- if gt $d.Page.Page 1 }} {{ template "filter-badge" dict "Label" (.L.Ts "globals.terms.page" "n" (printf "%d" $d.Page.Page)) "URL" ($d.Page.FilterURL $base) }}{{ end }}</h1></div>- <div class="col-6 col-end hstack justify-end">+ <div class="col-8 col-end hstack justify-end"><form action="{{ $base }}" class="search-form" :method="advanced ? 'post' : 'get'">{{- $d.Page.FormFields "search" "query" "page" -}}<ot-dropdown>@@ -109,7 +109,7 @@<a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>{{- if ne .Status "enabled" }}{{- $label := $.L.T (printf "subscribers.status.%s" .Status) }}- <a href="{{ $base }}?status={{ .Status }}" class="status-icon status-{{ .Status }}" title="{{ $label }}" aria-label="{{ $label }}">{{ Icon (index $statusIcons .Status) }}</a>+ <a href="{{ $base }}?status={{ .Status }}" class="status-icon status-{{ .Status }}" title="{{ $label }}" aria-label="{{ $label }}">{{ Icon (or (index $statusIcons .Status) "help-circle") }}</a>{{- end }}{{- if .ParsedLists }}<div class="hstack gap-4 text-7 mt-2">@@ -119,7 +119,7 @@<a class="unstyled text-light" href="{{ URI "/admin/subscribers/lists" }}/{{ $l.ID }}">{{ $l.Name }}{{- if or (eq $l.Optin "double") (eq $l.SubscriptionStatus "unsubscribed") }}{{- $label := $.L.T (printf "subscribers.status.%s" $l.SubscriptionStatus) }}- <span class="status-icon status-{{ $l.SubscriptionStatus }}" title="{{ $label }}" aria-label="{{ $label }}">{{ Icon (index $statusIcons $l.SubscriptionStatus) }}</span>+ <span class="status-icon status-{{ $l.SubscriptionStatus }}" title="{{ $label }}" aria-label="{{ $label }}">{{ Icon (or (index $statusIcons $l.SubscriptionStatus) "help-circle") }}</span>{{- end }}</a></span>diff --git a/static/admin/views/templates.html b/static/admin/views/templates.htmlindex abd9e6b2..5f7f5e2c 100644--- a/static/admin/views/templates.html+++ b/static/admin/views/templates.html@@ -6,7 +6,7 @@<section class="templates" x-data="templatesView"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><h1 class="page-title">{{ .L.T "globals.terms.templates" }}<span>({{ len $d.Templates }})</span>@@ -19,7 +19,7 @@{{- end }}</h1></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end">{{- if $canManage }}<a href="{{ $base }}/new" class="button" data-variant="primary" data-testid="btn-new">{{ Icon "plus" }} {{ .L.T "globals.buttons.new" }}diff --git a/static/admin/views/users.html b/static/admin/views/users.htmlindex 1296a9d1..9e3ee231 100644--- a/static/admin/views/users.html+++ b/static/admin/views/users.html@@ -5,7 +5,7 @@<section class="users" x-data="usersView()"><header class="row page-header">- <div class="col-6">+ <div class="col-4"><div class="hstack"><h1 class="page-title">{{ .L.T "globals.terms.users" }}@@ -26,7 +26,7 @@</h1></div></div>- <div class="col-6 col-end align-right hstack justify-end">+ <div class="col-8 col-end align-right hstack justify-end">{{- if $d.Can "users:manage" }}<a href="{{ URI "/admin/users" }}/new" class="button" data-variant="primary" data-testid="btn-new">{{ Icon "plus" }} {{ .L.T "globals.buttons.new" }}