Skip to content

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

SSR: Show current page as a badge on top of item pages.

Kailash Nadhf75da0eb3c03
diff --git a/go.mod b/go.mod
index 727a3cd5..7084739e 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
github.com/knadh/koanf/providers/posflag v1.0.1
github.com/knadh/koanf/providers/rawbytes v1.0.0
github.com/knadh/koanf/v2 v2.2.2
- github.com/knadh/paginator/v2 v2.0.2
+ github.com/knadh/paginator/v2 v2.0.3
github.com/knadh/smtppool/v2 v2.1.2
github.com/knadh/stuffbin v1.3.0
github.com/labstack/echo/v4 v4.15.3
diff --git a/go.sum b/go.sum
index 24b95e5a..61b9128a 100644
--- a/go.sum
+++ b/go.sum
@@ -72,8 +72,8 @@ github.com/knadh/koanf/providers/rawbytes v1.0.0 h1:MrKDh/HksJlKJmaZjgs4r8aVBb/z
github.com/knadh/koanf/providers/rawbytes v1.0.0/go.mod h1:KxwYJf1uezTKy6PBtfE+m725NGp4GPVA7XoNTJ/PtLo=
github.com/knadh/koanf/v2 v2.2.2 h1:ghbduIkpFui3L587wavneC9e3WIliCgiCgdxYO/wd7A=
github.com/knadh/koanf/v2 v2.2.2/go.mod h1:abWQc0cBXLSF/PSOMCB/SK+T13NXDsPvOksbpi5e/9Q=
-github.com/knadh/paginator/v2 v2.0.2 h1:MhQ5QcNRSUMMj+CIHL3EfI2te67f2FjhmZJhXCtL7qk=
-github.com/knadh/paginator/v2 v2.0.2/go.mod h1:Vw3XTxOpKQyYNiv+eKMtemEz6iHBBs4yWygPDpdOcBo=
+github.com/knadh/paginator/v2 v2.0.3 h1:r3SXb48puySU34R5W8F5oh/0opawtoLlKnxWOK/RCK4=
+github.com/knadh/paginator/v2 v2.0.3/go.mod h1:Vw3XTxOpKQyYNiv+eKMtemEz6iHBBs4yWygPDpdOcBo=
github.com/knadh/smtppool/v2 v2.1.2 h1:FBpwnDTKmWwUy1reeeMeYJXl2QbUgVsKhAGVgJF3F2I=
github.com/knadh/smtppool/v2 v2.1.2/go.mod h1:D7HcfSS8Xd3jpZ9LRwQ3aGdqp9FzFE66uW6w/BTpy4E=
github.com/knadh/stuffbin v1.3.0 h1:HaVSuYV+KnrlCHl7DrLNyOCgpTU2K8x5Hb+J4Ck3gww=
diff --git a/i18n/en.json b/i18n/en.json
index b420ae9f..fbdde1a5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -244,6 +244,7 @@
"globals.terms.minute": "Minute | Minutes",
"globals.terms.month": "Month | Months",
"globals.terms.none": "None",
+ "globals.terms.page": "Page {n}",
"globals.terms.new": "New",
"globals.terms.recent": "Recent {name}",
"globals.terms.second": "Second | Seconds",
diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.html
index 64373fe3..5c72a9d5 100644
--- a/static/admin/views/bounces.html
+++ b/static/admin/views/bounces.html
@@ -18,6 +18,7 @@
{{- 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 }}
+ {{- if gt $d.Page.Page 1 }}<a href="{{ $d.Page.FilterURL $base }}">{{ Badge (printf "%s ×" (.L.Ts "globals.terms.page" "n" (printf "%d" $d.Page.Page))) }}</a>{{ end }}
</div>
</div>
</div>
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index b7f627d0..9f4e2838 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -15,6 +15,7 @@
{{- if $status }} {{ template "filter-badge" dict "Label" (.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" (.L.T "lists.optin") "Class" "enum optin" "URL" ($d.Page.FilterURL $base "type") }}{{ end }}
{{- if $tags }} {{ template "filter-badge" dict "Label" (printf "#%s" $tags) "Class" "outline 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)) "Class" "outline" "URL" ($d.Page.FilterURL $base) }}{{ end }}
</h1>
</div>
<div class="col-6 col-end align-right hstack justify-end">
diff --git a/static/admin/views/lists.html b/static/admin/views/lists.html
index 3b65bda4..dcc5c622 100644
--- a/static/admin/views/lists.html
+++ b/static/admin/views/lists.html
@@ -22,6 +22,7 @@
{{ template "filter-badge" dict "Label" (list (Icon $optinIcon) (.L.T (printf "lists.optins.%s" $optin))) "Class" "enum" "Variant" "secondary" "URL" ($d.Page.FilterURL $base "optin") }}
{{- end }}
{{- if $tags }} {{ template "filter-badge" dict "Label" (printf "#%s" $tags) "Class" "outline 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)) "Class" "outline" "URL" ($d.Page.FilterURL $base) }}{{ end }}
</h1>
</div>
<div class="col-6 col-end align-right hstack justify-end">
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index 6c8fdbad..c804223b 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -26,6 +26,7 @@
{{- if eq $subStatus "none" }} {{ template "filter-badge" dict "Label" (.L.T "dashboard.orphanSubs") "Class" "outline" "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 }}
+ {{- 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 hstack justify-end">