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
Improve consistency of name+item/badge displays across views.
Kailash Nadhdfcd2a2afb74
diff --git a/cmd/avatar.go b/cmd/avatar.gonew file mode 100644index 00000000..8b9e6cf6--- /dev/null+++ b/cmd/avatar.go@@ -0,0 +1,99 @@+package main++import (+ "crypto/sha256"+ "fmt"+ "html/template"+ "strings"+ "unicode"+)++// avatarColors is the pool of colours to use in generated avatars. Based on+// (CC0, https://www.dicebear.com/styles/glass).+var avatarColors = []struct {+ light string+ mid string+ dark string+}{+ {"#fde2e2", "#f08c8c", "#411010"},+ {"#fde6e2", "#f09d8c", "#411810"},+ {"#fdebe2", "#f0ae8c", "#412110"},+ {"#fdf0e2", "#f0be8c", "#412910"},+ {"#fdf4e2", "#f0cf8c", "#413110"},+ {"#fdf9e2", "#f0e08c", "#413910"},+ {"#fdfde2", "#f0f08c", "#414110"},+ {"#f9fde2", "#e0f08c", "#394110"},+ {"#f4fde2", "#cff08c", "#314110"},+ {"#f0fde2", "#bef08c", "#294110"},+ {"#ebfde2", "#aef08c", "#214110"},+ {"#e6fde2", "#9df08c", "#184110"},+ {"#e2fde2", "#8cf08c", "#104110"},+ {"#e2fde6", "#8cf09d", "#104118"},+ {"#e2fdeb", "#8cf0ae", "#104121"},+ {"#e2fdf0", "#8cf0be", "#104129"},+ {"#e2fdf4", "#8cf0cf", "#104131"},+ {"#e2fdf9", "#8cf0e0", "#104139"},+ {"#e2fdfd", "#8cf0f0", "#104141"},+ {"#e2f9fd", "#8ce0f0", "#103941"},+ {"#e2f4fd", "#8ccff0", "#103141"},+ {"#e2f0fd", "#8cbef0", "#102941"},+ {"#e2ebfd", "#8caef0", "#102141"},+ {"#e2e6fd", "#8c9df0", "#101841"},+ {"#e2e2fd", "#8c8cf0", "#101041"},+ {"#e6e2fd", "#9d8cf0", "#181041"},+ {"#ebe2fd", "#ae8cf0", "#211041"},+ {"#f0e2fd", "#be8cf0", "#291041"},+ {"#f4e2fd", "#cf8cf0", "#311041"},+ {"#f9e2fd", "#e08cf0", "#391041"},+ {"#fde2fd", "#f08cf0", "#411041"},+ {"#fde2f9", "#f08ce0", "#411039"},+ {"#fde2f0", "#f08cbe", "#411029"},+ {"#fde2eb", "#f08cae", "#411021"},+ {"#fde2e6", "#f08c9d", "#411018"},+}++// avatar is the CSS style and the initials of a generated avatar.+type avatar struct {+ Style template.CSS+ Text string+}++// makeAvatar generates a "glass" style avatar with a CSS gradient for a given seed.+// It returns the CSS style + initials of the name that can be printed in HTML.+func makeAvatar(seed, name string) avatar {+ sum := sha256.Sum256([]byte(strings.ToLower(strings.TrimSpace(seed))))++ // Pick colours.+ n := len(avatarColors)+ i := int(sum[0]) % n+ one := avatarColors[i]+ two := avatarColors[(i+1+int(sum[1])%3)%n]++ // Two hue blobs, a white shimmer on top, inspired by DiceBear's glass style.+ style := fmt.Sprintf("background-color:%s;color:%s;background-image:radial-gradient(circle at %d%% %d%%,#ffffff73,transparent 55%%),radial-gradient(circle at %d%% %d%%,%sa6,transparent %d%%),radial-gradient(circle at %d%% %d%%,%sa6,transparent %d%%)",+ one.light, one.dark,+ 20+int(sum[8])%15, 10+int(sum[9])%15,+ 15+int(sum[2])%30, 15+int(sum[3])%30, one.mid, 85+int(sum[4])%20,+ 55+int(sum[5])%30, 55+int(sum[6])%30, two.mid, 80+int(sum[7])%20)++ return avatar{Style: template.CSS(style), Text: makeInitials(name)}+}++// makeInitials returns a two letter abbreviation of the given name.+func makeInitials(name string) string {+ words := strings.FieldsFunc(name, func(r rune) bool {+ return !unicode.IsLetter(r) && !unicode.IsDigit(r)+ })+ if len(words) == 0 {+ return "?"+ }++ out := []rune{[]rune(words[0])[0]}+ if len(words) > 1 {+ out = append(out, []rune(words[1])[0])+ } else if r := []rune(words[0]); len(r) > 1 {+ out = append(out, r[1])+ }++ return strings.ToUpper(string(out))+}diff --git a/cmd/init.go b/cmd/init.goindex 33bb7214..c2c150fe 100644--- a/cmd/init.go+++ b/cmd/init.go@@ -1256,6 +1256,12 @@ func initTplFuncs(i *i18n.I18n, u *UrlConfig) template.FuncMap {name = template.HTMLEscapeString(name)return template.HTML(fmt.Sprintf(`<svg class="icon"><use href="%sadmin/static/%s#icon-%s"></use></svg>`, u.RootPath, f, name))},+ // Auto-generated colour gradient CSS avatar.+ "Avatar": makeAvatar,+ // '●' that is printed inside some badges.+ "Dot": func() template.HTML {+ return template.HTML(`<span class="dot">●</span>`)+ },// First param = content// Second param = optional classes separated by string, eg: "outline status-finished".// Third param = optional data-variant, eg: "success".@@ -1295,11 +1301,30 @@ func initTplFuncs(i *i18n.I18n, u *UrlConfig) template.FuncMap {p := message.NewPrinter(language.English)return p.Sprintf("%d", n)},- "NiceDate": func(t any) string {- return niceDate(t, "Mon, 02 Jan 2006")+ "NiceDate": func(t any, withTime ...bool) string {+ layout := "Mon, 02 Jan 2006"+ if len(withTime) > 0 && withTime[0] {+ layout += ", 15:04"+ }++ return niceDate(t, layout)},- "NiceDateTime": func(t any) string {- return niceDate(t, "Mon, 02 Jan 2006, 15:04")+ "Duration": func(from, to any) string {+ f, ok := toTime(from)+ if !ok {+ return ""+ }+ t, ok := toTime(to)+ if !ok {+ return ""+ }++ d := t.Sub(f)+ if d <= 0 {+ return ""+ }++ return niceDuration(d)},}@@ -1435,6 +1460,18 @@ func parseTextTemplatesGlob(f txttpl.FuncMap, fs stuffbin.FileSystem, pattern st}// 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) {+ case time.Time:+ return v, !v.IsZero()+ case null.Time:+ return v.Time, v.Valid+ }++ return time.Time{}, false+}+func niceDate(t any, layout string) string {switch v := t.(type) {case time.Time:diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex 9f96555e..547fc8ab 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -17,13 +17,51 @@/* Theme */* {- --body: light-dark(#f9f9f9, #171717);+ --body: light-dark(#f9f9f9, #08090a);+ --card: light-dark(#fff, #0f1011);+ --faint: light-dark(#fafafa, #131417);+ --muted: light-dark(#f4f4f5, #17181b);+ --secondary: light-dark(#f4f4f5, #1a1b1e);+ --accent: light-dark(#f4f4f5, #1e1f23);+ --background: light-dark(#fff, #16171a);+ --foreground: light-dark(#09090b, #f7f8f8);+ --card-foreground: light-dark(#09090b, #f7f8f8);+ --secondary-foreground: light-dark(#574747, #eceef1);+ --muted-foreground: light-dark(#7a7a7a, #8a8f98);+ --faint-foreground: light-dark(#a1a1aa, #62666d);--primary: light-dark(#0055d4, #4f8ce6);--ring: light-dark(#0055d4, #4f8ce6);- --muted-foreground: light-dark(#7a7a7a, #a1a1aa);- --container-max: 1150px;- --border: light-dark(#e5e7eb, #52525b);+ --border: light-dark(#e5e7eb, #23252a);+ --input: light-dark(#d4d4d8, #2c2d30);+ --danger: light-dark(#d32f2f, #f2686e);+ --success: light-dark(#008032, #52c290);+ --warning: light-dark(#a65b00, #e6b95c);+ --shadow-tint-1: light-dark(rgb(0 0 0 / 0.05), rgb(0 0 0 / 0.4));+ --shadow-tint-2: light-dark(rgb(0 0 0 / 0.1), rgb(0 0 0 / 0.5));+ --shadow-tint-3: light-dark(rgb(0 0 0 / 0.1), rgb(0 0 0 / 0.6));+ --shadow-small: 0 1px 2px 0 var(--shadow-tint-1);+ --shadow-medium: 0 1px 3px 0 var(--shadow-tint-2), 0 1px 2px -1px var(--shadow-tint-2);+ --shadow-large: 0 4px 6px -1px var(--shadow-tint-3), 0 2px 4px -2px var(--shadow-tint-3);++ --container-max: 1300px;--font-sans: "Geist", system-ui, sans-serif;++ /* For badges. */+ --tone-neutral: light-dark(#666, #9ea3ad);+ --tone-neutral-bg: light-dark(#f5f5f5, rgb(255 255 255 / 0.06));+ --tone-blue: light-dark(#1a5fd4, #5eabfa);+ --tone-blue-bg: light-dark(#e4ecfe, rgb(94 171 250 / 0.13));+ --tone-violet: light-dark(#6b4fd6, #b3a4fb);+ --tone-violet-bg: light-dark(#efeafe, rgb(179 164 251 / 0.14));+ --tone-green: light-dark(#07795c, #52c290);+ --tone-green-bg: light-dark(#ddf4ec, rgb(82 194 144 / 0.13));+ --tone-amber: light-dark(#8f5a04, #e6b95c);+ --tone-amber-bg: light-dark(#fdf0da, rgb(230 185 92 / 0.12));+ --tone-rose: light-dark(#b33a56, #f28fa8);+ --tone-rose-bg: light-dark(#fdebef, rgb(242 143 168 / 0.12));+ --tone-red: light-dark(#bd3325, #f2686e);+ --tone-red-bg: light-dark(#fdeae6, rgb(242 104 110 / 0.14));+--text-1: 1.5rem;--text-regular: var(--text-7);}@@ -70,6 +108,10 @@ table {color: var(--primary);}}++ tbody tr:hover {+ background-color: light-dark(#fafafa, var(--background));+ }}svg.icon {@@ -147,83 +189,97 @@ a:has(> .badge:only-child) {border-radius: var(--radius-full);}-/* All badges are outline. Colour only applies to the text and the border, never a fill,- and is set with the --badge-color property below. */.badge {+ --badge-fg: var(--tone-neutral);+ --badge-bg: var(--tone-neutral-bg);+padding: calc(var(--space-1) * 0.75) var(--space-4);- background: none;- color: var(--badge-color, var(--muted-foreground));- border: 1px solid var(--badge-color, var(--border));+ background-color: var(--badge-bg);+ color: var(--badge-fg);+ border: 0;- &.scheduled,- &.status-paused,- &.tx,- &.api,- &.double,- &.unconfirmed {- --badge-color: light-dark(#ed7b00, #d3a065);+ .dot {+ font-size: 0.6em;+ line-height: 1;}- &.running,- &.list,- &.campaign,- &.user,- &.primary {- --badge-color: light-dark(#3b8cff, #8aa9cc);+ &.status-running,+ &.status-subscribed,+ &.campaign {+ --badge-fg: var(--tone-blue);+ --badge-bg: var(--tone-blue-bg);}- /* Subscription/campaign statuses */- &.status-confirmed,- &.status-finished {- --badge-color: light-dark(#36995b, #7eab8b);+ &.status-paused,+ &.tx {+ --badge-fg: var(--tone-violet);+ --badge-bg: var(--tone-violet-bg);}- &.status-unsubscribed,- &.status-cancelled {- --badge-color: light-dark(#ff5722, #cf9088);- }- &.status-blocklisted {- --badge-color: var(--danger);+ &.status-scheduled,+ &.status-unconfirmed,+ &[data-variant="warning"] {+ --badge-fg: var(--tone-amber);+ --badge-bg: var(--tone-amber-bg);}- &.disabled,- &.status-draft,+ &.status-finished,+ &.status-confirmed,+ &.status-enabled,&.optin,- &.single {- --badge-color: light-dark(#7a7a7a, #9a9aa3);- }-&[data-variant="success"] {- --badge-color: var(--success);+ --badge-fg: var(--tone-green);+ --badge-bg: var(--tone-green-bg);}- &[data-variant="warning"] {- --badge-color: var(--warning);++ &.status-cancelled,+ &.status-unsubscribed {+ --badge-fg: var(--tone-rose);+ --badge-bg: var(--tone-rose-bg);}++ &.status-blocklisted,+ &.status-disabled,&[data-variant="danger"] {- --badge-color: var(--danger);+ --badge-fg: var(--tone-red);+ --badge-bg: var(--tone-red-bg);+ }++ &.small {+ padding: 0 var(--space-2);+ font-size: var(--text-8);}+ &.outline {+ --badge-bg: transparent;++ border: 1px solid var(--border);+ }++ transition: box-shadow var(--transition-fast);+a:hover > & {- --badge-color: rgb(from var(--primary) r g b / .8);+ opacity: .6;}}/* Subscription status icons. */.status-icon {+ &.status-enabled,&.status-confirmed {- color: light-dark(#36995b, #7eab8b);+ color: var(--tone-green);}&.status-unsubscribed {- color: light-dark(#ff5722, #cf9088);+ color: var(--tone-rose);}&.status-blocklisted {- color: var(--danger);+ color: var(--tone-red);}&.status-unconfirmed {- color: var(--muted-foreground);+ color: var(--tone-amber);}}@@ -398,12 +454,6 @@ nav[data-topnav] {.user-nav-button {padding-top: 0;padding-bottom: 0;-- .user-avatar span,- .user-avatar img {- height: 24px;- width: 24px;- }}a,@@ -558,27 +608,38 @@ main {gap: var(--space-2);}-.user-avatar {+.user-label {+ max-width: 12rem;+ overflow: hidden;+ text-overflow: ellipsis;+}++.avatar {img,span {align-items: center;- border-radius: 50%;display: inline-flex;- height: 32px;+ border-radius: 5px;justify-content: center;- width: 32px;+ object-fit: cover;+ height: 28px;+ width: 28px;}span {- background: var(--muted);- font-weight: 700;+ font-size: var(--text-8);+ letter-spacing: 0.02em;}}-.user-label {- max-width: 12rem;- overflow: hidden;- text-overflow: ellipsis;+.name-stack {+ align-items: flex-start;+ display: flex;+ gap: var(--space-3);++ > .avatar {+ flex-shrink: 0;+ }}/* Components */@@ -599,6 +660,11 @@ main {h4 {margin-block-end: 0;}++ .avatar {+ flex-shrink: 0;+ margin-inline-end: var(--space-1);+ }}/* Placeholder for empty tables, lists and cards ({{ template "empty-state" }}). */@@ -700,7 +766,9 @@ td > .empty-state {}.bulk-actions {- box-shadow: -10px 0 10px var(--background);+ /* Fades the table columns out behind the floating actions. The table+ sits on a card, so the fade has to match the card, not the page. */+ box-shadow: -10px 0 10px var(--card);position: absolute;right: var(--space-6);top: var(--space-2);@@ -961,8 +1029,9 @@ section.lists {/* Subscribers */.subscribers {.blocklisted {- td > a {- color: var(--danger);+ td > a,+ td .name-stack > div > a {+ color: var(--tone-red);}}@@ -989,7 +1058,7 @@ section.campaigns {vertical-align: middle;}- tr.running {+ tr.status-running {background: color-mix(in srgb, var(--primary) 8%, transparent);td {@@ -1001,6 +1070,17 @@ section.campaigns {list-style-type: circle;margin: 0;padding-inline-start: var(--space-4);++ li {+ max-width: 16ch;+ a {+ display: block;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ }+ }+}td.draft {@@ -1314,7 +1394,7 @@ section.users {}.blocklisted {- color: var(--danger);+ color: var(--tone-red);}}diff --git a/static/admin/partials/avatar.html b/static/admin/partials/avatar.htmlnew file mode 100644index 00000000..b53bca5f--- /dev/null+++ b/static/admin/partials/avatar.html@@ -0,0 +1,4 @@+{{ define "avatar" -}}+{{- $a := Avatar .Seed .Name -}}+<span class="avatar">{{ if .URL }}<img src="{{ .URL }}" alt="" width="28" height="28" loading="lazy" />{{ else }}<span style="{{ $a.Style }}" aria-hidden="true">{{ $a.Text }}</span>{{ end }}</span>+{{- end }}diff --git a/static/admin/partials/subscriber-lists.html b/static/admin/partials/subscriber-lists.htmlindex a16ce9f9..f2aff9a1 100644--- a/static/admin/partials/subscriber-lists.html+++ b/static/admin/partials/subscriber-lists.html@@ -1,7 +1,6 @@{{ define "subscriber-lists" -}}{{- $root := .Root -}}{{- $canSave := .CanSave -}}-{{- $statusIcons := dict "confirmed" "check-circle" "unsubscribed" "minus-circle" "unconfirmed" "help-circle" -}}<div class="card page-content has-table subscriptions"><div class="table-wrapper"><table>@@ -31,7 +30,7 @@{{- if and (eq .Optin "single") (eq .SubscriptionStatus "unconfirmed") -}}<span class="text-light">–</span>{{- else -}}- {{ Badge (list (Icon (index $statusIcons .SubscriptionStatus)) ($root.L.T (printf "subscribers.status.%s" .SubscriptionStatus))) (printf "enum status-%s" .SubscriptionStatus) }}+ {{ Badge (list (Dot) ($root.L.T (printf "subscribers.status.%s" .SubscriptionStatus))) (printf "enum status-%s" .SubscriptionStatus) }}{{- end -}}</td><td>{{ NiceDate .SubscriptionCreatedAt }}</td>diff --git a/static/admin/views/base.html b/static/admin/views/base.htmlindex 47cbeac3..528f4221 100644--- a/static/admin/views/base.html+++ b/static/admin/views/base.html@@ -52,9 +52,7 @@{{ with .Data.Profile }}<ot-dropdown><button popovertarget="user-menu" type="button" class="user-nav-button ghost small user-trigger">- <span class="user-avatar">- {{ if .Avatar.Valid }}<img src="{{ .Avatar.String }}" alt="" />{{ else }}<span>{{ upper (substr 0 1 .Username) }}</span>{{ end }}- </span>+ {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}<span class="user-label">{{ .Username }}</span></button><menu popover id="user-menu">diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.htmlindex d3ad9a5f..4c35b7cb 100644--- a/static/admin/views/bounces.html+++ b/static/admin/views/bounces.html@@ -64,7 +64,7 @@<td><input name="id" type="checkbox" value="{{ .ID }}" data-subscriber-id="{{ .SubscriberID }}"></td><td><a href="{{ URI "/admin/subscribers" }}/{{ .SubscriberID }}" {{ if eq .SubscriberStatus "blocklisted" }}class="blocklisted"{{ end }}>{{ .Email }}</a>- {{ if ne .SubscriberStatus "enabled" }}{{ Badge ($.L.T (printf "subscribers.status.%s" .SubscriberStatus)) (printf "status-%s" .SubscriberStatus) }}{{ end }}+ {{ if ne .SubscriberStatus "enabled" }}{{ Badge (list (Dot) ($.L.T (printf "subscribers.status.%s" .SubscriberStatus))) (printf "status-%s" .SubscriberStatus) }}{{ end }}</td><td>{{- with .ParsedCampaign }}<a href="{{ $base }}?campaign_id={{ .ID }}">{{ .Name }}</a>{{ else }}-{{ end }}diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.htmlindex df9fbb09..bac9922c 100644--- a/static/admin/views/campaign.html+++ b/static/admin/views/campaign.html@@ -5,7 +5,6 @@{{- $isNew := $d.IsNew -}}{{- $canManage := $d.Can "campaigns:manage" "campaigns:manage_all" -}}{{- $canSend := $d.Can "campaigns:send" -}}-{{- $statusIcons := dict "draft" "file-text" "scheduled" "clock" "running" "send" "paused" "pause" "cancelled" "x-circle" "finished" "check-circle" -}}<script>window._lists = {{ ToJSON $d.AllLists }};@@ -22,12 +21,16 @@<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>+ {{- if not $isNew }}+ {{- $seed := "" }}{{ range $c.ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}+ {{ template "avatar" dict "Seed" $seed "Name" $c.Name }}+ {{- end }}<h1 class="page-title">{{- if $isNew }}{{ .L.T "campaigns.newCampaign" }}{{- else }}{{ $c.Name }}{{ end }}</h1>{{- if not $isNew }}- {{ Badge (list (Icon (index $statusIcons $c.Status)) (.L.T (printf "campaigns.status.%s" $c.Status))) (printf "enum status-%s" $c.Status) }}+ {{ Badge (list (Dot) (.L.T (printf "campaigns.status.%s" $c.Status))) (printf "enum status-%s" $c.Status) }}{{- if eq $c.Type "optin" }}{{ Badge (.L.T "lists.optin") "enum optin" }}{{ end }}{{- end }}</div>diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.htmlindex 28506cb6..2ce99d7e 100644--- a/static/admin/views/campaigns.html+++ b/static/admin/views/campaigns.html@@ -5,7 +5,6 @@{{- $status := $d.Page.Param "status" -}}{{- $type := $d.Page.Param "type" -}}{{- $tags := $d.Page.Param "tag" -}}-{{- $statusIcons := dict "draft" "file-text" "scheduled" "clock" "running" "send" "paused" "pause" "cancelled" "x-circle" "finished" "check-circle" -}}<section class="campaigns" x-data="campaignsView"><header class="row page-header">@@ -13,8 +12,8 @@<h1 class="page-title">{{ .L.T "globals.terms.campaigns" }}<span>({{ $d.Page.Total }})</span>- {{- if $status }} {{ template "filter-badge" dict "Label" (list (Icon (index $statusIcons $status)) (.L.T (printf "campaigns.status.%s" $status))) "Class" (printf "enum status-%s" $status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}- {{- if $type }} {{ template "filter-badge" dict "Label" (list (Icon "user-check") (.L.T "lists.optin")) "Class" "enum optin" "URL" ($d.Page.FilterURL $base "type") }}{{ end }}+ {{- if $status }} {{ template "filter-badge" dict "Label" (list (Dot) (.L.T (printf "campaigns.status.%s" $status))) "Class" (printf "enum status-%s" $status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}+ {{- if $type }} {{ template "filter-badge" dict "Label" (list (Icon "user-check") (.L.T "lists.optin")) "Class" "enum" "URL" ($d.Page.FilterURL $base "type") }}{{ end }}{{- if $tags }} {{ template "filter-badge" dict "Label" (list (Icon "tag") $tags) "Class" "tag" "URL" ($d.Page.FilterURL $base "tag") }}{{ end }}{{- 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>@@ -61,11 +60,11 @@<thead><tr><th width="5%"><input type="checkbox" aria-label="{{ .L.T "globals.buttons.toggleSelect" }}"></th>- <th width="25%" class="cy-name">{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>- <th width="15%" class="cy-type">{{ .L.T "globals.fields.type" }}</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="26%" class="cy-timestamp">{{ $d.Page.SortLink $base "created_at" (.L.T "campaigns.timestamps") }}</th>- <th width="15%">{{ .L.T "campaigns.stats" }}</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="5%" class="align-right"></th></tr></thead>@@ -77,37 +76,42 @@{{- $canResume := eq .Status "paused" -}}{{- $canCancel := or (eq .Status "running") (eq .Status "paused") -}}{{- $isDone := or (eq .Status "finished") (eq .Status "cancelled") -}}- <tr data-campaign-id="{{ .ID }}" {{ if eq .Status "running" }}class="running"{{ end }}>+ <tr data-campaign-id="{{ .ID }}" class="status-{{ .Status }}"><td><input name="id" type="checkbox" value="{{ .ID }}"></td><td class="name">- <div class="vstack gap-1">- <div>- <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>- <div class="subject text-8 text-light">- <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Subject }}</a>+ {{- $seed := "" }}{{ range .ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}+ <div class="name-stack">+ {{ template "avatar" dict "Seed" $seed "Name" .Name }}+ <div class="vstack gap-1">+ <div>+ <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>+ {{- if eq .Type "optin" }}+ <a href="{{ $base }}?type=optin" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "lists.optin" }}">{{ Badge (list (Icon "user-check") ($.L.T "lists.optin")) "small outline" }}</a>+ {{- end }}+ <div class="subject text-8 text-light">+ <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Subject }}</a>+ </div></div>+ {{- if .Tags }}+ <div class="hstack gap-2 text-8">+ {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="tag">#{{ . }}</a>{{ end }}+ </div>+ {{- end }}</div>- {{- if .Tags }}- <div class="hstack gap-2 text-8">- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="tag">#{{ . }}</a>{{ end }}- </div>- {{- end }}</div></td><td class="type"><div class="vstack gap-1">- <div>- <a href="{{ $base }}?status={{ .Status }}" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T (printf "campaigns.status.%s" .Status) }}">- {{ Badge (list (Icon (index $statusIcons .Status)) ($.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="text-8 text-light">{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>- {{- end }}- </div>- {{- if eq .Type "optin" }}- <div>- <a href="{{ $base }}?type=optin" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "lists.optin" }}">{{ Badge (list (Icon "user-check") ($.L.T "lists.optin")) "enum" }}</a>+ <a href="{{ $base }}?status={{ .Status }}" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T (printf "campaigns.status.%s" .Status) }}">+ {{ 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="vstack gap-1 text-8 text-light">+ {{- with Duration now .SendAt }}+ <div>{{ . }}</div>+ {{- end }}+ <div>{{ Icon "clock" }} {{ NiceDate .SendAt }}</div></div>{{- end }}</div>@@ -115,33 +119,37 @@<td class="lists"><ul>{{- range .ParsedLists }}- <li><a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}">{{ .Name }}</a></li>+ <li><a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a></li>{{- end }}</ul></td>- <td class="stats">- <dl class="text-8">- <div><dt>{{ $.L.T "globals.fields.createdAt" }}</dt><dd>{{ NiceDate .CreatedAt }}</dd></div>- {{- if .StartedAt.Valid }}- <div><dt>{{ $.L.T "campaigns.startedAt" }}</dt><dd>{{ NiceDate .StartedAt }}</dd></div>- {{- end }}- {{- if and $isDone .UpdatedAt.Valid }}- <div><dt>{{ $.L.T "campaigns.ended" }}</dt><dd>{{ NiceDate .UpdatedAt }}</dd></div>- {{- end }}- </dl>- </td><td class="stats"><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> / <span data-stat="to_send">{{ FormatNumber .ToSend }}</span></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 }}" class="unstyled">{{ FormatNumber .Bounces }}</a></dd></div>+ {{- with Duration .StartedAt .UpdatedAt }}+ <div><dt>{{ $.L.T "settings.performance.slidingWindowDuration" }}</dt><dd>{{ . }}</dd></div>+ {{- end }}{{- 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>{{- end }}</dl></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>+ {{- end }}+ </dl>+ </td><td class="actions align-right"><ot-dropdown><button popovertarget="camp-actions-{{ .ID }}" type="button" class="ghost more icon" aria-label="{{ $.L.T "globals.buttons.more" }}">diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.htmlindex ab37b3f8..c524a83f 100644--- a/static/admin/views/dashboard.html+++ b/static/admin/views/dashboard.html@@ -82,9 +82,15 @@<tbody>{{- range $d.Campaigns }}<tr>- <td width="20%">{{ Badge ($.L.T (printf "campaigns.status.%s" .Status)) (printf "enum status-%s" .Status) }}</td>- <td><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a></td>- <td class="text-light">+ <td width="55%">+ {{- $seed := "" }}{{ range .ParsedLists }}{{ $seed = printf "%s%d," $seed .ID }}{{ end }}+ <div class="name-stack">+ {{ template "avatar" dict "Seed" $seed "Name" .Name }}+ <div><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a></div>+ </div>+ </td>+ <td width="20%">{{ Badge (list (Dot) ($.L.T (printf "campaigns.status.%s" .Status))) (printf "enum status-%s" .Status) }}</td>+ <td width="20%"class="text-light">{{- if and (eq .Status "scheduled") .SendAt.Valid }}{{ NiceDate .SendAt }}{{ else }}{{ NiceDate .CreatedAt }}{{ end -}}</td><td class="align-right">diff --git a/static/admin/views/list.html b/static/admin/views/list.htmlindex ba953d4f..70e8c399 100644--- a/static/admin/views/list.html+++ b/static/admin/views/list.html@@ -8,6 +8,7 @@<div class="col-6"><div class="hstack gap-1"><a href="{{ URI "/admin/lists" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>+ {{ template "avatar" dict "Seed" (printf "%d" $d.List.ID) "Name" $d.List.Name }}<h1 class="page-title">{{ $d.List.Name }}</h1></div></div>diff --git a/static/admin/views/lists.html b/static/admin/views/lists.htmlindex 38ce5762..6f0173b3 100644--- a/static/admin/views/lists.html+++ b/static/admin/views/lists.html@@ -81,9 +81,14 @@<tr class="list-main-row" data-testid="list-row" data-id="{{ .ID }}"><td><input name="id" type="checkbox" value="{{ .ID }}"></td><td>- <a href="{{ URI "/admin/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>- <div class="hstack gap-2 text-8">- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">#{{ . }}</a>{{ end }}+ <div class="name-stack">+ {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" .Name }}+ <div>+ <a href="{{ URI "/admin/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>+ <div class="hstack gap-2 text-8">+ {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">#{{ . }}</a>{{ end }}+ </div>+ </div></div></td><td>diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.htmlindex a6e4649f..4e66b7e2 100644--- a/static/admin/views/subscriber.html+++ b/static/admin/views/subscriber.html@@ -13,9 +13,10 @@<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>+ {{ template "avatar" dict "Seed" (printf "%d" $sub.ID) "Name" (or $sub.Name $sub.Email) }}<h1 class="page-title">{{ $sub.Email }}- {{ if ne $sub.Status "enabled" }}{{ Badge (.L.T (printf "subscribers.status.%s" $sub.Status)) (printf "status-%s" $sub.Status) }}{{ end }}+ {{ if ne $sub.Status "enabled" }}{{ Badge (list (Dot) (.L.T (printf "subscribers.status.%s" $sub.Status))) (printf "status-%s" $sub.Status) }}{{ end }}</h1></div></div>diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.htmlindex 0f0ff106..3d3f2eb8 100644--- a/static/admin/views/subscribers.html+++ b/static/admin/views/subscribers.html@@ -25,8 +25,8 @@<span>({{ $d.Page.Total }})</span>{{- if $d.CurrentList }} {{ template "filter-badge" dict "Label" $d.CurrentList.Name "URL" (URI "/admin/subscribers") }}{{ end }}{{- if eq $subStatus "none" }} {{ template "filter-badge" dict "Label" (.L.T "dashboard.orphanSubs") "URL" ($d.Page.FilterURL $base "subscription_status") }}- {{- else if $subStatus }} {{ template "filter-badge" dict "Label" (.L.T (printf "subscribers.status.%s" $subStatus)) "Class" (printf "status-%s" $subStatus) "URL" ($d.Page.FilterURL $base "subscription_status") }}{{ end }}- {{- if $status }} {{ template "filter-badge" dict "Label" (.L.T (printf "subscribers.status.%s" $status)) "Class" (printf "status-%s" $status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}+ {{- else if $subStatus }} {{ template "filter-badge" dict "Label" (list (Dot) (.L.T (printf "subscribers.status.%s" $subStatus))) "Class" (printf "status-%s" $subStatus) "URL" ($d.Page.FilterURL $base "subscription_status") }}{{ end }}+ {{- if $status }} {{ template "filter-badge" dict "Label" (list (Dot) (.L.T (printf "subscribers.status.%s" $status))) "Class" (printf "status-%s" $status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}{{- 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>@@ -103,30 +103,35 @@<tr data-testid="sub-row" data-id="{{ .ID }}" {{ if eq .Status "blocklisted" }}class="blocklisted"{{ end }}><td><input name="id" type="checkbox" value="{{ .ID }}"></td><td class="email">- <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>- {{- end }}- {{- if .ParsedLists }}- <div class="hstack gap-4 text-7 mt-2">- {{- range $i, $l := .ParsedLists }}- {{- if lt $i 2 }}- <span>- <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>- {{- end }}- </a>- </span>- {{- end }}+ <div class="name-stack">+ {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Email) }}+ <div>+ <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>{{- end }}- {{- if gt (len .ParsedLists) 2 }}- <a href="{{ URI "/admin/subscribers" }}/{{ $sub.ID }}/lists" title="{{ range $i, $l := slice .ParsedLists 2 }}{{ if $i }}, {{ end }}{{ $l.Name }}{{ end }}">+{{ sub (len .ParsedLists) 2 }} {{ lower ($.L.T "globals.terms.lists") }}</a>+ {{- if .ParsedLists }}+ <div class="hstack gap-4 text-7 mt-2">+ {{- range $i, $l := .ParsedLists }}+ {{- if lt $i 2 }}+ <span>+ <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>+ {{- end }}+ </a>+ </span>+ {{- end }}+ {{- end }}+ {{- if gt (len .ParsedLists) 2 }}+ <a href="{{ URI "/admin/subscribers" }}/{{ $sub.ID }}/lists" title="{{ range $i, $l := slice .ParsedLists 2 }}{{ if $i }}, {{ end }}{{ $l.Name }}{{ end }}">+{{ sub (len .ParsedLists) 2 }} {{ lower ($.L.T "globals.terms.lists") }}</a>+ {{- end }}+ </div>{{- end }}</div>- {{- end }}+ </div></td><td><a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Name }}</a></td><td>{{ NiceDate .CreatedAt }}</td>diff --git a/static/admin/views/user.html b/static/admin/views/user.htmlindex 38070d4d..1c4b88e5 100644--- a/static/admin/views/user.html+++ b/static/admin/views/user.html@@ -13,10 +13,11 @@<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>+ {{- if $d.IsEditing }}{{ template "avatar" dict "Seed" (printf "%d" $d.User.ID) "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}<h1 class="page-title">{{- if $d.IsEditing }}{{ $d.User.Name }}{{ else }}{{ .L.T "users.newUser" }}{{ end -}}</h1>- {{- if and $d.IsEditing (eq $d.User.Status "disabled") }}{{ Badge ($.L.T "users.status.disabled") "enum" "danger" }}{{ end }}+ {{- if and $d.IsEditing (eq $d.User.Status "disabled") }}{{ Badge (list (Dot) ($.L.T "users.status.disabled")) "enum status-disabled" }}{{ end }}</div></div></header>diff --git a/static/admin/views/users.html b/static/admin/views/users.htmlindex 4ca96655..dd184f3f 100644--- a/static/admin/views/users.html+++ b/static/admin/views/users.html@@ -17,7 +17,7 @@{{ template "filter-badge" dict "Label" $d.Type "URL" ($d.Page.FilterURL $base "type") }}{{- end }}{{- end }}- {{- if $d.Status }} {{ template "filter-badge" dict "Label" (.L.T (printf "users.status.%s" $d.Status)) "Class" "enum" "Variant" "danger" "URL" ($d.Page.FilterURL $base "status") }}{{ end }}+ {{- if $d.Status }} {{ template "filter-badge" dict "Label" (list (Dot) (.L.T (printf "users.status.%s" $d.Status))) "Class" (printf "enum status-%s" $d.Status) "URL" ($d.Page.FilterURL $base "status") }}{{ end }}{{- if $d.UserRoleID }}{{- $roleIcon := "user" }}{{ if eq $d.UserRoleID 1 }}{{ $roleIcon = "star" }}{{ end }}{{ template "filter-badge" dict "Label" (list (Icon $roleIcon) $d.UserRoleName) "URL" ($d.Page.FilterURL $base "user_role_id") }}@@ -73,14 +73,19 @@<td><input name="id" type="checkbox" value="{{ .ID }}"></td>{{- end }}<td>- {{- if $d.Can "users:manage" }}- <a href="{{ URI "/admin/users" }}/{{ .ID }}" class="{{ if eq .Status "disabled" }}text-light{{ end }}">{{ .Username }}</a>- {{- else }}- <span class="{{ if eq .Status "disabled" }}text-danger{{ end }}">{{ .Username }}</span>- {{- end }}- {{- if eq .Type "api" }}<a href="{{ $base }}?type=api" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "users.type.api" }}">{{ Badge (list (Icon "code") ($.L.T "users.type.api")) "tag" }}</a>{{ end }}- {{- if eq .Status "disabled" }}<a href="{{ $base }}?status=disabled" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "users.status.disabled" }}">{{ Badge ($.L.T "users.status.disabled") "enum" "danger" }}</a>{{ end }}- {{- if .Name }}<div class="text-light text-8">{{ .Name }}</div>{{ end }}+ <div class="name-stack">+ {{ template "avatar" dict "Seed" (printf "%d" .ID) "Name" (or .Name .Username) "URL" .Avatar.String }}+ <div>+ {{- if $d.Can "users:manage" }}+ <a href="{{ URI "/admin/users" }}/{{ .ID }}" class="{{ if eq .Status "disabled" }}text-light{{ end }}">{{ .Username }}</a>+ {{- else }}+ <span class="{{ if eq .Status "disabled" }}text-danger{{ end }}">{{ .Username }}</span>+ {{- end }}+ {{- if eq .Type "api" }}<a href="{{ $base }}?type=api" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "users.type.api" }}">{{ Badge (list (Icon "code") ($.L.T "users.type.api")) "tag" }}</a>{{ end }}+ {{- if eq .Status "disabled" }}<a href="{{ $base }}?status=disabled" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "users.status.disabled" }}">{{ Badge (list (Dot) ($.L.T "users.status.disabled")) "enum status-disabled" }}</a>{{ end }}+ {{- if .Name }}<div class="text-light text-8">{{ .Name }}</div>{{ end }}+ </div>+ </div></td><td><div class="hstack gap-1">