Skip to content

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

SSR: Add missing sort icons to table headers.

Kailash Nadh94581ccf19d2
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index 970d6f21..b54bf574 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -605,7 +605,30 @@ main {
}
th a[data-sort-field] {
- position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.2em;
+ }
+
+ th a[data-sorted]::after {
+ content: "";
+ flex: 0 0 auto;
+ width: 1em;
+ height: 1em;
+ background-color: currentColor;
+ -webkit-mask: center / contain no-repeat;
+ mask: center / contain no-repeat;
+ }
+
+ th a[data-sorted="asc"]::after {
+ -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='19' x2='12' y2='5'/%3E%3Cpolyline points='5 12 12 5 19 12'/%3E%3C/svg%3E");
+ mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='19' x2='12' y2='5'/%3E%3Cpolyline points='5 12 12 5 19 12'/%3E%3C/svg%3E");
+ }
+
+ th a[data-sorted="desc"]::after {
+ -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='5' x2='12' y2='19'/%3E%3Cpolyline points='19 12 12 19 5 12'/%3E%3C/svg%3E");
+ mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cline x1='12' y1='5' x2='12' y2='19'/%3E%3Cpolyline points='19 12 12 19 5 12'/%3E%3C/svg%3E");
}
th > input[type=checkbox],
diff --git a/static/admin/partials/sidebar.html b/static/admin/partials/sidebar.html
index e080f559..085119ae 100644
--- a/static/admin/partials/sidebar.html
+++ b/static/admin/partials/sidebar.html
@@ -1,6 +1,6 @@
{{ define "admin-sidebar" }}
-{{ $u := .Data.Profile }}
-{{ $p := .Data.PageID }}
+{{- $u := .Data.Profile }}
+{{- $p := .Data.PageID }}
<nav>
<ul>
<li>
@@ -18,83 +18,83 @@
</details>
</li>
- {{ if Can $u "subscribers:get" "subscribers:get_all" "subscribers:manage" "subscribers:import" "bounces:get" }}
+ {{- if Can $u "subscribers:get" "subscribers:get_all" "subscribers:manage" "subscribers:import" "bounces:get" }}
<li>
<details {{ ExpandNav $p "subscribers" }} name="sidebar-nav" data-cy="subscribers">
<summary>{{ Icon "at-sign" }} {{ .L.T "globals.terms.subscribers" }}</summary>
<ul>
- {{ if Can $u "subscribers:get" "subscribers:get_all" }}
- <li><a href="{{ URI "/admin/subscribers" }}" {{ IsNav $p "subscribers.all" }} data-cy="all-subscribers">{{ .L.T "menu.allSubscribers" }}</a></li>
- {{ end }}
- {{ if Can $u "subscribers:import" }}
- <li><a href="{{ URI "/admin/subscribers/import" }}" {{ IsNav $p "subscribers.import" }} data-cy="import">{{ .L.T "menu.import" }}</a></li>
- {{ end }}
- {{ if Can $u "bounces:get" }}
- <li><a href="{{ URI "/admin/subscribers/bounces" }}" {{ IsNav $p "subscribers.bounces" }} data-cy="bounces">{{ .L.T "globals.terms.bounces" }}</a></li>
- {{ end }}
+ {{- if Can $u "subscribers:get" "subscribers:get_all" }}
+ <li><a href="{{ URI "/admin/subscribers" }}" {{ IsNav $p "subscribers.all" }} data-cy="all-subscribers">{{ .L.T "menu.allSubscribers" }}</a></li>
+ {{- end }}
+ {{- if Can $u "subscribers:import" }}
+ <li><a href="{{ URI "/admin/subscribers/import" }}" {{ IsNav $p "subscribers.import" }} data-cy="import">{{ .L.T "menu.import" }}</a></li>
+ {{- end }}
+ {{- if Can $u "bounces:get" }}
+ <li><a href="{{ URI "/admin/subscribers/bounces" }}" {{ IsNav $p "subscribers.bounces" }} data-cy="bounces">{{ .L.T "globals.terms.bounces" }}</a></li>
+ {{- end }}
</ul>
</details>
</li>
- {{ end }}
+ {{- end }}
- {{ if Can $u "campaigns:get" "campaigns:manage" "campaigns:get_analytics" "media:get" "templates:get" }}
+ {{- if Can $u "campaigns:get" "campaigns:manage" "campaigns:get_analytics" "media:get" "templates:get" }}
<li>
<details {{ ExpandNav $p "campaigns" }} name="sidebar-nav" data-cy="campaigns">
<summary>{{ Icon "send" }} {{ .L.T "globals.terms.campaigns" }}</summary>
<ul>
- {{ if Can $u "campaigns:get" "campaigns:get_all" }}
- <li><a href="{{ URI "/admin/campaigns" }}" {{ IsNav $p "campaigns.all" }} data-cy="all-campaigns">{{ .L.T "menu.allCampaigns" }}</a></li>
- {{ end }}
- {{ if Can $u "campaigns:manage" "campaigns:manage_all" }}
- <li><a href="{{ URI "/admin/campaigns/new" }}" {{ IsNav $p "campaigns.new" }} data-cy="new-campaign">{{ .L.T "menu.newCampaign" }}</a></li>
- {{ end }}
- {{ if Can $u "media:get" "media:manage" }}
- <li><a href="{{ URI "/admin/campaigns/media" }}" {{ IsNav $p "campaigns.media" }} data-cy="media">{{ .L.T "menu.media" }}</a></li>
- {{ end }}
- {{ if Can $u "templates:get" }}
- <li><a href="{{ URI "/admin/templates" }}" {{ IsNav $p "campaigns.templates" }} data-cy="templates">{{ .L.T "globals.terms.templates" }}</a></li>
- {{ end }}
- {{ if Can $u "campaigns:get_analytics" }}
- <li><a href="{{ URI "/admin/campaigns/analytics" }}" {{ IsNav $p "campaigns.analytics" }} data-cy="analytics">{{ .L.T "globals.terms.analytics" }}</a></li>
- {{ end }}
+ {{- if Can $u "campaigns:get" "campaigns:get_all" }}
+ <li><a href="{{ URI "/admin/campaigns" }}" {{ IsNav $p "campaigns.all" }} data-cy="all-campaigns">{{ .L.T "menu.allCampaigns" }}</a></li>
+ {{- end }}
+ {{- if Can $u "campaigns:manage" "campaigns:manage_all" }}
+ <li><a href="{{ URI "/admin/campaigns/new" }}" {{ IsNav $p "campaigns.new" }} data-cy="new-campaign">{{ .L.T "menu.newCampaign" }}</a></li>
+ {{- end }}
+ {{- if Can $u "media:get" "media:manage" }}
+ <li><a href="{{ URI "/admin/campaigns/media" }}" {{ IsNav $p "campaigns.media" }} data-cy="media">{{ .L.T "menu.media" }}</a></li>
+ {{- end }}
+ {{- if Can $u "templates:get" }}
+ <li><a href="{{ URI "/admin/templates" }}" {{ IsNav $p "campaigns.templates" }} data-cy="templates">{{ .L.T "globals.terms.templates" }}</a></li>
+ {{- end }}
+ {{- if Can $u "campaigns:get_analytics" }}
+ <li><a href="{{ URI "/admin/campaigns/analytics" }}" {{ IsNav $p "campaigns.analytics" }} data-cy="analytics">{{ .L.T "globals.terms.analytics" }}</a></li>
+ {{- end }}
</ul>
</details>
</li>
- {{ end }}
+ {{- end }}
- {{ if Can $u "users:get" "users:manage" "roles:get" "roles:manage" }}
+ {{- if Can $u "users:get" "users:manage" "roles:get" "roles:manage" }}
<li>
<details {{ ExpandNav $p "users" }} name="sidebar-nav" data-cy="users">
<summary>{{ Icon "users" }} {{ .L.T "globals.terms.users" }}</summary>
<ul>
- {{ if Can $u "users:get" }}
- <li><a href="{{ URI "/admin/users" }}" {{ IsNav $p "users.users" }} data-cy="users">{{ .L.T "globals.terms.users" }}</a></li>
- {{ end }}
- {{ if Can $u "roles:get" }}
- <li><a href="{{ URI "/admin/users/roles" }}" {{ IsNav $p "users.user-roles" }} data-cy="userRoles">{{ .L.T "users.userRoles" }}</a></li>
- <li><a href="{{ URI "/admin/users/roles/lists" }}" {{ IsNav $p "users.list-roles" }} data-cy="listRoles">{{ .L.T "users.listRoles" }}</a></li>
- {{ end }}
+ {{- if Can $u "users:get" }}
+ <li><a href="{{ URI "/admin/users" }}" {{ IsNav $p "users.users" }} data-cy="users">{{ .L.T "globals.terms.users" }}</a></li>
+ {{- end }}
+ {{- if Can $u "roles:get" }}
+ <li><a href="{{ URI "/admin/users/roles" }}" {{ IsNav $p "users.user-roles" }} data-cy="userRoles">{{ .L.T "users.userRoles" }}</a></li>
+ <li><a href="{{ URI "/admin/users/roles/lists" }}" {{ IsNav $p "users.list-roles" }} data-cy="listRoles">{{ .L.T "users.listRoles" }}</a></li>
+ {{- end }}
</ul>
</details>
</li>
- {{ end }}
+ {{- end }}
- {{ if Can $u "settings:get" "settings:manage" "settings:maintain" }}
+ {{- if Can $u "settings:get" "settings:manage" "settings:maintain" }}
<li>
<details {{ ExpandNav $p "settings" }} name="sidebar-nav" data-cy="settings">
<summary>{{ Icon "settings" }} {{ .L.T "menu.settings" }}</summary>
<ul>
- {{ if Can $u "settings:get" }}
- <li><a href="{{ URI "/admin/settings" }}" {{ IsNav $p "settings.all" }} data-cy="all-settings">{{ .L.T "menu.settings" }}</a></li>
- <li><a href="{{ URI "/admin/settings/logs" }}" {{ IsNav $p "settings.logs" }} data-cy="logs">{{ .L.T "menu.logs" }}</a></li>
- {{ end }}
- {{ if Can $u "settings:maintain" }}
- <li><a href="{{ URI "/admin/settings/maintenance" }}" {{ IsNav $p "settings.maintenance" }} data-cy="maintenance">{{ .L.T "menu.maintenance" }}</a></li>
- {{ end }}
+ {{- if Can $u "settings:get" }}
+ <li><a href="{{ URI "/admin/settings" }}" {{ IsNav $p "settings.all" }} data-cy="all-settings">{{ .L.T "menu.settings" }}</a></li>
+ <li><a href="{{ URI "/admin/settings/logs" }}" {{ IsNav $p "settings.logs" }} data-cy="logs">{{ .L.T "menu.logs" }}</a></li>
+ {{- end }}
+ {{- if Can $u "settings:maintain" }}
+ <li><a href="{{ URI "/admin/settings/maintenance" }}" {{ IsNav $p "settings.maintenance" }} data-cy="maintenance">{{ .L.T "menu.maintenance" }}</a></li>
+ {{- end }}
</ul>
</details>
</li>
- {{ end }}
+ {{- end }}
</ul>
</nav>
{{ end }}