Skip to content

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

Standardise form and menu elements on the admin UI.

Kailash Nadh241308b1bc72
diff --git a/static/admin/partials/list-form.html b/static/admin/partials/list-form.html
index a2f4a08a..b6fbdcab 100644
--- a/static/admin/partials/list-form.html
+++ b/static/admin/partials/list-form.html
@@ -51,16 +51,31 @@
<small data-hint>{{ $root.L.T "lists.archivedHelp" }}</small>
</label>
</section>
- <footer class="dialog-foot hstack gap-3 justify-end">
{{- if $isDialog }}
+ <footer class="dialog-foot hstack gap-3 justify-end">
<button type="button" class="outline" @click="onClose">{{ $root.L.T "globals.buttons.close" }}</button>
+ {{- if $canSave }}
+ <button type="submit" data-variant="primary" data-cy="btn-save" data-spinner="small" :disabled="isLoading('lists.save')" :aria-busy="isLoading('lists.save')">{{ $root.L.T "globals.buttons.save" }}</button>
+ {{- end }}
+ </footer>
{{- else }}
- <a href="{{ URI "/admin/lists" }}" class="button outline">{{ $root.L.T "globals.buttons.back" }}</a>
+ <footer class="dialog-foot hstack justify-between mt-6">
+ <div class="hstack gap-1">
+ <button type="button" class="small" data-variant="secondary" title="{{ $root.L.T "globals.messages.clickToCopy" }}" aria-label="{{ $root.L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
+ <strong>{{ $root.L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
+ </button>
+ <button type="button" class="small" data-variant="secondary" title="{{ $root.L.T "globals.messages.clickToCopy" }}" aria-label="{{ $root.L.T "globals.fields.uuid" }}" @click="copyToClipboard(form.uuid)">
+ <strong>{{ $root.L.T "globals.fields.uuid" }}</strong> <span x-text="form.uuid"></span>
+ </button>
+ </div>
+ <div class="hstack gap-3 justify-end">
+ <a href="{{ URI "/admin/lists" }}" class="button outline">{{ $root.L.T "globals.buttons.back" }}</a>
+ {{- if $canSave }}
+ <button type="submit" data-variant="primary" data-cy="btn-save" data-spinner="small" :disabled="isLoading('lists.save')" :aria-busy="isLoading('lists.save')">{{ $root.L.T "globals.buttons.save" }}</button>
+ {{- end }}
+ </div>
+ </footer>
{{- end }}
- {{- if $canSave }}
- <button type="submit" data-variant="primary" data-cy="btn-save" data-spinner="small" :disabled="isLoading('lists.save')" :aria-busy="isLoading('lists.save')">{{ $root.L.T "globals.buttons.save" }}</button>
- {{- end }}
- </footer>
</div>
</form>
{{- end }}
diff --git a/static/admin/src/css/style.css b/static/admin/src/css/style.css
index dfe4890d..c37434d5 100644
--- a/static/admin/src/css/style.css
+++ b/static/admin/src/css/style.css
@@ -959,11 +959,17 @@ section.users {
}
}
- td.link-click-url {
- max-width: 220px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ td {
+ &.email {
+ width: 30%;
+ }
+
+ &.link-click-url {
+ max-width: 220px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
}
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index 1762adaf..4108e3d3 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -126,8 +126,9 @@
{{ Icon "more-vertical" }}
</button>
<menu popover id="camp-actions-{{ .ID }}">
- <a href="{{ $base }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>
<button type="button" role="menuitem" class="ghost" data-cy="btn-preview" @click.prevent="onPreview({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "eye" }} {{ $.L.T "campaigns.preview" }}</button>
+ <hr />
+ <a href="{{ $base }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>
{{- if $d.Can "campaigns:send" }}
{{- if $canStart }}
<button type="button" role="menuitem" class="ghost" data-cy="btn-start" @click.prevent="onChangeStatus({{ .ID }}, {{ ToJSON .Name }}, 'running')">{{ Icon "send" }} {{ $.L.T "campaigns.start" }}</button>
@@ -145,11 +146,13 @@
<button type="button" role="menuitem" class="ghost" data-variant="danger" data-cy="btn-cancel" @click.prevent="onChangeStatus({{ .ID }}, {{ ToJSON .Name }}, 'cancelled')">{{ Icon "x-circle" }} {{ $.L.T "globals.buttons.cancel" }}</button>
{{- end }}
{{- end }}
+ {{- if $d.Can "campaigns:manage" "campaigns:manage_all" }}
+ <button type="button" role="menuitem" class="ghost" data-cy="btn-clone" @click.prevent="onClone({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "copy" }} {{ $.L.T "globals.buttons.clone" }}</button>
+ {{- end }}
{{- if $d.Can "campaigns:get_analytics" }}
<a href="{{ URI "/admin/campaigns/analytics" }}?id={{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-analytics">{{ Icon "bar-chart-2" }} {{ $.L.T "globals.terms.analytics" }}</a>
{{- end }}
{{- if $d.Can "campaigns:manage" "campaigns:manage_all" }}
- <button type="button" role="menuitem" class="ghost" data-cy="btn-clone" @click.prevent="onClone({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "copy" }} {{ $.L.T "globals.buttons.clone" }}</button>
<hr />
<button type="button" role="menuitem" class="ghost" data-variant="danger" data-cy="btn-delete" :disabled="isLoading('campaigns')" @click.prevent="onDelete({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "trash-2" }} {{ $.L.T "globals.buttons.delete" }}</button>
{{- end }}
diff --git a/static/admin/views/list-role.html b/static/admin/views/list-role.html
index 7ab6b95f..fca3e14c 100644
--- a/static/admin/views/list-role.html
+++ b/static/admin/views/list-role.html
@@ -18,13 +18,6 @@
</h1>
</div>
</div>
- {{- if $d.IsEditing }}
- <div class="col-6 align-right">
- <button class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
- <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
- </button>
- </div>
- {{- end }}
</header>
<form method="post" @submit.prevent="onSubmit">
@@ -79,7 +72,12 @@
<footer class="dialog-foot">
<div class="row mt-6">
- <div class="col-6">
+ <div class="col-6 hstack gap-3">
+ {{- if $d.IsEditing }}
+ <button type="button" class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
+ <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
+ </button>
+ {{- end }}
<a href="https://listmonk.app/docs/roles-and-permissions" target="_blank" rel="noopener noreferrer" class="text-light text-8">
{{ Icon "link-2" }} {{ .L.T "globals.buttons.learnMore" }}
</a>
diff --git a/static/admin/views/list.html b/static/admin/views/list.html
index 536c0980..ba953d4f 100644
--- a/static/admin/views/list.html
+++ b/static/admin/views/list.html
@@ -11,14 +11,6 @@
<h1 class="page-title">{{ $d.List.Name }}</h1>
</div>
</div>
- <div class="col-6 align-right">
- <button class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
- <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
- </button>
- <button class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.uuid" }}" @click="copyToClipboard(form.uuid)">
- <strong>{{ .L.T "globals.fields.uuid" }}</strong> <span x-text="form.uuid"></span>
- </button>
- </div>
</header>
{{ template "list-form" dict "Root" . "Submit" "onSubmitUpdate" "Method" "post" "CanSave" ($d.CanManageList $d.List.ID) }}
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index 893e5fda..90672a84 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -100,7 +100,7 @@
{{- $sub := . }}
<tr {{ if eq .Status "blocklisted" }}class="blocklisted"{{ end }}>
<td><input name="id" type="checkbox" value="{{ .ID }}"></td>
- <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 }}
<div class="badge-list hstack gap-1">
@@ -126,6 +126,7 @@
<a href="{{ URI "/api/subscribers" }}/{{ .ID }}/export" role="menuitem" class="button ghost" data-cy="btn-download">{{ Icon "download-cloud" }} {{ $.L.T "subscribers.downloadData" }}</a>
{{- if $d.Can "subscribers:manage" }}
<a href="{{ URI "/admin/subscribers" }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>
+ <hr />
<button type="button" role="menuitem" class="ghost" data-variant="danger" data-cy="btn-delete" :disabled="isLoading('subscribers')" @click.prevent="onDeleteSubscriber({{ .ID }}, {{ ToJSON .Email }})">{{ Icon "trash-2" }} {{ $.L.T "globals.buttons.delete" }}</button>
{{- end }}
</menu>
diff --git a/static/admin/views/template.html b/static/admin/views/template.html
index aa99207c..131a9de2 100644
--- a/static/admin/views/template.html
+++ b/static/admin/views/template.html
@@ -25,9 +25,6 @@
</div>
<div class="col-6 col-end hstack justify-end">
<button type="button" class="outline" data-cy="btn-preview" @click="onPreviewBody" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "templates.preview" }}</button>
- {{- if $canManage }}
- <button type="button" data-variant="primary" data-cy="btn-save" @click="onSubmit" :disabled="isLoading('templates')" :aria-busy="isLoading('templates')">{{ Icon "save" }} {{ .L.T "globals.buttons.save" }}</button>
- {{- end }}
</div>
</header>
@@ -76,6 +73,20 @@
<a href="https://listmonk.app/docs/templating" target="_blank" rel="noopener noreferrer">{{ Icon "link-2" }} {{ .L.T "globals.buttons.learnMore" }}</a>
</p>
</section>
+ <footer class="dialog-foot hstack justify-between mt-6">
+ <div class="hstack gap-1">
+ {{- if not $isNew }}
+ <button type="button" class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
+ <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
+ </button>
+ {{- end }}
+ </div>
+ <div class="hstack gap-3 justify-end">
+ {{- if $canManage }}
+ <button type="submit" data-variant="primary" data-cy="btn-save" :disabled="isLoading('templates')" :aria-busy="isLoading('templates')">{{ Icon "save" }} {{ .L.T "globals.buttons.save" }}</button>
+ {{- end }}
+ </div>
+ </footer>
</div>
</form>
diff --git a/static/admin/views/templates.html b/static/admin/views/templates.html
index c8c2d11e..e4519882 100644
--- a/static/admin/views/templates.html
+++ b/static/admin/views/templates.html
@@ -64,6 +64,7 @@
</button>
<menu popover id="tpl-actions-{{ .ID }}">
<button type="button" role="menuitem" class="ghost" data-cy="btn-preview" @click.prevent="onPreview({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "eye" }} {{ $.L.T "templates.preview" }}</button>
+ <hr />
<a href="{{ $base }}/{{ .ID }}" role="menuitem" class="button ghost" data-cy="btn-edit">{{ Icon "edit-2" }} {{ $.L.T "globals.buttons.edit" }}</a>
{{- if $canManage }}
<button type="button" role="menuitem" class="ghost" data-cy="btn-clone" @click.prevent="onClone({{ .ID }}, {{ ToJSON .Name }})">{{ Icon "copy" }} {{ $.L.T "globals.buttons.clone" }}</button>
diff --git a/static/admin/views/user-role.html b/static/admin/views/user-role.html
index df817656..08553b60 100644
--- a/static/admin/views/user-role.html
+++ b/static/admin/views/user-role.html
@@ -18,13 +18,6 @@
</h1>
</div>
</div>
- {{- if $d.IsEditing }}
- <div class="col-6 align-right">
- <button class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
- <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
- </button>
- </div>
- {{- end }}
</header>
<form method="post" @submit.prevent="onSubmit">
@@ -83,7 +76,12 @@
<footer class="dialog-foot">
<div class="row mt-6">
- <div class="col-6">
+ <div class="col-6 hstack gap-3">
+ {{- if $d.IsEditing }}
+ <button type="button" class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
+ <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
+ </button>
+ {{- end }}
<a href="https://listmonk.app/docs/roles-and-permissions" target="_blank" rel="noopener noreferrer" class="text-light text-8">
{{ Icon "link-2" }} {{ .L.T "globals.buttons.learnMore" }}
</a>
diff --git a/static/admin/views/user.html b/static/admin/views/user.html
index ca3cf952..77bf5c01 100644
--- a/static/admin/views/user.html
+++ b/static/admin/views/user.html
@@ -19,13 +19,6 @@
{{- if and $d.IsEditing (eq $d.User.Status "disabled") }}<span class="badge enum" data-variant="danger">{{ $.L.T "users.status.disabled" }}</span>{{ end }}
</div>
</div>
- {{- if $d.IsEditing }}
- <div class="col-6 align-right">
- <button class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
- <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
- </button>
- </div>
- {{- end }}
</header>
<form method="post" @submit.prevent="onSubmit">
@@ -103,11 +96,20 @@
</fieldset>
</section>
- <footer class="dialog-foot hstack gap-3 justify-end">
- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>
- {{- if $canSave }}
- <button type="submit" data-variant="primary" data-cy="btn-save" :disabled="isLoading('users.save')" :aria-busy="isLoading('users.save')">{{ .L.T "globals.buttons.save" }}</button>
- {{- end }}
+ <footer class="dialog-foot hstack justify-between mt-6">
+ <div class="hstack gap-1">
+ {{- if $d.IsEditing }}
+ <button type="button" class="small" data-variant="secondary" title="{{ .L.T "globals.messages.clickToCopy" }}" aria-label="{{ .L.T "globals.fields.id" }}" @click="copyToClipboard(form.id)">
+ <strong>{{ .L.T "globals.fields.id" }}</strong> <span x-text="form.id"></span>
+ </button>
+ {{- end }}
+ </div>
+ <div class="hstack gap-3 justify-end">
+ <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>
+ {{- if $canSave }}
+ <button type="submit" data-variant="primary" data-cy="btn-save" :disabled="isLoading('users.save')" :aria-busy="isLoading('users.save')">{{ .L.T "globals.buttons.save" }}</button>
+ {{- end }}
+ </div>
</footer>
</div>
</form>