Skip to content

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

Standardize avatar markup and stlese across viwes (again!).

Kailash Nadh2216e54bff7b
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index 4ab1c85b..8d4eb9e9 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -357,7 +357,7 @@ a:has(> .badge:only-child) {
white-space: nowrap;
.avatar {
- margin: 0;
+ gap: var(--space-1);
}
}
@@ -637,36 +637,70 @@ main {
--avatar-accent: #d9a5bf;
display: inline-flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- vertical-align: middle;
- line-height: 1;
+ align-items: flex-start;
+ gap: var(--space-3);
+ vertical-align: top;
+ min-width: 0;
+ line-height: 1.5;
+
+ &.center {
+ align-items: center;
+ vertical-align: middle;
+ }
&.small {
--avatar-size: 1.25rem;
--avatar-font-size: 0.5rem;
+ gap: var(--space-2);
}
&.xsmall {
--avatar-size: 1rem;
--avatar-font-size: 0.5rem;
+ gap: var(--space-1);
}
- img,
- span {
- align-items: center;
+ > .avatar-icon {
display: inline-flex;
- border-radius: 0.3125rem;
+ align-items: center;
justify-content: center;
- object-fit: cover;
- height: var(--avatar-size);
+ flex-shrink: 0;
width: var(--avatar-size);
+ height: var(--avatar-size);
+ line-height: 1;
+
+ > img,
+ > .avatar-initials,
+ > .badge {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 0.3125rem;
+ object-fit: cover;
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-size: var(--avatar-font-size);
+ letter-spacing: 0.02em;
+ }
+
+ &.avatar-user,
+ &.avatar-subscriber {
+ > img,
+ > .avatar-initials {
+ border-radius: 50%;
+ }
+ }
}
- span {
- font-size: var(--avatar-font-size);
- letter-spacing: 0.02em;
+ > .avatar-label {
+ min-width: 0;
+ min-height: var(--avatar-size);
+ align-content: center;
+ justify-content: center;
+ margin-block: 0;
+ line-height: inherit;
}
}
@@ -734,21 +768,6 @@ main {
--avatar-dark: #574222;
--avatar-accent: #e5b56f;
}
-
-.avatar-user,
-.avatar-subscriber {
- img,
- span {
- border-radius: 50%;
- }
-}
-
-.name-stack {
- align-items: center;
- display: flex;
- gap: var(--space-3);
-}
-
/* Components */
.page-header {
min-height: calc(1lh + 2 * var(--space-2) + 2px);
@@ -769,9 +788,6 @@ main {
margin-block-end: 0;
}
- .avatar {
- margin-inline-end: var(--space-1);
- }
}
/* Placeholder for empty tables, lists and cards ({{ template "empty-state" }}). */
@@ -1192,20 +1208,17 @@ section.lists {
margin: 0;
padding-inline-start: 0;
- li,
- > .name-stack {
- align-items: center;
- gap: 0.2rem;
+ > .avatar {
max-width: 16ch;
font-size: var(--text-8);
- a {
+ .avatar-label {
min-width: 0;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- color: var(--muted-foreground);
+ /* color: var(--muted-foreground); */
}
}
@@ -1235,7 +1248,7 @@ section.lists {
.blocklisted {
td > a,
- td .name-stack > div > a {
+ td .avatar > .avatar-label > a {
color: var(--tone-red);
}
}
diff --git a/static/admin/partials/avatar.html b/static/admin/partials/avatar.html
index b4c8a082..8b9220b8 100644
--- a/static/admin/partials/avatar.html
+++ b/static/admin/partials/avatar.html
@@ -1,3 +1,3 @@
-{{ define "avatar" -}}
-<span class="avatar avatar-{{ .Kind }}{{ if .Size }} {{ .Size }}{{ end }}">{{ if .URL }}<img src="{{ .URL }}" alt="" loading="lazy" />{{ else }}<span class="avatar-initials" aria-hidden="true">{{ Initials .Name }}</span>{{ end }}</span>
+{{ define "avatar-icon" -}}
+<span class="avatar-icon avatar-{{ .Kind }}">{{ if .URL }}<img src="{{ .URL }}" alt="" loading="lazy" />{{ else }}<span class="avatar-initials" aria-hidden="true">{{ Initials .Name }}</span>{{ end }}</span>
{{- end }}
diff --git a/static/admin/partials/filter-badge.html b/static/admin/partials/filter-badge.html
index 7010ee78..b9a117ad 100644
--- a/static/admin/partials/filter-badge.html
+++ b/static/admin/partials/filter-badge.html
@@ -2,7 +2,7 @@
<span class="filter-tag">
{{- if .LabelURL }}<a href="{{ .LabelURL }}" class="unstyled">{{ end }}
{{- if .Avatar }}
- <span class="badge badge-avatar {{ default "" .Class }}"{{ if .Variant }} data-variant="{{ .Variant }}"{{ end }}>{{ template "avatar" .Avatar }} {{ .Label }}</span>
+ <span class="badge badge-avatar {{ default "" .Class }}"{{ if .Variant }} data-variant="{{ .Variant }}"{{ end }}><span class="avatar{{ if .Avatar.Size }} {{ .Avatar.Size }}{{ end }}">{{ template "avatar-icon" .Avatar }}<span class="avatar-label">{{ .Label }}</span></span></span>
{{- else }}
{{ Badge .Label (default "" .Class) (default "" .Variant) }}
{{- end }}
diff --git a/static/admin/views/base.html b/static/admin/views/base.html
index c40ae993..a83a934e 100644
--- a/static/admin/views/base.html
+++ b/static/admin/views/base.html
@@ -55,8 +55,8 @@
{{ with .Data.Profile }}
<ot-dropdown>
<button popovertarget="user-menu" type="button" class="user-nav-button ghost small user-trigger">
- {{ template "avatar" dict "Kind" "user" "Name" (or .Name .Username) "URL" .Avatar.String }}
- <span class="user-label">{{ .Username }}</span>
+ <span class="avatar">{{ template "avatar-icon" dict "Kind" "user" "Name" (or .Name .Username) "URL" .Avatar.String }}
+ <span class="avatar-label user-label">{{ .Username }}</span></span>
</button>
<menu popover id="user-menu">
<a href="{{ URI "/admin/user/profile" }}" role="menuitem" class="button ghost">{{ Icon "user" }} {{ $.L.T "users.profile" }}</a>
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index 6e3ea4ce..77d3bb65 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -21,13 +21,15 @@
<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 }}
- {{ template "avatar" dict "Kind" "campaign" "Name" $c.Name }}
- {{- end }}
- <h1 class="page-title">
- {{- if $isNew }}{{ .L.T "campaigns.newCampaign" }}
- {{- else }}{{ $c.Name }}{{ end }}
- </h1>
+ <div class="avatar">
+ {{- if not $isNew }}
+ {{ template "avatar-icon" dict "Kind" "campaign" "Name" $c.Name }}
+ {{- end }}
+ <h1 class="page-title avatar-label">
+ {{- if $isNew }}{{ .L.T "campaigns.newCampaign" }}
+ {{- else }}{{ $c.Name }}{{ end }}
+ </h1>
+ </div>
{{- if not $isNew }}
{{ 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 }}
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index 547b3ddd..dcbbca70 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -79,9 +79,9 @@
<tr data-campaign-id="{{ .ID }}" class="status-{{ .Status }}">
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
<td class="name">
- <div class="name-stack">
- {{ template "avatar" dict "Kind" "campaign" "Name" .Name }}
- <div class="vstack gap-1">
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" "campaign" "Name" .Name }}
+ <div class="avatar-label vstack gap-1">
<div>
<a href="{{ $base }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>
{{- if eq .Type "optin" }}
@@ -118,9 +118,9 @@
<td class="lists">
<ul>
{{- range .ParsedLists }}
- <li class="name-stack">
- {{ template "avatar" dict "Size" "small" "Kind" "list" "Name" .Name }}
- <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}" class="unstyled">{{ .Name }}</a>
+ <li class="avatar small">
+ {{ template "avatar-icon" dict "Kind" "list" "Name" .Name }}
+ <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}" class="avatar-label unstyled">{{ .Name }}</a>
</li>
{{- end }}
</ul>
diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.html
index fc078405..2781fb34 100644
--- a/static/admin/views/dashboard.html
+++ b/static/admin/views/dashboard.html
@@ -83,9 +83,9 @@
{{- range $d.Campaigns }}
<tr>
<td width="55%">
- <div class="name-stack">
- {{ template "avatar" dict "Kind" "campaign" "Name" .Name }}
- <div><a href="{{ URI "/admin/campaigns" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a></div>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" "campaign" "Name" .Name }}
+ <div class="avatar-label"><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>
diff --git a/static/admin/views/list.html b/static/admin/views/list.html
index f2cd4c19..80136d08 100644
--- a/static/admin/views/list.html
+++ b/static/admin/views/list.html
@@ -7,8 +7,10 @@
<header class="page-header">
<div class="hstack gap-1">
<a href="{{ URI "/admin/lists" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>
- {{ if not $d.IsNew }}{{ template "avatar" dict "Kind" "list" "Name" $d.List.Name }}{{ end }}
- <h1 class="page-title">{{ if $d.IsNew }}{{ .L.T "lists.newList" }}{{ else }}{{ $d.List.Name }}{{ end }}</h1>
+ <div class="avatar">
+ {{ if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "list" "Name" $d.List.Name }}{{ end }}
+ <h1 class="page-title avatar-label">{{ if $d.IsNew }}{{ .L.T "lists.newList" }}{{ else }}{{ $d.List.Name }}{{ end }}</h1>
+ </div>
</div>
</header>
diff --git a/static/admin/views/lists.html b/static/admin/views/lists.html
index 22d0779a..f9268962 100644
--- a/static/admin/views/lists.html
+++ b/static/admin/views/lists.html
@@ -81,10 +81,11 @@
<tr class="list-main-row" data-testid="list-row" data-id="{{ .ID }}">
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
<td>
- <div class="name-stack">
- {{ template "avatar" dict "Kind" "list" "Name" .Name }}
- <div>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" "list" "Name" .Name }}
+ <div class="avatar-label">
<a href="{{ URI "/admin/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>
+ {{- if .Description }}<div class="text-light text-8">{{ .Description }}</div>{{ end }}
<div class="hstack gap-2 text-8">
{{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" title="{{ $.L.T "globals.buttons.filter" }} {{ . }}">#{{ . }}</a>{{ end }}
</div>
@@ -101,7 +102,7 @@
</td>
<td class="subscribers" data-label="{{ $.L.T "globals.terms.subscribers" }}">
{{- if $d.Can "subscribers:get" "subscribers:get_all" }}
- <a class="subscriber-total" href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ FormatNumber .SubscriberCount }}</a>
+ <a class="subscriber-total" href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" title="{{ $.L.T "globals.buttons.view" }} {{ $.L.T "globals.terms.subscribers" }}">{{ FormatNumber .SubscriberCount }}</a>
{{- else }}
<span class="subscriber-total">{{ FormatNumber .SubscriberCount }}</span>
{{- end }}
diff --git a/static/admin/views/roles.html b/static/admin/views/roles.html
index 0ebdf006..dee3a6a1 100644
--- a/static/admin/views/roles.html
+++ b/static/admin/views/roles.html
@@ -45,9 +45,9 @@
{{- range $d.Roles }}
<tr data-testid="role-row" data-id="{{ .ID }}">
<td>
- <div class="name-stack">
- {{ template "avatar" dict "Kind" (printf "%s-role" $d.Type) "Name" .Name }}
- <a href="{{ $base }}/{{ .ID }}" class="unstyled" {{ if eq .ID 1 }}style="font-weight: bold"{{ end}}>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" (printf "%s-role" $d.Type) "Name" .Name }}
+ <a href="{{ $base }}/{{ .ID }}" class="avatar-label unstyled" {{ if eq .ID 1 }}style="font-weight: bold"{{ end}}>
{{ .Name }}
</a>
</div>
diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.html
index 4832bc9b..add80da9 100644
--- a/static/admin/views/subscriber.html
+++ b/static/admin/views/subscriber.html
@@ -13,15 +13,17 @@
<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>
- {{ if not $d.IsNew }}{{ template "avatar" dict "Kind" "subscriber" "Name" (or $sub.Name $sub.Email) }}{{ end }}
- <h1 class="page-title">
- {{- if $d.IsNew }}
- {{ .L.T "subscribers.newSubscriber" }}
- {{- else }}
- {{ $sub.Email }}
- {{ if ne $sub.Status "enabled" }}{{ Badge (list (Dot) (.L.T (printf "subscribers.status.%s" $sub.Status))) (printf "status-%s" $sub.Status) }}{{ end }}
- {{- end }}
- </h1>
+ <div class="avatar">
+ {{ if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "subscriber" "Name" (or $sub.Name $sub.Email) }}{{ end }}
+ <h1 class="page-title avatar-label">
+ {{- if $d.IsNew }}
+ {{ .L.T "subscribers.newSubscriber" }}
+ {{- else }}
+ {{ $sub.Email }}
+ {{ if ne $sub.Status "enabled" }}{{ Badge (list (Dot) (.L.T (printf "subscribers.status.%s" $sub.Status))) (printf "status-%s" $sub.Status) }}{{ end }}
+ {{- end }}
+ </h1>
+ </div>
</div>
</div>
<div class="col-6 hstack justify-end buttons">
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index 91972dd8..32975fe1 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -103,9 +103,9 @@
<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">
- <div class="name-stack">
- {{ template "avatar" dict "Kind" "subscriber" "Name" (or .Name .Email) }}
- <div>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" "subscriber" "Name" (or .Name .Email) }}
+ <div class="avatar-label">
<a class="unstyled" href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>
{{- if ne .Status "enabled" }}
{{- $label := $.L.T (printf "subscribers.status.%s" .Status) }}
@@ -114,10 +114,10 @@
<div class="hstack lists">
{{- range $i, $l := .ParsedLists }}
{{- if lt $i 3 }}
- <div class="name-stack">
+ <div class="avatar xsmall">
{{- $label := $.L.T (printf "subscribers.status.%s" $l.SubscriptionStatus) }}
- <a class="unstyled avatar avatar-list xsmall" href="{{ URI "/admin/subscribers" }}/{{ $sub.ID }}/lists" title="{{ $label }}" aria-label="{{ $l.Name }}: {{ $label }}"><span class="badge enum status-{{ $l.SubscriptionStatus }}" aria-hidden="true">{{ if eq $l.SubscriptionStatus "unconfirmed" }}?{{ else }}{{ Icon (or (index $statusIcons $l.SubscriptionStatus) "help-circle") }}{{ end }}</span></a>
- <a class="unstyled" href="{{ URI "/admin/subscribers/lists" }}/{{ $l.ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ $l.Name }}">{{ $l.Name }}</a>
+ <a class="unstyled avatar-icon avatar-list" href="{{ URI "/admin/subscribers" }}/{{ $sub.ID }}/lists" title="{{ $label }}" aria-label="{{ $l.Name }}: {{ $label }}"><span class="badge enum status-{{ $l.SubscriptionStatus }}" aria-hidden="true">{{ if eq $l.SubscriptionStatus "unconfirmed" }}?{{ else }}{{ Icon (or (index $statusIcons $l.SubscriptionStatus) "help-circle") }}{{ end }}</span></a>
+ <a class="unstyled text-light avatar-label" href="{{ URI "/admin/subscribers/lists" }}/{{ $l.ID }}" title="{{ $.L.T "globals.buttons.filter" }} {{ $l.Name }}">{{ $l.Name }}</a>
</div>
{{- end }}
{{- end }}
diff --git a/static/admin/views/template.html b/static/admin/views/template.html
index 1a33acd0..0f4e05ab 100644
--- a/static/admin/views/template.html
+++ b/static/admin/views/template.html
@@ -17,14 +17,16 @@
<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 not $isNew }}
- {{- $kind := "campaign-template" -}}
- {{- if eq $t.Type "tx" }}{{ $kind = "tx-template" }}{{ else if eq $t.Type "campaign_visual" }}{{ $kind = "campaign-visual-template" }}{{ end -}}
- {{ template "avatar" dict "Kind" $kind "Name" $t.Name }}
- {{- end }}
- <h1 class="page-title">
- {{- if $isNew }}{{ .L.T "templates.newTemplate" }}{{ else }}{{ $t.Name }}{{ end -}}
- </h1>
+ <div class="avatar">
+ {{- if not $isNew }}
+ {{- $kind := "campaign-template" -}}
+ {{- if eq $t.Type "tx" }}{{ $kind = "tx-template" }}{{ else if eq $t.Type "campaign_visual" }}{{ $kind = "campaign-visual-template" }}{{ end -}}
+ {{ template "avatar-icon" dict "Kind" $kind "Name" $t.Name }}
+ {{- end }}
+ <h1 class="page-title avatar-label">
+ {{- if $isNew }}{{ .L.T "templates.newTemplate" }}{{ else }}{{ $t.Name }}{{ end -}}
+ </h1>
+ </div>
{{- if and (not $isNew) $t.IsDefault }}{{ Badge (.L.T "templates.default") "enum" }}{{ end }}
</div>
</div>
diff --git a/static/admin/views/templates.html b/static/admin/views/templates.html
index b1822b7a..584225e2 100644
--- a/static/admin/views/templates.html
+++ b/static/admin/views/templates.html
@@ -52,9 +52,9 @@
<td>
{{- $kind := "campaign-template" -}}
{{- if eq .Type "tx" }}{{ $kind = "tx-template" }}{{ else if eq .Type "campaign_visual" }}{{ $kind = "campaign-visual-template" }}{{ end -}}
- <div class="name-stack">
- {{ template "avatar" dict "Kind" $kind "Name" .Name }}
- <div>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" $kind "Name" .Name }}
+ <div class="avatar-label">
<a href="{{ $base }}/{{ .ID }}" class="unstyled {{ if .IsDefault }}default{{ end }}" data-testid="btn-edit">{{ .Name }}</a>
{{ if .IsDefault }}{{ Badge ($.L.T "templates.default") }}{{ end }}
{{- if eq .Type "tx" }}<p class="text-light">{{ .Subject }}</p>{{ end }}
diff --git a/static/admin/views/user.html b/static/admin/views/user.html
index 1aaaa4af..bab67173 100644
--- a/static/admin/views/user.html
+++ b/static/admin/views/user.html
@@ -12,10 +12,12 @@
<header class="page-header">
<div class="hstack gap-1">
<a href="{{ $base }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>
- {{- if not $d.IsNew }}{{ template "avatar" dict "Kind" "user" "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}
- <h1 class="page-title">
- {{- if not $d.IsNew }}{{ $d.User.Name }}{{ else }}{{ .L.T "users.newUser" }}{{ end -}}
- </h1>
+ <div class="avatar">
+ {{- if not $d.IsNew }}{{ template "avatar-icon" dict "Kind" "user" "Name" (or $d.User.Name $d.User.Username) "URL" $d.User.Avatar.String }}{{ end }}
+ <h1 class="page-title avatar-label">
+ {{- if not $d.IsNew }}{{ $d.User.Name }}{{ else }}{{ .L.T "users.newUser" }}{{ end -}}
+ </h1>
+ </div>
{{- if and (not $d.IsNew) (eq $d.User.Status "disabled") }}{{ Badge (list (Dot) ($.L.T "users.status.disabled")) "enum status-disabled" }}{{ end }}
</div>
</header>
diff --git a/static/admin/views/users.html b/static/admin/views/users.html
index ad4ed109..96f9b162 100644
--- a/static/admin/views/users.html
+++ b/static/admin/views/users.html
@@ -74,9 +74,9 @@
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
{{- end }}
<td>
- <div class="name-stack">
- {{ template "avatar" dict "Kind" "user" "Name" (or .Name .Username) "URL" .Avatar.String }}
- <div>
+ <div class="avatar">
+ {{ template "avatar-icon" dict "Kind" "user" "Name" (or .Name .Username) "URL" .Avatar.String }}
+ <div class="avatar-label">
{{- if $d.Can "users:manage" }}
<a href="{{ URI "/admin/users" }}/{{ .ID }}" class="unstyled{{ if eq .Status "disabled" }} text-light{{ end }}">{{ .Username }}</a>
{{- else }}
@@ -90,16 +90,16 @@
</td>
<td data-label="{{ $.L.T "subscribers.email" }}" class="text-light">{{ if .Email.Valid }}{{ .Email.String }}{{ else }}<span class="text-light">&mdash;</span>{{ end }}</td>
<td data-label="{{ $.L.Tc "users.userRole" 1 }}">
- <div class="name-stack role-name">
- {{ template "avatar" dict "Size" "small" "Kind" "user-role" "Name" .UserRole.Name }}
- <a href="{{ $base }}?user_role_id={{ .UserRole.ID }}" class="unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .UserRole.Name }}">{{ .UserRole.Name }}</a>
+ <div class="avatar small role-name">
+ {{ template "avatar-icon" dict "Kind" "user-role" "Name" .UserRole.Name }}
+ <a href="{{ $base }}?user_role_id={{ .UserRole.ID }}" class="avatar-label unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .UserRole.Name }}">{{ .UserRole.Name }}</a>
</div>
</td>
<td data-label="{{ $.L.Tc "users.listRole" 2 }}">
{{- with .ListRole }}
- <div class="name-stack role-name">
- {{ template "avatar" dict "Size" "small" "Kind" "list-role" "Name" .Name }}
- <a href="{{ $base }}?list_role_id={{ .ID }}" class="unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ .Name }}</a>
+ <div class="avatar small role-name">
+ {{ template "avatar-icon" dict "Kind" "list-role" "Name" .Name }}
+ <a href="{{ $base }}?list_role_id={{ .ID }}" class="avatar-label unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ .Name }}</a>
</div>
{{- else }}
<span class="text-light">&mdash;</span>