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
Switch multiple floating cards to fieldset-style card across views.
Kailash Nadhb8049d0f73d4
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 2903c75f..5fdee352 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -194,6 +194,34 @@ ot-tabs:not(:defined) {background-color: light-dark(#ededee, var(--muted));}+/* Fieldset-style cards. */+@layer components {+ .card.float {+ margin-block-start: 0.75em;+ }+}++.card.float {+ padding: var(--space-4);+ box-shadow: none;++ > .title {+ width: fit-content;+ max-width: 100%;+ margin: -26px 0 var(--space-4) 0;+ padding: 0 var(--space-2);+ font-size: var(--text-7);+ font-weight: var(--font-medium);+ line-height: var(--leading-normal);+ }++ &.has-table {+ .title {+ margin-bottom: 0;+ }+ }+}+fieldset {&.card {padding-block-start: var(--space-4);@@ -835,6 +863,11 @@ td > .empty-state {&.card.has-table {padding-block-start: 0;padding-block-end: 0;++ &:where(.float) {+ padding-block-start: var(--space-4);+ padding-inline: var(--space-6);+ }}.col-bleed {diff --git a/static/admin/partials/subscriber-activity.html b/static/admin/partials/subscriber-activity.htmlindex e33a6ca7..a751a81a 100644--- a/static/admin/partials/subscriber-activity.html+++ b/static/admin/partials/subscriber-activity.html@@ -8,39 +8,43 @@</div>{{- if $d.CampaignViews }}- <div class="card mt-6">- <h5>{{ .L.T "campaigns.views" }}</h5>- <table>- <thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th width="10%">{{ .L.T "campaigns.views" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>- <tbody>- {{- range $d.CampaignViews }}- <tr>- <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a><p class="text-light">{{ .Subject }}</p></td>- <td data-label="{{ $.L.T "campaigns.views" }}">{{ .ViewCount }}</td>- <td data-label="{{ $.L.T "globals.fields.createdAt" }}">{{ NiceDate .LastViewedAt }}</td>- </tr>- {{- end }}- </tbody>- </table>+ <div class="card float page-content has-table mt-6">+ <h5 class="title">{{ .L.T "campaigns.views" }}</h5>+ <div class="table-wrapper">+ <table>+ <thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th width="10%">{{ .L.T "campaigns.views" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>+ <tbody>+ {{- range $d.CampaignViews }}+ <tr>+ <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a><p class="text-light">{{ .Subject }}</p></td>+ <td data-label="{{ $.L.T "campaigns.views" }}">{{ .ViewCount }}</td>+ <td data-label="{{ $.L.T "globals.fields.createdAt" }}">{{ NiceDate .LastViewedAt }}</td>+ </tr>+ {{- end }}+ </tbody>+ </table>+ </div></div>{{- end }}{{- if $d.LinkClicks }}- <div class="card mt-6">- <h5>{{ .L.T "campaigns.clicks" }}</h5>- <table>- <thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th>{{ .L.T "globals.terms.url" }}</th><th width="10%">{{ .L.T "campaigns.clicks" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>- <tbody>- {{- range $d.LinkClicks }}- <tr>- <td>{{- if .CampaignID }}<a href="{{ URI "/admin/campaigns" }}/{{ .CampaignID }}">{{ or .CampaignSubject .CampaignName }}</a>{{- end }}</td>- <td class="link-click-url" data-label="{{ $.L.T "globals.terms.url" }}"><a href="{{ .URL }}" target="_blank" rel="noopener noreferrer">{{ .URL }}</a></td>- <td data-label="{{ $.L.T "campaigns.clicks" }}">{{ .ClickCount }}</td>- <td data-label="{{ $.L.T "globals.fields.createdAt" }}">{{ NiceDate .LastClickedAt }}</td>- </tr>- {{- end }}- </tbody>- </table>+ <div class="card float page-content has-table mt-6">+ <h5 class="title">{{ .L.T "campaigns.clicks" }}</h5>+ <div class="table-wrapper">+ <table>+ <thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th>{{ .L.T "globals.terms.url" }}</th><th width="10%">{{ .L.T "campaigns.clicks" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>+ <tbody>+ {{- range $d.LinkClicks }}+ <tr>+ <td>{{- if .CampaignID }}<a href="{{ URI "/admin/campaigns" }}/{{ .CampaignID }}">{{ or .CampaignSubject .CampaignName }}</a>{{- end }}</td>+ <td class="link-click-url" data-label="{{ $.L.T "globals.terms.url" }}"><a href="{{ .URL }}" target="_blank" rel="noopener noreferrer">{{ .URL }}</a></td>+ <td data-label="{{ $.L.T "campaigns.clicks" }}">{{ .ClickCount }}</td>+ <td data-label="{{ $.L.T "globals.fields.createdAt" }}">{{ NiceDate .LastClickedAt }}</td>+ </tr>+ {{- end }}+ </tbody>+ </table>+ </div></div>{{- end }}</div>diff --git a/static/admin/views/analytics.html b/static/admin/views/analytics.htmlindex 9736d5dd..924d732d 100644--- a/static/admin/views/analytics.html+++ b/static/admin/views/analytics.html@@ -14,8 +14,8 @@<div class="vstack gap-6"><form method="get" action="{{ URI "/admin/campaigns/analytics" }}" x-data="analyticsForm()" @submit="submitting = true">- <fieldset class="card">- <legend>{{ .L.T "analytics.title" }}</legend>+ <div class="card float">+ <h4 class="title">{{ .L.T "analytics.title" }}</h4><div class="row"><div class="col-5"><label data-field>@@ -48,7 +48,7 @@</data></div></div>- </fieldset>+ </div></form>{{- if $d.HasData }}@@ -56,8 +56,8 @@{{ template "analytics-chart" dict "Title" (.L.T "campaigns.clicks") "Count" $d.Counts.Clicks "Key" "clicks" }}{{ template "analytics-chart" dict "Title" (.L.T "globals.terms.bounces") "Count" $d.Counts.Bounces "Key" "bounces" }}- <article class="card">- <h4>{{ .L.T "analytics.links" }}</h4>+ <article class="card float">+ <h4 class="title">{{ .L.T "analytics.links" }}</h4>{{- if $d.Data.Links }}<div class="chart-box"><canvas id="chart-links"></canvas></div>{{- else }}@@ -75,8 +75,8 @@{{ define "analytics-chart" -}}{{- $key := .Key -}}-<article class="card">- <h4>{{ .Title }}{{ if gt .Count 0 }} <span class="text-lighter">({{ FormatNumber .Count }})</span>{{ end }}</h4>+<article class="card float">+ <h4 class="title">{{ .Title }}{{ if gt .Count 0 }} <span class="text-lighter">({{ FormatNumber .Count }})</span>{{ end }}</h4>{{- if gt .Count 0 }}<div class="row"><div class="col-9"><div class="chart-box"><canvas id="chart-{{ $key }}"></canvas></div></div>diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.htmlindex af3a42cd..2cf623c7 100644--- a/static/admin/views/dashboard.html+++ b/static/admin/views/dashboard.html@@ -57,15 +57,15 @@<section class="row"><div class="col-6">- <article class="card">- <header class="mb-4"><h5><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.campaignViews" }}</a></h5></header>+ <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></article></div><div class="col-6">- <article class="card">- <header class="mb-4"><h5><a href="{{ URI "/admin/campaigns/analytics" }}" class="unstyled">{{ .L.T "dashboard.linkClicks" }}</a></h5></header>+ <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></article></div>@@ -73,10 +73,8 @@<section class="row"><div class="col-8">- <article class="card page-content has-table">- <header class="mt-6">- <h5>{{ .L.Ts "globals.terms.recent" "name" ((.L.T "globals.terms.campaigns") | lower) }}</h5>- </header>+ <article class="card float">+ <h5 class="title">{{ .L.Ts "globals.terms.recent" "name" ((.L.T "globals.terms.campaigns") | lower) }}</h5><div class="table-wrapper"><table><tbody>@@ -109,10 +107,8 @@<div class="col-4">{{- $s := $d.System -}}- <article class="card">- <header class="mb-4">- <h5>{{ Icon "activity" }} {{ .L.T "dashboard.system" }}</h5>- </header>+ <article class="card float">+ <h5 class="title">{{ Icon "activity" }} {{ .L.T "dashboard.system" }}</h5><dl class="vstack gap-4"><div class="hstack justify-between"><dt>Uptime</dt><dd class="text-light">{{ $s.Uptime }}</dd></div><div class="hstack justify-between"><dt>App memory</dt><dd class="text-light">{{ FormatNumber (int $s.AppMemMB) }} MB</dd></div>