Skip to content

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

Add sidebar nav expansion/active item selection.

Kailash Nadh629f4b04cfd1
diff --git a/cmd/bounce.go b/cmd/bounce.go
index 9194972d..0cdeef1d 100644
--- a/cmd/bounce.go
+++ b/cmd/bounce.go
@@ -41,7 +41,7 @@ func (a *App) ViewBounces(c echo.Context) error {
}
data := bouncesView{
- adminView: newAdminView(c, a.i18n.T("globals.terms.bounces"), ""),
+ adminView: newAdminView(c, a.i18n.T("globals.terms.bounces"), "", "subscribers.bounces"),
Bounces: res,
Page: models.NewPageProps(q, total, pg.Page, pg.PerPage),
}
diff --git a/cmd/import.go b/cmd/import.go
index bdf42f1f..18fa2d93 100644
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -45,7 +45,7 @@ func (a *App) ViewImport(c echo.Context) error {
}
data := importView{
- adminView: newAdminView(c, a.i18n.T("import.title"), ""),
+ adminView: newAdminView(c, a.i18n.T("import.title"), "", "subscribers.import"),
AllLists: allLists,
SelectedLists: selected,
diff --git a/cmd/init.go b/cmd/init.go
index 343efcca..1ef21791 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -1146,6 +1146,18 @@ 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))
},
+ "IsNav": func(current, id string) template.HTMLAttr {
+ if current == id {
+ return template.HTMLAttr(` aria-current="page"`)
+ }
+ return ""
+ },
+ "ExpandNav": func(current, section string) template.HTMLAttr {
+ if current == section || strings.HasPrefix(current, section+".") {
+ return template.HTMLAttr(" open")
+ }
+ return ""
+ },
"ToJSON": jsonForTpl,
"Can": can,
"CanManageList": canManageList,
diff --git a/cmd/lists.go b/cmd/lists.go
index 6ec814c5..c6827783 100644
--- a/cmd/lists.go
+++ b/cmd/lists.go
@@ -55,8 +55,13 @@ func (a *App) ViewLists(c echo.Context) error {
return err
}
+ pageID := "lists.all"
+ if c.QueryParam("status") == models.ListStatusArchived {
+ pageID = "lists.archived"
+ }
+
data := listsView{
- adminView: newAdminView(c, a.i18n.T("globals.terms.lists"), ""),
+ adminView: newAdminView(c, a.i18n.T("globals.terms.lists"), "", pageID),
Lists: lists,
Page: props,
CacheSlowQueries: ko.Bool("app.cache_slow_queries"),
@@ -81,7 +86,7 @@ func (a *App) ViewList(c echo.Context) error {
}
data := listView{
- adminView: newAdminView(c, list.Name, ""),
+ adminView: newAdminView(c, list.Name, "", "lists.all"),
List: list,
}
@@ -108,7 +113,7 @@ func (a *App) ViewForms(c echo.Context) error {
adminView
PublicLists []publicListForm
}{
- adminView: newAdminView(c, a.i18n.T("forms.title"), ""),
+ adminView: newAdminView(c, a.i18n.T("forms.title"), "", "lists.forms"),
PublicLists: out,
}
diff --git a/cmd/media.go b/cmd/media.go
index 8361761d..820415d8 100644
--- a/cmd/media.go
+++ b/cmd/media.go
@@ -40,7 +40,7 @@ func (a *App) ViewMedia(c echo.Context) error {
}
data := mediaView{
- adminView: newAdminView(c, a.i18n.T("media.title"), ""),
+ adminView: newAdminView(c, a.i18n.T("media.title"), "", "campaigns.media"),
Media: res,
Provider: a.cfg.MediaUpload.Provider,
Page: props,
diff --git a/cmd/roles.go b/cmd/roles.go
index 1eb644db..8765f837 100644
--- a/cmd/roles.go
+++ b/cmd/roles.go
@@ -61,7 +61,7 @@ func (a *App) ViewUserRoles(c echo.Context) error {
}
data := rolesView{
- adminView: newAdminView(c, a.i18n.T("users.userRoles"), ""),
+ adminView: newAdminView(c, a.i18n.T("users.userRoles"), "", "users.user-roles"),
Type: "user",
Roles: rows,
}
@@ -86,7 +86,7 @@ func (a *App) ViewListRoles(c echo.Context) error {
}
data := rolesView{
- adminView: newAdminView(c, a.i18n.T("users.listRoles"), ""),
+ adminView: newAdminView(c, a.i18n.T("users.listRoles"), "", "users.list-roles"),
Type: "list",
Roles: rows,
}
@@ -124,7 +124,7 @@ func (a *App) ViewUserRole(c echo.Context) error {
}
data := roleFormView{
- adminView: newAdminView(c, title, ""),
+ adminView: newAdminView(c, title, "", "users.user-roles"),
IsEditing: isEditing,
Role: role,
PermGroups: groups,
@@ -176,7 +176,7 @@ func (a *App) ViewListRole(c echo.Context) error {
}
data := roleFormView{
- adminView: newAdminView(c, title, ""),
+ adminView: newAdminView(c, title, "", "users.list-roles"),
IsEditing: isEditing,
Role: role,
AllLists: lists,
diff --git a/cmd/subscribers.go b/cmd/subscribers.go
index ec5c9142..d6573f85 100644
--- a/cmd/subscribers.go
+++ b/cmd/subscribers.go
@@ -123,7 +123,7 @@ func (a *App) ViewSubscribers(c echo.Context) error {
}
data := subscribersView{
- adminView: newAdminView(c, a.i18n.T("globals.terms.subscribers"), ""),
+ adminView: newAdminView(c, a.i18n.T("globals.terms.subscribers"), "", "subscribers.all"),
Subscribers: subs,
Page: props,
AllLists: allLists,
@@ -151,7 +151,7 @@ func (a *App) ViewSubscriber(c echo.Context) error {
}
data := subscriberView{
- adminView: newAdminView(c, out.Email, ""),
+ adminView: newAdminView(c, out.Email, "", "subscribers.all"),
Tab: tab,
Subscriber: out,
AllLists: allLists,
@@ -173,7 +173,7 @@ func (a *App) ViewSubscriberBounces(c echo.Context) error {
}
data := subscriberView{
- adminView: newAdminView(c, out.Email, ""),
+ adminView: newAdminView(c, out.Email, "", "subscribers.all"),
Tab: "bounces",
Subscriber: out,
Bounces: bounces,
@@ -195,7 +195,7 @@ func (a *App) ViewSubscriberActivity(c echo.Context) error {
}
data := subscriberView{
- adminView: newAdminView(c, out.Email, ""),
+ adminView: newAdminView(c, out.Email, "", "subscribers.all"),
Tab: "activity",
Subscriber: out,
}
diff --git a/cmd/users.go b/cmd/users.go
index e0f98929..07691e46 100644
--- a/cmd/users.go
+++ b/cmd/users.go
@@ -52,7 +52,7 @@ func (a *App) ViewUsers(c echo.Context) error {
}
data := usersView{
- adminView: newAdminView(c, a.i18n.T("globals.terms.users"), ""),
+ adminView: newAdminView(c, a.i18n.T("globals.terms.users"), "", "users.users"),
Users: users,
}
@@ -92,7 +92,7 @@ func (a *App) ViewUser(c echo.Context) error {
}
data := userView{
- adminView: newAdminView(c, title, ""),
+ adminView: newAdminView(c, title, "", "users.users"),
User: user,
IsEditing: isEditing,
UserRoles: userRoles,
diff --git a/cmd/views.go b/cmd/views.go
index faf0db78..77a8759b 100644
--- a/cmd/views.go
+++ b/cmd/views.go
@@ -10,13 +10,15 @@ import (
type adminView struct {
Title string
Description string
+ PageID string
Profile auth.User
}
-func newAdminView(c echo.Context, title, description string) adminView {
+func newAdminView(c echo.Context, title, description, pageID string) adminView {
return adminView{
Title: title,
Description: description,
+ PageID: pageID,
Profile: auth.GetUser(c),
}
}
diff --git a/static/admin/partials/sidebar.html b/static/admin/partials/sidebar.html
index e3560e81..e080f559 100644
--- a/static/admin/partials/sidebar.html
+++ b/static/admin/partials/sidebar.html
@@ -1,35 +1,36 @@
{{ define "admin-sidebar" }}
{{ $u := .Data.Profile }}
+{{ $p := .Data.PageID }}
<nav>
<ul>
<li>
- <a href="{{ URI "/admin" }}">{{ Icon "grid" }} {{ .L.T "menu.dashboard" }}</a>
+ <a href="{{ URI "/admin" }}" {{ IsNav $p "dashboard" }}>{{ Icon "grid" }} {{ .L.T "menu.dashboard" }}</a>
</li>
<li>
- <details name="sidebar-nav" data-cy="lists" open>
+ <details {{ ExpandNav $p "lists" }} name="sidebar-nav" data-cy="lists">
<summary>{{ Icon "list" }} {{ .L.T "globals.terms.lists" }}</summary>
<ul>
- <li><a href="{{ URI "/admin/lists" }}" data-cy="all-lists">{{ .L.T "menu.allLists" }}</a></li>
- <li><a href="{{ URI "/admin/lists" }}?status=archived" data-cy="archived-lists">{{ .L.T "lists.archived" }}</a></li>
- <li><a href="{{ URI "/admin/lists/forms" }}" data-cy="forms">{{ .L.T "menu.forms" }}</a></li>
+ <li><a href="{{ URI "/admin/lists" }}" {{ IsNav $p "lists.all" }} data-cy="all-lists">{{ .L.T "menu.allLists" }}</a></li>
+ <li><a href="{{ URI "/admin/lists" }}?status=archived" {{ IsNav $p "lists.archived" }} data-cy="archived-lists">{{ .L.T "lists.archived" }}</a></li>
+ <li><a href="{{ URI "/admin/lists/forms" }}" {{ IsNav $p "lists.forms" }} data-cy="forms">{{ .L.T "menu.forms" }}</a></li>
</ul>
</details>
</li>
{{ if Can $u "subscribers:get" "subscribers:get_all" "subscribers:manage" "subscribers:import" "bounces:get" }}
<li>
- <details name="sidebar-nav" data-cy="subscribers">
+ <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" }}" data-cy="all-subscribers">{{ .L.T "menu.allSubscribers" }}</a></li>
+ <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" }}" data-cy="import">{{ .L.T "menu.import" }}</a></li>
+ <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" }}" data-cy="bounces">{{ .L.T "globals.terms.bounces" }}</a></li>
+ <li><a href="{{ URI "/admin/subscribers/bounces" }}" {{ IsNav $p "subscribers.bounces" }} data-cy="bounces">{{ .L.T "globals.terms.bounces" }}</a></li>
{{ end }}
</ul>
</details>
@@ -38,23 +39,23 @@
{{ if Can $u "campaigns:get" "campaigns:manage" "campaigns:get_analytics" "media:get" "templates:get" }}
<li>
- <details name="sidebar-nav" data-cy="campaigns">
+ <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" }}" data-cy="all-campaigns">{{ .L.T "menu.allCampaigns" }}</a></li>
+ <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" }}" data-cy="new-campaign">{{ .L.T "menu.newCampaign" }}</a></li>
+ <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" }}" data-cy="media">{{ .L.T "menu.media" }}</a></li>
+ <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" }}" data-cy="templates">{{ .L.T "globals.terms.templates" }}</a></li>
+ <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" }}" data-cy="analytics">{{ .L.T "globals.terms.analytics" }}</a></li>
+ <li><a href="{{ URI "/admin/campaigns/analytics" }}" {{ IsNav $p "campaigns.analytics" }} data-cy="analytics">{{ .L.T "globals.terms.analytics" }}</a></li>
{{ end }}
</ul>
</details>
@@ -63,15 +64,15 @@
{{ if Can $u "users:get" "users:manage" "roles:get" "roles:manage" }}
<li>
- <details name="sidebar-nav" data-cy="users">
+ <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" }}" data-cy="users">{{ .L.T "globals.terms.users" }}</a></li>
+ <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" }}" data-cy="userRoles">{{ .L.T "users.userRoles" }}</a></li>
- <li><a href="{{ URI "/admin/users/roles/lists" }}" data-cy="listRoles">{{ .L.T "users.listRoles" }}</a></li>
+ <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>
@@ -80,15 +81,15 @@
{{ if Can $u "settings:get" "settings:manage" "settings:maintain" }}
<li>
- <details name="sidebar-nav" data-cy="settings">
+ <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" }}" data-cy="all-settings">{{ .L.T "menu.settings" }}</a></li>
- <li><a href="{{ URI "/admin/settings/logs" }}" data-cy="logs">{{ .L.T "menu.logs" }}</a></li>
+ <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" }}" data-cy="maintenance">{{ .L.T "menu.maintenance" }}</a></li>
+ <li><a href="{{ URI "/admin/settings/maintenance" }}" {{ IsNav $p "settings.maintenance" }} data-cy="maintenance">{{ .L.T "menu.maintenance" }}</a></li>
{{ end }}
</ul>
</details>