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
Refactor 'empty state' style and add it to graphs.
Kailash Nadh7300a05ebc6c
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 46a6fcd4..8f13118a 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -883,6 +883,9 @@ main {display: flex;flex-direction: column;gap: var(--space-3);+ justify-content: center;+ width: 100%;+ height: 100%;padding-block: var(--space-10);text-align: center;diff --git a/static/admin/assets/js/charts.js b/static/admin/assets/js/charts.jsindex 89cf42d5..54666d74 100644--- a/static/admin/assets/js/charts.js+++ b/static/admin/assets/js/charts.js@@ -21,6 +21,15 @@ export function lineChart(id, rows, comparison) {return;}+ const data = rows || [];+ if (!data.some((d) => d.count > 0) && !comparison?.some((d) => d.count > 0)) {+ const emptyState = canvas.parentElement.querySelector('template');+ if (emptyState) {+ canvas.parentElement.replaceChildren(emptyState.content.cloneNode(true));+ return;+ }+ }+// Get the primary colour.const el = document.createElement('div');el.style.color = 'var(--primary)';@@ -28,7 +37,6 @@ export function lineChart(id, rows, comparison) {const color = getComputedStyle(el).color || '#0055d4';el.remove();- const data = rows || [];Chart.defaults.font.family = FONT_FAMILY;const datasets = [{diff --git a/static/admin/assets/static/icons.svg b/static/admin/assets/static/icons.svgindex 26718671..e01f081a 100644--- a/static/admin/assets/static/icons.svg+++ b/static/admin/assets/static/icons.svg@@ -111,10 +111,6 @@<rect x="3" y="3" width="18" height="18" rx="2" ry="2" /><circle cx="8.5" cy="8.5" r="1.5" /><polyline points="21 15 16 10 5 21" /></symbol>- <symbol id="icon-inbox" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">- <polyline points="22 12 16 12 14 15 10 15 8 12 2 12" /><path d="M5.45 5.11L2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z" />- </symbol>-<symbol id="icon-info" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10" /><line x1="12" y1="16" x2="12" y2="12" /><line x1="12" y1="8" x2="12.01" y2="8" /></symbol>diff --git a/static/admin/icons.txt b/static/admin/icons.txtindex a23fbb23..3eeaba98 100644--- a/static/admin/icons.txt+++ b/static/admin/icons.txt@@ -27,7 +27,6 @@ file-textgridhelp-circleimage-inboxinfolink-2listdiff --git a/static/admin/partials/empty-state.html b/static/admin/partials/empty-state.htmlindex b8b4298f..0f2b137f 100644--- a/static/admin/partials/empty-state.html+++ b/static/admin/partials/empty-state.html@@ -2,7 +2,7 @@{{- /* Optional data is a colspan, which wraps the block in a table row for use inside a <tbody>. */ -}}{{- if . }}<tr><td colspan="{{ . }}">{{ end -}}<div class="empty-state">- {{ Icon "inbox" }}+ {{ Icon "sun" }}<p>{{ L.T "globals.messages.emptyState" }}</p></div>{{- if . }}</td></tr>{{ end -}}diff --git a/static/admin/partials/list-info.html b/static/admin/partials/list-info.htmlindex 8a3b7fc3..9086f8af 100644--- a/static/admin/partials/list-info.html+++ b/static/admin/partials/list-info.html@@ -54,14 +54,20 @@<div class="col-6"><article class="card float"><h5 class="title">{{ .L.Tc "globals.terms.subscriptions" 2 }}</h5>- <div class="chart-box"><canvas id="chart-subscriptions" data-extra-label="{{ .L.T "globals.terms.unsubscribed" }}" role="img" aria-label="{{ .L.Tc "globals.terms.subscriptions" 2 }}"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-subscriptions" data-extra-label="{{ .L.T "globals.terms.unsubscribed" }}" role="img" aria-label="{{ .L.Tc "globals.terms.subscriptions" 2 }}"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div>{{ if $d.CanViewCampaignCharts }}<div class="col-6"><article class="card float"><h5 class="title">{{ .L.T "dashboard.campaignViews" }}</h5>- <div class="chart-box"><canvas id="chart-list-views" role="img" aria-label="{{ .L.T "dashboard.campaignViews" }}"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-list-views" role="img" aria-label="{{ .L.T "dashboard.campaignViews" }}"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div>{{ end }}diff --git a/static/admin/partials/subscriber-info.html b/static/admin/partials/subscriber-info.htmlindex 4ad06ae3..938772bb 100644--- a/static/admin/partials/subscriber-info.html+++ b/static/admin/partials/subscriber-info.html@@ -27,13 +27,19 @@<div class="col-6"><article class="card float"><h5 class="title">{{ .L.T "globals.terms.views" }}</h5>- <div class="chart-box"><canvas id="chart-subscriber-views" role="img" aria-label="{{ .L.T "globals.terms.views" }}"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-subscriber-views" role="img" aria-label="{{ .L.T "globals.terms.views" }}"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div><div class="col-6"><article class="card float"><h5 class="title">{{ .L.T "globals.terms.clicks" }}</h5>- <div class="chart-box"><canvas id="chart-subscriber-clicks" role="img" aria-label="{{ .L.T "globals.terms.clicks" }}"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-subscriber-clicks" role="img" aria-label="{{ .L.T "globals.terms.clicks" }}"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div></section>diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.htmlindex 79e35348..5bae9a87 100644--- a/static/admin/views/dashboard.html+++ b/static/admin/views/dashboard.html@@ -59,14 +59,20 @@<div class="col-6"><article class="card float"><h5 class="title"><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.campaignViews" }}</a></h5>- <div class="chart-box"><canvas id="chart-views"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-views"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div><div class="col-6"><article class="card float"><h5 class="title"><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.linkClicks" }}</a></h5>- <div class="chart-box"><canvas id="chart-clicks"></canvas></div>+ <div class="chart-box">+ <canvas id="chart-clicks"></canvas>+ <template>{{ template "empty-state" }}</template>+ </div></article></div></section>