Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Apply minor styling improvements to dashboard, table views, and other elements.

Kailash Nadh5c9f538eed0d
diff --git a/cmd/init.go b/cmd/init.go
index ccc0ba35..33bb7214 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -1296,20 +1296,10 @@ func initTplFuncs(i *i18n.I18n, u *UrlConfig) template.FuncMap {
return p.Sprintf("%d", n)
},
"NiceDate": func(t any) string {
- switch v := t.(type) {
- case time.Time:
- if v.IsZero() {
- return ""
- }
- return v.Format("Mon, 02 Jan 2006")
- case null.Time:
- if !v.Valid {
- return ""
- }
- return v.Time.Format("Mon, 02 Jan 2006")
- default:
- return ""
- }
+ return niceDate(t, "Mon, 02 Jan 2006")
+ },
+ "NiceDateTime": func(t any) string {
+ return niceDate(t, "Mon, 02 Jan 2006, 15:04")
},
}
@@ -1444,6 +1434,24 @@ func parseTextTemplatesGlob(f txttpl.FuncMap, fs stuffbin.FileSystem, pattern st
return tpl, nil
}
+// niceDate formats the given date for template rendering.
+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)
+ }
+
+ return ""
+}
+
// badgeContent renders the content of a badge. Pre-rendered markup (eg: Icon())
// goes in as-is and everything else is escaped.
func badgeContent(content any) template.HTML {
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index 73a047c6..55a1cd55 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -42,6 +42,10 @@ body {
a {
text-decoration: none;
+
+ &.unstyled.text-light:hover {
+ color: var(--primary);
+ }
}
textarea.monospace {
@@ -66,10 +70,6 @@ table {
color: var(--primary);
}
}
-
- .badge-list {
- margin-top: var(--space-1);
- }
}
svg.icon {
@@ -150,13 +150,6 @@ a:has(> .badge:only-child) {
.badge {
padding: calc(var(--space-1) * 0.75) var(--space-4);
- sup {
- margin-top: -5px;
- font-size: calc(var(--text-8) / 1.3);
- font-weight: 600;
- letter-spacing: 0.03em;
- }
-
&.outline {
color: var(--muted-foreground);
}
@@ -187,18 +180,12 @@ a:has(> .badge:only-child) {
}
/* Subscription/campaign statuses */
- sup.status-confirmed {
- color: light-dark(#36995b, #7eab8b);
- }
&.status-confirmed,
&.status-finished {
background: light-dark(#dcfce7, #1f2a22);
color: light-dark(#36995b, #7eab8b);
}
- sup.status-unsubscribed {
- color: light-dark(#ff5722, #cf9088);
- }
&.status-unsubscribed,
&.status-cancelled {
background: light-dark(#fff1f0, #2e2320);
@@ -209,10 +196,6 @@ a:has(> .badge:only-child) {
color: var(--danger);
}
- sup.status-unconfirmed {
- color: var(--muted-foreground);
- }
-
&.disabled,
&.status-draft,
&.optin,
@@ -220,24 +203,24 @@ a:has(> .badge:only-child) {
background: light-dark(#eee, #26262a);
color: light-dark(#7a7a7a, #9a9aa3);
}
+}
- &.status-unsubscribed sup {
- color: light-dark(#fa8c16, #d3a065);
+/* Subscription status icons. */
+.status-icon {
+ &.status-confirmed {
+ color: light-dark(#36995b, #7eab8b);
}
- &.confirmed sup,
- &.status-confirmed sup {
- color: light-dark(#52c41a, #8bb079);
+ &.status-unsubscribed {
+ color: light-dark(#ff5722, #cf9088);
}
-}
-.tag {
- border-radius: var(--radius-small);
- color: var(--muted-foreground);
- padding: calc(var(--space-1) / 4) var(--space-2);
+ &.status-blocklisted {
+ color: var(--danger);
+ }
- &:hover {
- color: var(--foreground);
+ &.status-unconfirmed {
+ color: var(--muted-foreground);
}
}
@@ -320,6 +303,7 @@ td.stats {
}
.text-4 { font-size: var(--text-4); }
.text-5 { font-size: var(--text-5); }
+.text-7 { font-size: var(--text-7); }
.text-8 { font-size: var(--text-8); }
.text-danger { color: var(--danger); }
@@ -938,8 +922,18 @@ section.dashboard {
height: 18rem;
}
.stat-card {
+ display: flex;
+ flex-direction: column;
min-height: 9.5rem;
}
+
+ .stat-meta {
+ margin-block: auto calc(-1 * var(--space-6));
+ margin-inline: calc(-1 * var(--space-6));
+ padding: var(--space-3) var(--space-6);
+ border-block-start: 1px solid var(--border);
+ font-size: var(--text-7);
+ }
}
/* Lists */
@@ -1200,16 +1194,26 @@ section.import {
flex: 0 0 auto;
flex-direction: column;
align-items: stretch;
- gap: var(--space-1);
- width: 200px;
- padding: var(--space-2);
+ gap: calc(var(--space-1) * 2);
+ width: 12rem;
+ padding: 0;
+ background: transparent;
align-self: flex-start;
position: sticky;
top: var(--space-4);
[role="tab"] {
justify-content: flex-start;
- border-radius: var(--radius-medium);
+ font-weight: normal;
+ padding: var(--space-1) var(--space-2);
+ color: var(--muted-foreground);
+ border-radius: var(--radius-small);
+ box-shadow: none;
+ }
+
+ [role="tab"]:is(:hover, [aria-selected="true"]) {
+ background: light-dark(rgb(0 85 212 / 0.08), rgb(255 255 255 / 0.08));
+ color: var(--foreground);
}
}
@@ -1243,7 +1247,7 @@ section.import {
&.is-searching {
.settings-tabs {
display: grid;
- grid-template-columns: 200px 1fr;
+ grid-template-columns: 12rem 1fr;
grid-template-rows: repeat(20, auto);
column-gap: var(--space-6);
row-gap: 0;
diff --git a/static/admin/assets/static/icons.svg b/static/admin/assets/static/icons.svg
index 428748cd..561c987b 100644
--- a/static/admin/assets/static/icons.svg
+++ b/static/admin/assets/static/icons.svg
@@ -95,6 +95,10 @@
<rect x="3" y="3" width="7" height="7" /><rect x="14" y="3" width="7" height="7" /><rect x="14" y="14" width="7" height="7" /><rect x="3" y="14" width="7" height="7" />
</symbol>
+ <symbol id="icon-help-circle" 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" /><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" /><line x1="12" y1="17" x2="12.01" y2="17" />
+ </symbol>
+
<symbol id="icon-image" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<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>
@@ -131,6 +135,10 @@
<line x1="5" y1="12" x2="19" y2="12" />
</symbol>
+ <symbol id="icon-minus-circle" 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="8" y1="12" x2="16" y2="12" />
+ </symbol>
+
<symbol id="icon-monitor" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<rect x="2" y="3" width="20" height="14" rx="2" ry="2" /><line x1="8" y1="21" x2="16" y2="21" /><line x1="12" y1="17" x2="12" y2="21" />
</symbol>
diff --git a/static/admin/icons.txt b/static/admin/icons.txt
index ddd3e466..639d44e3 100644
--- a/static/admin/icons.txt
+++ b/static/admin/icons.txt
@@ -23,6 +23,7 @@ edit-2
eye
file-text
grid
+help-circle
image
inbox
info
@@ -32,6 +33,7 @@ log-out
mail
menu
minus
+minus-circle
monitor
moon
more-vertical
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index 409d4688..df9fbb09 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -5,6 +5,7 @@
{{- $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 }};
@@ -26,7 +27,7 @@
{{- else }}{{ $c.Name }}{{ end }}
</h1>
{{- if not $isNew }}
- {{ Badge (.L.T (printf "campaigns.status.%s" $c.Status)) (printf "enum status-%s" $c.Status) }}
+ {{ Badge (list (Icon (index $statusIcons $c.Status)) (.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.html
index 9f4e2838..9f0393b4 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -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)) "Class" "outline" "URL" ($d.Page.FilterURL $base) }}{{ end }}
</h1>
</div>
- <div class="col-6 col-end align-right hstack justify-end">
+ <div class="col-6 hstack justify-end">
<form method="get" action="{{ $base }}" class="search-form">
{{- $d.Page.FormFields "query" "page" -}}
<fieldset class="group">
@@ -60,8 +60,8 @@
<thead>
<tr>
<th width="5%"><input type="checkbox" aria-label="{{ .L.T "globals.buttons.toggleSelect" }}"></th>
- <th width="15%" class="cy-status">{{ $d.Page.SortLink $base "status" (.L.T "globals.fields.status") }}</th>
<th width="20%" class="cy-name">{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>
+ <th width="20%" class="cy-subject">{{ .L.T "campaigns.subject" }}</th>
<th width="15%" class="cy-lists">{{ .L.T "globals.terms.lists" }}</th>
<th width="20%" class="cy-timestamp">{{ $d.Page.SortLink $base "created_at" (.L.T "campaigns.timestamps") }}</th>
<th width="15%">{{ .L.T "campaigns.stats" }}</th>
@@ -78,22 +78,30 @@
{{- $isDone := or (eq .Status "finished") (eq .Status "cancelled") -}}
<tr data-campaign-id="{{ .ID }}" {{ if eq .Status "running" }}class="running"{{ end }}>
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
- <td class="status">
- <a href="{{ $base }}?status={{ .Status }}">
- {{ Badge ($.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 mt-2">{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>
+ <td class="name">
+ <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>
+ <div class="status">
+ <a href="{{ $base }}?status={{ .Status }}">
+ {{ Badge ($.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 mt-2">{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>
+ {{- end }}
+ </div>
+ {{- if eq .Type "optin" }}
+ <div class="hstack gap-1">
+ <a href="{{ $base }}?type=optin">{{ Badge ($.L.T "lists.optin") "enum optin" }}</a>
+ </div>
{{- end }}
</td>
- <td>
- <a href="{{ $base }}/{{ .ID }}">{{ .Name }}</a>
- <p class="text-light">{{ .Subject }}</p>
- <div class="hstack gap-1">
- {{- if eq .Type "optin" }}<a href="{{ $base }}?type=optin">{{ Badge ($.L.T "lists.optin") "enum optin" }}</a>{{ end }}
- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">{{ Badge (printf "#%s" .) "outline tag" }}</a>{{ end }}
- </div>
+ <td class="subject">
+ <a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Subject }}</a>
+ {{- if .Tags }}
+ <div class="hstack gap-1 text-8">
+ {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="tag">#{{ . }}</a>{{ end }}
+ </div>
+ {{- end }}
</td>
<td class="lists">
<ul>
diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.html
index 55a332ef..ab37b3f8 100644
--- a/static/admin/views/dashboard.html
+++ b/static/admin/views/dashboard.html
@@ -18,10 +18,10 @@
<article class="card stat-card" data-cy="lists">
<small class="text-light">{{ Icon "list" }} {{ .L.T "globals.terms.lists" }}</small>
<div class="stat-value"><a href="{{ URI "/admin/lists" }}" class="unstyled">{{ FormatNumber $c.Lists.Total }}</a></div>
- <div class="mt-2 hstack gap-2">
- <a href="{{ URI "/admin/lists" }}?type=public">{{ Badge (printf "%s %s" (FormatNumber $c.Lists.Public) (.L.T "lists.types.public")) "public" }}</a>
- <a href="{{ URI "/admin/lists" }}?type=private">{{ Badge (printf "%s %s" (FormatNumber $c.Lists.Private) (.L.T "lists.types.private")) "private" }}</a>
- </div>
+ <dl class="stat-meta hstack justify-between">
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/lists" }}?type=public" class="unstyled"><strong>{{ FormatNumber $c.Lists.Public }}</strong></a></dt><dd class="text-light">{{ .L.T "lists.types.public" }}</dd></div>
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/lists" }}?type=private" class="unstyled"><strong>{{ FormatNumber $c.Lists.Private }}</strong></a></dt><dd class="text-light">{{ .L.T "lists.types.private" }}</dd></div>
+ </dl>
</article>
</div>
@@ -29,10 +29,10 @@
<article class="card stat-card" data-cy="subscribers">
<small class="text-light">{{ Icon "at-sign" }} {{ .L.T "globals.terms.subscribers" }}</small>
<div class="stat-value"><a href="{{ URI "/admin/subscribers" }}" class="unstyled">{{ FormatNumber $c.Subscribers.Total }}</a></div>
- <div class="mt-2 hstack gap-2">
- <a href="{{ URI "/admin/subscribers" }}?subscription_status=none">{{ Badge (printf "%s %s" (FormatNumber $c.Subscribers.Orphans) (.L.T "dashboard.orphanSubs")) "outline" }}</a>
- <a href="{{ URI "/admin/subscribers" }}?status=blocklisted">{{ Badge (printf "%s %s" (FormatNumber $c.Subscribers.Blocklisted) (.L.T "subscribers.status.blocklisted")) "status-blocklisted" }}</a>
- </div>
+ <dl class="stat-meta hstack justify-between">
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/subscribers" }}?subscription_status=none" class="unstyled"><strong>{{ FormatNumber $c.Subscribers.Orphans }}</strong></a></dt><dd class="text-light">{{ .L.T "dashboard.orphanSubs" }}</dd></div>
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/subscribers" }}?status=blocklisted" class="unstyled"><strong>{{ FormatNumber $c.Subscribers.Blocklisted }}</strong></a></dt><dd class="text-light">{{ .L.T "subscribers.status.blocklisted" }}</dd></div>
+ </dl>
</article>
</div>
@@ -40,10 +40,10 @@
<article class="card stat-card" data-cy="campaigns">
<small class="text-light">{{ Icon "send" }} {{ .L.T "globals.terms.campaigns" }}</small>
<div class="stat-value"><a href="{{ URI "/admin/campaigns" }}" class="unstyled">{{ FormatNumber $c.Campaigns.Total }}</a></div>
- <div class="mt-2 hstack gap-2">
- <a href="{{ URI "/admin/campaigns" }}?status=scheduled">{{ Badge (printf "%s %s" (FormatNumber (index $c.Campaigns.ByStatus "scheduled")) (.L.T "campaigns.status.scheduled")) "outline" }}</a>
- <a href="{{ URI "/admin/campaigns" }}?status=finished">{{ Badge (printf "%s %s" (FormatNumber (index $c.Campaigns.ByStatus "finished")) (.L.T "campaigns.status.finished")) "status-finished" }}</a>
- </div>
+ <dl class="stat-meta hstack justify-between">
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/campaigns" }}?status=scheduled" class="unstyled"><strong>{{ FormatNumber (index $c.Campaigns.ByStatus "scheduled") }}</strong></a></dt><dd class="text-light">{{ .L.T "campaigns.status.scheduled" }}</dd></div>
+ <div class="hstack gap-1"><dt><a href="{{ URI "/admin/campaigns" }}?status=finished" class="unstyled"><strong>{{ FormatNumber (index $c.Campaigns.ByStatus "finished") }}</strong></a></dt><dd class="text-light">{{ .L.T "campaigns.status.finished" }}</dd></div>
+ </dl>
</article>
</div>
diff --git a/static/admin/views/lists.html b/static/admin/views/lists.html
index ee78366d..752e6967 100644
--- a/static/admin/views/lists.html
+++ b/static/admin/views/lists.html
@@ -78,9 +78,9 @@
<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 }}">{{ .Name }}</a>
- <div class="hstack gap-1">
- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">{{ Badge (printf "#%s" .) "outline tag" }}</a>{{ end }}
+ <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>
</td>
<td>
diff --git a/static/admin/views/settings.html b/static/admin/views/settings.html
index c7f996da..0456f14c 100644
--- a/static/admin/views/settings.html
+++ b/static/admin/views/settings.html
@@ -35,7 +35,7 @@
<div class="page-content">
<ot-tabs class="settings-tabs" x-ref="tabs" data-anchor="tab">
- <div class="settings-sidebar card" role="tablist" aria-orientation="vertical" @click="onTabClick($event)" @keydown="onTabKeydown($event)">
+ <div class="settings-sidebar" role="tablist" aria-orientation="vertical" @click="onTabClick($event)" @keydown="onTabKeydown($event)">
<button type="button" role="tab" id="general">{{ .L.T "settings.general.name" }}</button>
<button type="button" role="tab" id="performance">{{ .L.T "settings.performance.name" }}</button>
<button type="button" role="tab" id="privacy">{{ .L.T "settings.privacy.name" }}</button>
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index b8713c67..e04e9470 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -4,6 +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" -}}
{{- if $d.CurrentList }}{{ $base = printf "%s/lists/%d" (URI "/admin/subscribers") $d.CurrentList.ID }}{{ end -}}
<script>
@@ -89,9 +90,8 @@
<thead>
<tr>
<th width="5%"><input type="checkbox" aria-label="{{ .L.T "globals.buttons.toggleSelect" }}"></th>
- <th>{{ $d.Page.SortLink $base "email" (.L.T "subscribers.email") }}</th>
- <th>{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>
- <th class="align-center">{{ .L.T "globals.terms.lists" }}</th>
+ <th width="28%">{{ $d.Page.SortLink $base "email" (.L.T "subscribers.email") }}</th>
+ <th width="28%">{{ $d.Page.SortLink $base "name" (.L.T "globals.fields.name") }}</th>
<th>{{ $d.Page.SortLink $base "created_at" (.L.T "globals.fields.createdAt") }}</th>
<th>{{ $d.Page.SortLink $base "updated_at" (.L.T "globals.fields.updatedAt") }}</th>
<th class="align-right"></th>
@@ -103,22 +103,32 @@
<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 href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>
+ <a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>
{{- if ne .Status "enabled" }}
- <a href="{{ $base }}?status={{ .Status }}">{{ Badge ($.L.T (printf "subscribers.status.%s" .Status)) (printf "status-%s" .Status) }}</a>
+ {{- $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 }}
- <div class="badge-list hstack gap-1">
- {{- range .ParsedLists }}
- {{- $sup := "" }}
- {{- if or (eq .Optin "double") (eq .SubscriptionStatus "unsubscribed") }}
- {{- $sup = Safe (printf `<sup class="status-%s">%s</sup>` (html .SubscriptionStatus) (html ($.L.T (printf "subscribers.status.%s" .SubscriptionStatus)))) }}
+ {{- 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 }}
- <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}">{{ Badge (list .Name $sup) "outline" }}</a>
- {{- end }}
- </div>
+ {{- 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 }}
</td>
- <td><a href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Name }}</a></td>
- <td class="align-center"><a href="{{ URI "/admin/subscribers" }}/{{ .ID }}/lists">{{ len .ParsedLists }}<br /><span class="view">{{ $.L.T "globals.buttons.view" }}</span></a></td>
+ <td><a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Name }}</a></td>
<td>{{ NiceDate .CreatedAt }}</td>
<td>{{ NiceDate .UpdatedAt }}</td>
<td class="actions align-right">
@@ -138,7 +148,7 @@
</td>
</tr>
{{- else }}
- {{ template "empty-state" 7 }}
+ {{ template "empty-state" 6 }}
{{- end }}
</tbody>
</table>