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
Restyle and declutter campaigns table stats and dates.
Kailash Nadh40e14c69bccd
diff --git a/cmd/init.go b/cmd/init.goindex 25877567..a4f1091f 100644--- a/cmd/init.go+++ b/cmd/init.go@@ -1316,6 +1316,28 @@ func initTplFuncs(i *i18n.I18n, u *UrlConfig) template.FuncMap {return niceDate(t, layout)},+ "CompactDate": func(v any, withTime ...bool) string {+ t, ok := toTime(v)+ if !ok {+ return ""+ }+ return compactDate(t, time.Now(), len(withTime) > 0 && withTime[0], len(withTime) > 1 && withTime[1])+ },+ "FormatTimestamps": func(from, to any) string {+ f, fok := toTime(from)+ t, tok := toTime(to)+ if !fok || !tok {+ return ""+ }+ return formatTimestamps(f, t, time.Now())+ },+ "ExactDate": func(v any) string {+ t, ok := toTime(v)+ if !ok {+ return ""+ }+ return t.In(time.Local).Format("Mon, 2 Jan 2006, 15:04:05 MST (UTC Z07:00)")+ },"Duration": func(from, to any) string {f, ok := toTime(from)if !ok {@@ -1466,7 +1488,6 @@ func parseTextTemplatesGlob(f txttpl.FuncMap, fs stuffbin.FileSystem, pattern streturn tpl, nil}-// niceDate formats the given date for template rendering.// toTime extracts a non-zero time.Time out of a time.Time or null.Time value.func toTime(t any) (time.Time, bool) {switch v := t.(type) {@@ -1479,21 +1500,13 @@ func toTime(t any) (time.Time, bool) {return time.Time{}, false}-func niceDate(t any, layout string) string {- switch v := t.(type) {- case time.Time:- if v.IsZero() {- return ""- }- return v.Format(layout)- case null.Time:- if !v.Valid {- return ""- }- return v.Time.Format(layout)+// niceDate formats the given date for template rendering.+func niceDate(v any, layout string) string {+ t, ok := toTime(v)+ if !ok {+ return ""}-- return ""+ return t.Format(layout)}// badgeContent renders the content of a badge. Pre-rendered markup (eg: Icon())diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 8b00276f..ced33a8a 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -1308,7 +1308,8 @@ section.lists {}/* Subscribers */-.subscribers td.email .lists {+.subscribers td.email .lists,+.campaigns td.name .lists {list-style-type: none;margin: 0;padding-inline-start: 0;@@ -1374,6 +1375,29 @@ section.lists {/* Campaigns */section.campaigns {+ td.name .lists {+ margin-top: var(--space-2);+ row-gap: var(--space-1);+ }++ .ot-tooltip::after {+ white-space: pre-line;+ line-height: 1.5;+ width: max-content;+ max-width: min(36rem, calc(100vw - 2rem));+ text-align: start;+ }++ .campaign-progress {+ white-space: nowrap;++ progress {+ width: 4rem;+ margin: 0;+ height: .2rem;+ }+ }+tbody {.spinner {display: inline-flex;@@ -1389,39 +1413,10 @@ section.campaigns {}}- td.counts {- border-left: 1px solid var(--border);- padding-left: var(--space-4);- }-- td.lists ul {- list-style-type: none;- margin: 0;- padding-inline-start: 0;-- li {- align-items: center;- gap: var(--space-2);- max-width: 16ch;-- a {- min-width: 0;- display: block;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;- }- }-- }-td.draft {color: var(--faint-foreground);}- td.stats dt {- min-width: 75px;- }}}@@ -1992,10 +1987,6 @@ section.users {}td.stats {- &:not(:has(dd)) {- display: none;- }-dl {row-gap: var(--space-3);}@@ -2113,6 +2104,11 @@ section.users {}}+ section.campaigns td.analytics > div {+ flex-direction: row;+ column-gap: var(--space-4);+ }+section.campaign {[role="tablist"] {max-width: 100%;diff --git a/static/admin/assets/js/views/campaigns.js b/static/admin/assets/js/views/campaigns.jsindex a6c41f02..2c3ef5a0 100644--- a/static/admin/assets/js/views/campaigns.js+++ b/static/admin/assets/js/views/campaigns.js@@ -152,18 +152,21 @@ function component() {const set = (name, val) => {const el = row.querySelector(`[data-stat="${name}"]`);- if (el) {- el.textContent = val;- }+ if (el) el.textContent = val;};set('sent', u.formatNumber(c.sent));+ const sentCount = row.querySelector('[data-sent-count]');+ if (sentCount) {+ sentCount.hidden = c.sent === 0;+ }set('to_send', u.formatNumber(c.to_send));set('rate', Math.round(c.rate || 0));+ set('percent', `${c.to_send > 0 ? Math.floor((c.sent / c.to_send) * 100) : 0}%`);const prog = row.querySelector('[data-stat="progress"]');if (prog) {prog.value = c.sent;- prog.max = c.to_send;+ prog.max = c.to_send || 1;}},};diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.htmlindex 4a31ed2c..64033970 100644--- a/static/admin/views/campaigns.html+++ b/static/admin/views/campaigns.html@@ -60,11 +60,11 @@<thead><tr><th width="5%"><input type="checkbox" aria-label="{{ .L.T "globals.buttons.toggleSelect" }}"></th>- <th width="28%" class="cy-name">{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>- <th width="12%" class="cy-type">{{ .L.T "globals.fields.type" }}</th>- <th width="15%" class="cy-lists">{{ .L.T "globals.terms.lists" }}</th>- <th width="18%">{{ .L.T "campaigns.stats" }}</th>- <th width="22%" class="cy-timestamp">{{ $d.Page.SortLink $base "created_at" (.L.T "campaigns.timestamps") }}</th>+ <th width="38%" class="cy-name">{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>+ <th width="12%" class="cy-type">{{ .L.T "globals.fields.status" }}</th>+ <th width="12%">{{ .L.T "campaigns.stats" }}</th>+ <th width="10%">{{ .L.T "globals.terms.analytics" }}</th>+ <th width="18%" class="cy-timestamp">{{ $d.Page.SortLink $base "created_at" (.L.T "campaigns.timestamps") }}</th><th width="5%" class="align-right"></th></tr></thead>@@ -76,6 +76,7 @@{{- $canResume := eq .Status "paused" -}}{{- $canCancel := or (eq .Status "running") (eq .Status "paused") -}}{{- $isDone := or (eq .Status "finished") (eq .Status "cancelled") -}}+ {{- $hasEnded := and (or $isDone $canResume) .StartedAt.Valid .UpdatedAt.Valid -}}<tr data-campaign-id="{{ .ID }}" class="status-{{ .Status }}"><td><input name="id" type="checkbox" value="{{ .ID }}"></td><td class="name">@@ -96,6 +97,33 @@{{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" title="{{ $.L.T "globals.buttons.filter" }} {{ . }}" class="tag">#{{ . }}</a>{{ end }}</div>{{- end }}+ {{- if .ParsedLists }}+ <div class="hstack lists">+ {{- range $i, $l := .ParsedLists }}+ {{- if lt $i 3 }}+ <div class="avatar xsmall">+ {{ template "avatar-icon" dict "Kind" "list" "Name" .Name "Href" (printf "%s/%d" (URI "/admin/lists") .ID) "Title" (printf "%s %s" ($.L.T "globals.buttons.view") .Name) }}+ <a class="unstyled text-light avatar-label" href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ .Name }}</a>+ </div>+ {{- end }}+ {{- end }}+ {{- if gt (len .ParsedLists) 3 }}+ <ot-dropdown>+ <button type="button" class="ghost small text-8" popovertarget="camp-lists-{{ .ID }}" aria-label="{{ $.L.T "globals.terms.lists" }}">+{{ sub (len .ParsedLists) 3 }} {{ $.L.T "globals.terms.lists" | lower }}</button>+ <menu popover id="camp-lists-{{ .ID }}">+ {{- range slice .ParsedLists 3 }}+ <a role="menuitem" class="button ghost" href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">+ <span class="avatar xsmall">+ {{ template "avatar-icon" dict "Kind" "list" "Name" .Name }}+ <span class="avatar-label text-light">{{ .Name }}</span>+ </span>+ </a>+ {{- end }}+ </menu>+ </ot-dropdown>+ {{- end }}+ </div>+ {{- end }}</div></div></td>@@ -105,52 +133,46 @@{{ Badge (list (Dot) ($.L.T (printf "campaigns.status.%s" .Status))) (printf "enum status-%s" .Status) }}{{- if eq .Status "running" }}<span class="spinner" data-spinner="small" aria-busy="true"></span>{{ end }}</a>- {{- if or (eq .Status "scheduled") .SendAt.Valid }}- <div class="schedule vstack gap-1 text-8 text-light">- {{- with Duration now .SendAt }}- <div>{{ . }}</div>- {{- end }}- <div>{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>- </div>+ {{- if and (eq .Status "scheduled") .SendAt.Valid }}+ <span class="text-8 text-light" title="{{ ExactDate .SendAt }}">{{ Icon "clock" }} {{ CompactDate .SendAt true true }}</span>{{- end }}</div></td>- <td class="lists">- <ul>- {{- range .ParsedLists }}- <li class="avatar small">- {{ template "avatar-icon" dict "Kind" "list" "Name" .Name "Href" (printf "%s/%d" (URI "/admin/lists") .ID) "Title" (printf "%s %s" ($.L.T "globals.buttons.view") .Name) }}- <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}" class="avatar-label unstyled">{{ .Name }}</a>- </li>- {{- end }}- </ul>- </td>- <td class="stats counts">- <dl class="text-8">- <div><dt>{{ $.L.T "campaigns.views" }}</dt><dd>{{ FormatNumber .Views }}</dd></div>- <div><dt>{{ $.L.T "campaigns.clicks" }}</dt><dd>{{ FormatNumber .Clicks }}</dd></div>- <div><dt>{{ $.L.T "campaigns.sent" }}</dt><dd><span data-stat="sent">{{ FormatNumber .Sent }}</span>{{ if .ToSend }} / <span data-stat="to_send">{{ FormatNumber .ToSend }}</span>{{ end }}</dd></div>- <div><dt>{{ $.L.T "globals.terms.bounces" }}</dt><dd><a href="{{ URI "/admin/subscribers/bounces" }}?campaign_id={{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}" class="unstyled">{{ FormatNumber .Bounces }}</a></dd></div>- {{- with Duration .StartedAt .UpdatedAt }}- <div><dt>{{ $.L.T "settings.performance.slidingWindowDuration" }}</dt><dd>{{ . }}</dd></div>- {{- end }}+ <td class="stats" data-label="{{ $.L.T "campaigns.stats" }}">+ <div class="vstack gap-1">+ <div><div data-sent-count{{ if eq .Sent 0 }} hidden{{ end }}><span data-stat="sent">{{ FormatNumber .Sent }}</span>{{ if and .ToSend (not (eq .Status "finished")) }} / <span data-stat="to_send">{{ FormatNumber .ToSend }}</span>{{ end }}</div><span class="text-8 text-light"><span data-stat="percent">{{ if .ToSend }}{{ div (mul .Sent 100) .ToSend }}{{ else }}0{{ end }}%</span> {{ $.L.T "campaigns.sent" | lower }}{{ with Duration .StartedAt .UpdatedAt }} · {{ . }}{{ end }}</span></div>+ <div><a class="unstyled" href="{{ URI "/admin/subscribers/bounces" }}?campaign_id={{ .ID }}">{{ FormatNumber .Bounces }} <span class="text-8 text-light">{{ $.L.T "globals.terms.bounces" | lower }}</span></a></div>{{- if eq .Status "running" }}- <div><dt class="send-rate">{{ Icon "activity" }}</dt><dd><span data-stat="rate">0</span> / {{ $.L.T "campaigns.rateMinuteShort" }}</dd></div>- <div><dt>{{ $.L.T "campaigns.progress" }}</dt><dd><progress data-stat="progress" value="{{ .Sent }}" max="{{ .ToSend }}"></progress></dd></div>+ <div class="hstack gap-1 text-8 campaign-progress">+ <progress data-stat="progress" value="{{ .Sent }}" max="{{ max .ToSend 1 }}" aria-label="{{ $.L.T "campaigns.progress" }}"></progress>+ <span><span data-stat="rate">0</span> <span class="text-light">/ {{ $.L.T "campaigns.rateMinuteShort" }}</span></span>+ </div>{{- end }}- </dl>+ </div></td>- <td class="stats">- {{- $day := date "2006-01-02" .CreatedAt.Time }}- <dl class="text-8 text-light">- <div><dt>{{ $.L.T "globals.fields.createdAt" }}</dt><dd>{{ NiceDate .CreatedAt true }}</dd></div>- {{- if .StartedAt.Valid }}- <div><dt>{{ $.L.T "campaigns.startedAt" }}</dt><dd>{{ if eq (date "2006-01-02" .StartedAt.Time) $day }}{{ date "15:04" .StartedAt.Time }}{{ else }}{{ NiceDate .StartedAt true }}{{ end }}</dd></div>- {{- end }}- {{- if and $isDone .UpdatedAt.Valid }}- <div><dt>{{ $.L.T "campaigns.ended" }}</dt><dd>{{ if eq (date "2006-01-02" .UpdatedAt.Time) $day }}{{ date "15:04" .UpdatedAt.Time }}{{ else }}{{ NiceDate .UpdatedAt true }}{{ end }}</dd></div>+ <td class="stats analytics" data-label="{{ $.L.T "globals.terms.analytics" }}">+ <div class="vstack gap-1">+ <div>{{ FormatNumber .Views }} <span class="text-8 text-light">{{ $.L.T "campaigns.views" | lower }}</span></div>+ <div>{{ FormatNumber .Clicks }} <span class="text-8 text-light">{{ $.L.T "campaigns.clicks" | lower }}</span></div>+ </div>+ </td>+ <td class="timestamp" data-label="{{ $.L.T "campaigns.timestamps" }}">+ {{- $timeline := printf "%s: %s" ($.L.T "globals.fields.createdAt") (ExactDate .CreatedAt) }}+ {{- if .SendAt.Valid }}{{ $timeline = printf "%s\n%s: %s" $timeline ($.L.T "campaigns.status.scheduled") (ExactDate .SendAt) }}{{ end }}+ {{- if .StartedAt.Valid }}{{ $timeline = printf "%s\n%s: %s" $timeline ($.L.T "campaigns.startedAt") (ExactDate .StartedAt) }}{{ end }}+ {{- if $hasEnded }}+ {{- $timeline = printf "%s\n%s: %s" $timeline ($.L.T "campaigns.ended") (ExactDate .UpdatedAt) }}+ {{- end }}+ {{- with Duration .StartedAt .UpdatedAt }}{{ $timeline = printf "%s\n%s: %s" $timeline ($.L.T "settings.performance.slidingWindowDuration") . }}{{ end }}+ <span tabindex="0" title="{{ $timeline }}" @click="$el.focus()" data-tooltip-placement="bottom">+ {{- if $hasEnded }}+ {{ FormatTimestamps .StartedAt .UpdatedAt }}+ {{- else if and (not (or (eq .Status "draft") (eq .Status "scheduled"))) .StartedAt.Valid }}+ {{ CompactDate .StartedAt true }} <span class="text-8 text-light">{{ $.L.T "campaigns.startedAt" | lower }}</span>+ {{- else }}+ {{ NiceDate .CreatedAt }}{{- end }}- </dl>+ </span></td><td class="actions align-right"><ot-dropdown>@@ -162,8 +184,6 @@{{- if and ($d.Can "campaigns:send") $canStart }}<button type="button" role="menuitem" class="ghost" data-cy="btn-start" @click.prevent="onChangeStatus({{ .ID }}, {{ ToJSON .Name }}, 'running')">{{ Icon "send" }} {{ $.L.T "campaigns.start" }}</button>{{- end }}- <hr />- <a href="{{ $base }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>{{- if $d.Can "campaigns:send" }}{{- if $canSchedule }}<button type="button" role="menuitem" class="ghost" data-cy="btn-schedule" @click.prevent="onChangeStatus({{ .ID }}, {{ ToJSON .Name }}, 'scheduled', true)">{{ Icon "clock" }} {{ $.L.T "campaigns.schedule" }}</button>@@ -178,6 +198,8 @@<button type="button" role="menuitem" class="ghost" data-variant="danger" data-cy="btn-cancel" @click.prevent="onChangeStatus({{ .ID }}, {{ ToJSON .Name }}, 'cancelled')">{{ Icon "x-circle" }} {{ $.L.T "globals.buttons.cancel" }}</button>{{- end }}{{- end }}+ <hr />+ <a href="{{ $base }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>{{- if $d.Can "campaigns:manage" "campaigns:manage_all" }}<button type="button" role="menuitem" class="ghost" data-cy="btn-clone" @click.prevent="onClone({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "copy" }} {{ $.L.T "globals.buttons.clone" }}</button>{{- end }}