Skip to content

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

SSR: Refactor all badge/tag markup to a `{{ Badge }}` tpl function like `{{ Icon }}`.

Kailash Nadhd882c0108af0
diff --git a/cmd/init.go b/cmd/init.go
index 820b0e3d..dee002ce 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -1157,6 +1157,26 @@ 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/icons.svg#icon-%s"></use></svg>`, u.RootPath, name))
},
+ // First param = content
+ // Second param = optional classes separated by string, eg: "outline status-finished".
+ // Third param = optional data-variant, eg: "success".
+ "Badge": func(content any, opts ...string) template.HTML {
+ class := "badge"
+ if len(opts) > 0 {
+ if s := strings.TrimSpace(opts[0]); s != "" {
+ class += " " + s
+ }
+ }
+
+ attrs := fmt.Sprintf(`class="%s"`, template.HTMLEscapeString(class))
+ if len(opts) > 1 {
+ if v := strings.TrimSpace(opts[1]); v != "" {
+ attrs += fmt.Sprintf(` data-variant="%s"`, template.HTMLEscapeString(v))
+ }
+ }
+
+ return template.HTML(fmt.Sprintf(`<span %s>%s</span>`, attrs, badgeContent(content)))
+ },
"IsNav": func(current, id string) template.HTMLAttr {
if current == id {
return template.HTMLAttr(` aria-current="page"`)
@@ -1324,3 +1344,22 @@ func parseTextTemplatesGlob(f txttpl.FuncMap, fs stuffbin.FileSystem, pattern st
return tpl, nil
}
+
+// 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 {
+ switch v := content.(type) {
+ case template.HTML:
+ return v
+ case []any:
+ out := make([]string, 0, len(v))
+ for _, c := range v {
+ if s := string(badgeContent(c)); s != "" {
+ out = append(out, s)
+ }
+ }
+ return template.HTML(strings.Join(out, " "))
+ }
+
+ return template.HTML(template.HTMLEscapeString(fmt.Sprint(content)))
+}
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index b54bf574..21fdc403 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -150,6 +150,11 @@ dialog {
}
/* Badges */
+a:has(> .badge:only-child) {
+ display: inline-flex;
+ border-radius: var(--radius-full);
+}
+
.badge {
padding: calc(var(--space-1) * 0.75) var(--space-4);
@@ -906,7 +911,7 @@ section.lists {
/* Subscribers */
.subscribers {
.blocklisted {
- td > a:not(.badge) {
+ td > a {
color: var(--danger);
}
}
@@ -1286,7 +1291,8 @@ section.users {
overflow-x: auto;
}
- td .badge:not(:last-child) {
+ td .badge:not(:last-child),
+ td a:not(:last-child) > .badge {
margin-inline-end: 0;
}
diff --git a/static/admin/partials/subscriber-lists.html b/static/admin/partials/subscriber-lists.html
index 9ce9837e..dd41a90d 100644
--- a/static/admin/partials/subscriber-lists.html
+++ b/static/admin/partials/subscriber-lists.html
@@ -23,17 +23,14 @@
{{- end }}
</td>
<td>
- <span class="badge enum" data-variant="secondary" data-cy="optin-{{ .Optin }}">
- {{ if eq .Optin "double" }}{{ Icon "user-check" }}{{ else }}{{ Icon "user-x" }}{{ end }}
- {{ $root.L.T (printf "lists.optins.%s" .Optin) }}
- </span>
-
- </span></td>
+ {{- $icon := "user-x" }}{{ if eq .Optin "double" }}{{ $icon = "user-check" }}{{ end }}
+ {{ Badge (list (Icon $icon) ($root.L.T (printf "lists.optins.%s" .Optin))) "enum" "secondary" }}
+ </td>
<td>
{{- if and (eq .Optin "single") (eq .SubscriptionStatus "unconfirmed") -}}
<span class="text-light">&ndash;</span>
{{- else -}}
- <span class="badge enum status-{{ .SubscriptionStatus }}" data-variant="secondary">{{ $root.L.T (printf "subscribers.status.%s" .SubscriptionStatus) }}</span>
+ {{ Badge ($root.L.T (printf "subscribers.status.%s" .SubscriptionStatus)) (printf "enum status-%s" .SubscriptionStatus) "secondary" }}
{{- end -}}
</td>
<td>{{ NiceDate .SubscriptionCreatedAt }}</td>
diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.html
index 05c4a40f..0dddea80 100644
--- a/static/admin/views/bounces.html
+++ b/static/admin/views/bounces.html
@@ -15,9 +15,9 @@
<span>({{ $d.Page.Total }})</span>
</h1>
<div class="hstack gap-1">
- {{- if $source }}<a href="{{ $base }}" class="badge">{{ $source }} &times;</a>{{ end }}
- {{- if $type }}<a href="{{ $base }}" class="badge">{{ .L.T (printf "bounces.%s" $type) }} &times;</a>{{ end }}
- {{- if $campaign }}<a href="{{ $base }}" class="badge">#{{ $campaign }} &times;</a>{{ end }}
+ {{- if $source }}<a href="{{ $base }}">{{ Badge (printf "%s ×" $source) }}</a>{{ end }}
+ {{- if $type }}<a href="{{ $base }}">{{ Badge (printf "%s ×" (.L.T (printf "bounces.%s" $type))) }}</a>{{ end }}
+ {{- if $campaign }}<a href="{{ $base }}">{{ Badge (printf "#%s ×" $campaign) }}</a>{{ end }}
</div>
</div>
</div>
@@ -63,13 +63,13 @@
<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" }}<span class="badge status-{{ .SubscriberStatus }}" data-cy="blocklisted">{{ $.L.T (printf "subscribers.status.%s" .SubscriberStatus) }}</span>{{ end }}
+ {{ if ne .SubscriberStatus "enabled" }}{{ Badge ($.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 }}
</td>
<td><a href="{{ $base }}?source={{ .Source }}">{{ .Source }}</a></td>
- <td><a href="{{ $base }}?type={{ .Type }}"><span class="badge enum {{ .Type }}" data-cy="type-{{ .Type }}" data-variant="secondary">{{ $.L.T (printf "bounces.%s" .Type) }}</span></a></td>
+ <td><a href="{{ $base }}?type={{ .Type }}">{{ Badge ($.L.T (printf "bounces.%s" .Type)) "enum" "secondary" }}</a></td>
<td class="date-stack">{{ NiceDate .CreatedAt }}</td>
<td class="actions align-right">
<ot-dropdown>
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index 588a7e34..20ee8cae 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -27,8 +27,8 @@
{{- else }}{{ $c.Name }}{{ end }}
</h1>
{{- if not $isNew }}
- <span class="badge enum status-{{ $c.Status }}">{{ .L.T (printf "campaigns.status.%s" $c.Status) }}</span>
- {{- if eq $c.Type "optin" }}<span class="badge enum optin">{{ .L.T "lists.optin" }}</span>{{ end }}
+ {{ Badge (.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>
</div>
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index ff472a8e..55590f26 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -75,19 +75,19 @@
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
<td class="status">
<a href="{{ $base }}/{{ .ID }}">
- <span class="badge enum status-{{ .Status }}" data-cy="status-{{ .Status }}">{{ $.L.T (printf "campaigns.status.%s" .Status) }}</span>
+ {{ 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">{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>
+ <div class="text-8 text-light mt-2">{{ Icon "clock" }} {{ NiceDate .SendAt }}</div>
{{- end }}
</td>
<td>
- {{- if eq .Type "optin" }}<span class="badge enum optin">{{ $.L.T "lists.optin" }}</span>{{ end }}
<a href="{{ $base }}/{{ .ID }}">{{ .Name }}</a>
<p class="text-light">{{ .Subject }}</p>
<div class="hstack gap-1">
- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="badge outline tag">#{{ . }}</a>{{ end }}
+ {{- if eq .Type "optin" }}{{ Badge ($.L.T "lists.optin") "enum optin" }}{{ end }}
+ {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">{{ Badge (printf "#%s" .) "outline tag" }}</a>{{ end }}
</div>
</td>
<td class="lists">
diff --git a/static/admin/views/dashboard.html b/static/admin/views/dashboard.html
index de7c1b5c..fb977fe7 100644
--- a/static/admin/views/dashboard.html
+++ b/static/admin/views/dashboard.html
@@ -19,8 +19,8 @@
<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" class="badge public">{{ FormatNumber $c.Lists.Public }} {{ .L.T "lists.types.public" }}</a>
- <a href="{{ URI "/admin/lists" }}?type=private" class="badge private">{{ FormatNumber $c.Lists.Private }} {{ .L.T "lists.types.private" }}</a>
+ <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>
</article>
</div>
@@ -30,8 +30,8 @@
<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" }}" class="badge outline">{{ FormatNumber $c.Subscribers.Orphans }} {{ .L.T "dashboard.orphanSubs" }}</a>
- <a href="{{ URI "/admin/subscribers" }}?status=blocklisted" class="badge status-blocklisted">{{ FormatNumber $c.Subscribers.Blocklisted }} {{ .L.T "subscribers.status.blocklisted" }}</a>
+ <a href="{{ URI "/admin/subscribers" }}">{{ 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>
</article>
</div>
@@ -41,8 +41,8 @@
<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" class="badge outline">{{ FormatNumber (index $c.Campaigns.ByStatus "scheduled") }} {{ .L.T "campaigns.status.scheduled" }}</a>
- <a href="{{ URI "/admin/campaigns" }}?status=finished" class="badge status-finished">{{ FormatNumber (index $c.Campaigns.ByStatus "finished") }} {{ .L.T "campaigns.status.finished" }}</a>
+ <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>
</article>
</div>
@@ -82,7 +82,7 @@
<tbody>
{{- range $d.Campaigns }}
<tr>
- <td width="20%"><span class="badge enum status-{{ .Status }}">{{ $.L.T (printf "campaigns.status.%s" .Status) }}</span></td>
+ <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">
{{- if and (eq .Status "scheduled") .SendAt.Valid }}{{ NiceDate .SendAt }}{{ else }}{{ NiceDate .CreatedAt }}{{ end -}}
diff --git a/static/admin/views/import.html b/static/admin/views/import.html
index 8a8a9b32..81393f91 100644
--- a/static/admin/views/import.html
+++ b/static/admin/views/import.html
@@ -101,6 +101,7 @@
<div class="row">
<header class="col-8">
<small class="text-light hstack">
+ <!-- Not the Badge template func as Alpine binds the variant and the content here. -->
<span class="badge" :data-variant="statusVariant" x-text="progress + '%'"></span>
<span x-show="isRunning" aria-busy="true" data-spinner="small"></span>
</small>
diff --git a/static/admin/views/lists.html b/static/admin/views/lists.html
index e729e051..eb3b486e 100644
--- a/static/admin/views/lists.html
+++ b/static/admin/views/lists.html
@@ -71,16 +71,14 @@
<td>
<a href="{{ URI "/admin/lists" }}/{{ .ID }}">{{ .Name }}</a>
<div class="hstack gap-1">
- {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}" class="badge outline tag">#{{ . }}</a>{{ end }}
+ {{ range .Tags }}<a href="?{{ $d.Page.Encode "tag" }}&tag={{ . }}">{{ Badge (printf "#%s" .) "outline tag" }}</a>{{ end }}
</div>
</td>
<td>
<div class="hstack">
- <span class="badge enum {{ .Type }}" data-cy="type-{{ .Type }}">{{ $.L.T (printf "lists.types.%s" .Type) }}</span>
- <span class="badge enum" data-variant="secondary" data-cy="optin-{{ .Optin }}">
- {{ if eq .Optin "double" }}{{ Icon "user-check" }}{{ else }}{{ Icon "user-x" }}{{ end }}
- {{ $.L.T (printf "lists.optins.%s" .Optin) }}
- </span>
+ {{ Badge ($.L.T (printf "lists.types.%s" .Type)) (printf "enum %s" .Type) }}
+ {{- $icon := "user-x" }}{{ if eq .Optin "double" }}{{ $icon = "user-check" }}{{ end }}
+ {{ Badge (list (Icon $icon) ($.L.T (printf "lists.optins.%s" .Optin))) "enum" "secondary" }}
</div>
</td>
<td class="subscribers">
diff --git a/static/admin/views/profile.html b/static/admin/views/profile.html
index 611329dc..86114e7d 100644
--- a/static/admin/views/profile.html
+++ b/static/admin/views/profile.html
@@ -9,7 +9,7 @@
<div class="col-8">
<div class="hstack gap-1">
<h1 class="page-title">{{ .L.T "users.profile" }}</h1>
- {{- if $u.UserRole.Name }}<span class="badge">{{ $u.UserRole.Name }}</span>{{ end }}
+ {{- if $u.UserRole.Name }}{{ Badge $u.UserRole.Name }}{{ end }}
</div>
</div>
</header>
diff --git a/static/admin/views/roles.html b/static/admin/views/roles.html
index 35a82215..95d7fba4 100644
--- a/static/admin/views/roles.html
+++ b/static/admin/views/roles.html
@@ -39,7 +39,7 @@
<tr data-id="{{ .ID }}">
<td>
<a href="{{ $base }}/{{ .ID }}">
- {{- if eq .ID 1 }}<span class="badge enum super">{{ Icon "star" }}{{ .Name }}</span>{{ else }}{{ .Name }}{{ end -}}
+ {{- if eq .ID 1 }}{{ Badge (list (Icon "star") .Name) "enum" }}{{ else }}{{ .Name }}{{ end -}}
</a>
</td>
<td class="date-stack">{{ NiceDate .CreatedAt }}</td>
diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.html
index 1244fd6c..fd6d1575 100644
--- a/static/admin/views/subscriber.html
+++ b/static/admin/views/subscriber.html
@@ -15,7 +15,7 @@
<a href="{{ URI "/admin/subscribers" }}" class="back" aria-label="{{ .L.T "globals.buttons.back" }}">{{ Icon "chevron-left" }}</a>
<h1 class="page-title">
{{ $sub.Email }}
- {{ if ne $sub.Status "enabled" }}<span class="badge status-{{ $sub.Status }}">{{ .L.T (printf "subscribers.status.%s" $sub.Status) }}</span>{{ end }}
+ {{ if ne $sub.Status "enabled" }}{{ Badge (.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.html
index 3e3febb2..0c875e43 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -102,14 +102,14 @@
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
<td class="email">
<a href="{{ URI "/admin/subscribers" }}/{{ .ID }}">{{ .Email }}</a>
- {{- if ne .Status "enabled" }}<span class="badge status-{{ .Status }}">{{ $.L.T (printf "subscribers.status.%s" .Status) }}</span>{{ end }}
+ {{- if ne .Status "enabled" }}{{ Badge ($.L.T (printf "subscribers.status.%s" .Status)) (printf "status-%s" .Status) }}{{ end }}
<div class="badge-list hstack gap-1">
{{- range .ParsedLists }}
- <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" class="badge outline">
- {{ .Name }}
- {{- if or (eq .Optin "double") (eq .SubscriptionStatus "unsubscribed") }}
- <sup class="status-{{ .SubscriptionStatus }}">{{ $.L.T (printf "subscribers.status.%s" .SubscriptionStatus) }}</sup>{{ end }}
- </a>
+ {{- $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)))) }}
+ {{- end }}
+ <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}">{{ Badge (list .Name $sup) "outline" }}</a>
{{- end }}
</div>
</td>
diff --git a/static/admin/views/template.html b/static/admin/views/template.html
index 399df729..405ba65c 100644
--- a/static/admin/views/template.html
+++ b/static/admin/views/template.html
@@ -20,7 +20,7 @@
<h1 class="page-title">
{{- if $isNew }}{{ .L.T "templates.newTemplate" }}{{ else }}{{ $t.Name }}{{ end -}}
</h1>
- {{- if and (not $isNew) $t.IsDefault }}<span class="badge enum" data-variant="secondary">{{ .L.T "templates.default" }}</span>{{ end }}
+ {{- if and (not $isNew) $t.IsDefault }}{{ Badge (.L.T "templates.default") "enum" "secondary" }}{{ end }}
</div>
</div>
<div class="col-6 col-end hstack justify-end">
diff --git a/static/admin/views/templates.html b/static/admin/views/templates.html
index 69785dad..12342c6c 100644
--- a/static/admin/views/templates.html
+++ b/static/admin/views/templates.html
@@ -38,19 +38,19 @@
<tr data-id="{{ .ID }}">
<td>
<a href="{{ $base }}/{{ .ID }}" data-cy="btn-edit">{{ .Name }}</a>
- {{ if .IsDefault }}<span class="badge">{{ $.L.T "templates.default" }}</span>{{ end }}
+ {{ if .IsDefault }}{{ Badge ($.L.T "templates.default") }}{{ end }}
{{- if eq .Type "tx" }}<p class="text-light">{{ .Subject }}</p>{{ end }}
</td>
<td>
<div class="hstack">
{{- if eq .Type "tx" }}
- <span class="badge enum tx" data-cy="type-tx">{{ $.L.Tc "globals.terms.tx" 1 }}</span>
+ {{ Badge ($.L.Tc "globals.terms.tx" 1) "enum tx" }}
{{- else }}
- <span class="badge enum campaign" data-cy="type-campaign">{{ $.L.Tc "globals.terms.campaign" 1 }}</span>
+ {{ Badge ($.L.Tc "globals.terms.campaign" 1) "enum campaign" }}
{{- if eq .Type "campaign_visual" }}
- <span class="badge enum" data-variant="secondary" data-cy="type-campaign_visual">{{ $.L.T "campaigns.visual" }}</span>
+ {{ Badge ($.L.T "campaigns.visual") "enum" "secondary" }}
{{- else }}
- <span class="badge enum" data-variant="secondary" data-cy="format-html">HTML</span>
+ {{ Badge "HTML" "enum" "secondary" }}
{{- end }}
{{- end }}
</div>
diff --git a/static/admin/views/user.html b/static/admin/views/user.html
index 77bf5c01..04f1fdde 100644
--- a/static/admin/views/user.html
+++ b/static/admin/views/user.html
@@ -16,7 +16,7 @@
<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") }}<span class="badge enum" data-variant="danger">{{ $.L.T "users.status.disabled" }}</span>{{ end }}
+ {{- if and $d.IsEditing (eq $d.User.Status "disabled") }}{{ Badge ($.L.T "users.status.disabled") "enum" "danger" }}{{ end }}
</div>
</div>
</header>
diff --git a/static/admin/views/users.html b/static/admin/views/users.html
index cf0e634b..ed078c75 100644
--- a/static/admin/views/users.html
+++ b/static/admin/views/users.html
@@ -64,19 +64,19 @@
{{- else }}
<span class="{{ if eq .Status "disabled" }}text-danger{{ end }}">{{ .Username }}</span>
{{- end }}
- {{- if eq .Type "api" }}<span class="badge outline tag">{{ Icon "code" }} {{ $.L.T "users.type.api" }}</span>{{ end }}
- {{- if eq .Status "disabled" }}<span class="badge enum" data-variant="danger">{{ $.L.T "users.status.disabled" }}</span>{{ end }}
+ {{- if eq .Type "api" }}{{ Badge (list (Icon "code") ($.L.T "users.type.api")) "outline tag" }}{{ end }}
+ {{- if eq .Status "disabled" }}{{ Badge ($.L.T "users.status.disabled") "enum" "danger" }}{{ end }}
{{- if .Name }}<div class="text-light text-8">{{ .Name }}</div>{{ end }}
</td>
<td>
<div class="hstack gap-1">
{{- if eq .UserRole.ID 1 }}
- <a href="{{ URI "/admin/users/roles" }}/{{ .UserRole.ID }}" class="badge">{{ Icon "star" }} {{ .UserRole.Name }}</a>
+ <a href="{{ URI "/admin/users/roles" }}/{{ .UserRole.ID }}">{{ Badge (list (Icon "star") .UserRole.Name) }}</a>
{{- else }}
- <a href="{{ URI "/admin/users/roles" }}/{{ .UserRole.ID }}" class="badge" data-variant="secondary">{{ Icon "user" }} {{ .UserRole.Name }}</a>
+ <a href="{{ URI "/admin/users/roles" }}/{{ .UserRole.ID }}">{{ Badge (list (Icon "user") .UserRole.Name) "" "secondary" }}</a>
{{- end }}
{{- with .ListRole }}
- <a href="{{ URI "/admin/users/roles/lists" }}/{{ .ID }}" class="badge outline">{{ Icon "list" }} {{ .Name }}</a>
+ <a href="{{ URI "/admin/users/roles/lists" }}/{{ .ID }}">{{ Badge (list (Icon "list") .Name) "outline" }}</a>
{{- end }}
</div>
</td>