High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Make primary button placement consistent (outside card, bottom right) across forms.
Kailash Nadhab2ace5c02df
diff --git a/static/admin/partials/campaign-form.html b/static/admin/partials/campaign-form.htmlindex 7224967d..a8c4ba41 100644--- a/static/admin/partials/campaign-form.html+++ b/static/admin/partials/campaign-form.html@@ -4,8 +4,9 @@{{- $canManage := .CanManage -}}{{- $canSend := .CanSend -}}{{- $submit := "onSave" -}}{{ if $isNew }}{{ $submit = "onCreate" }}{{ end }}-<div class="card page-content content">+<div class="{{ if not $isNew }}card {{ end }}page-content content"><form @submit.prevent="{{ $submit }}">+ {{- if $isNew }}<section class="card">{{ end }}<label data-field>{{ $root.L.T "globals.fields.name" }}<input name="name" maxlength="200" x-model="form.name" :disabled="!canEdit" autofocus required />@@ -81,10 +82,11 @@</label></template></fieldset>-{{- if $isNew }}- <hr />- <button type="submit" data-variant="primary" data-cy="btn-continue" :disabled="isLoading('campaigns')" data-spinner="small" :aria-busy="isLoading('campaigns')">{{ $root.L.T "campaigns.continue" }}</button>+ </section>+ <footer class="hstack justify-end mt-6">+ <button type="submit" data-variant="primary" data-cy="btn-continue" :disabled="isLoading('campaigns')" data-spinner="small" :aria-busy="isLoading('campaigns')">{{ $root.L.T "campaigns.continue" }}</button>+ </footer>{{- end }}</form>diff --git a/static/admin/views/list-role.html b/static/admin/views/list-role.htmlindex 9502cfff..7554decf 100644--- a/static/admin/views/list-role.html+++ b/static/admin/views/list-role.html@@ -19,8 +19,8 @@</header><form method="post" @submit.prevent="onSubmit">- <div class="card page-content content">- <section class="dialog-body">+ <div class="page-content content">+ <section class="card"><label data-field>{{ .L.T "globals.fields.name" }}<input name="name" maxlength="200" autofocus required :disabled="disabled" x-model="form.name" />@@ -68,22 +68,20 @@</table></section>- <footer class="dialog-foot">- <div class="row mt-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>- </div>- <div class="col-6 hstack justify-end">- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>- <button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button>- </div>+ <footer class="hstack justify-between mt-6">+ <div class="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>+ </div>+ <div class="hstack gap-3 justify-end">+ <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>+ <button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button></div></footer></div>diff --git a/static/admin/views/template.html b/static/admin/views/template.htmlindex f76a4b94..5db011e0 100644--- a/static/admin/views/template.html+++ b/static/admin/views/template.html@@ -29,8 +29,8 @@</header><form @submit.prevent="onSubmit">- <div class="card page-content content">- <section class="dialog-body">+ <div class="page-content content">+ <section class="card"><div class="row"><div class="col-9"><label data-field>@@ -73,7 +73,7 @@<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">+ <footer class="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)">diff --git a/static/admin/views/user-role.html b/static/admin/views/user-role.htmlindex 248ae05d..47d7ef92 100644--- a/static/admin/views/user-role.html+++ b/static/admin/views/user-role.html@@ -19,8 +19,8 @@</header><form method="post" @submit.prevent="onSubmit">- <div class="card page-content content">- <section class="dialog-body">+ <div class="page-content content">+ <section class="card"><label data-field>{{ .L.T "globals.fields.name" }}<input name="name" maxlength="200" autofocus required :disabled="disabled" x-model="form.name" />@@ -72,22 +72,20 @@</table></section>- <footer class="dialog-foot">- <div class="row mt-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>- </div>- <div class="col-6 hstack justify-end">- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>- <button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button>- </div>+ <footer class="hstack justify-between mt-6">+ <div class="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>+ </div>+ <div class="hstack gap-3 justify-end">+ <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>+ <button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button></div></footer></div>