Skip to content

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

Make subscriber, campaign + all forms into separate cards like user form.

Kailash Nadhc07e0967e0d8
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index f690181a..84b712b4 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -174,6 +174,10 @@ ot-tabs:not(:defined) {
}
}
+[role="tablist"][data-variant="primary"] {
+ margin-bottom: var(--space-4);
+}
+
fieldset {
&.card {
padding-block-start: var(--space-4);
@@ -580,6 +584,7 @@ main {
> .container {
padding-inline: 0;
+ margin-bottom: var(--space-6);
}
}
@@ -1058,13 +1063,23 @@ section.campaigns {
}
td.lists ul {
- list-style-type: circle;
+ list-style-type: none;
margin: 0;
- padding-inline-start: var(--space-4);
+ padding-inline-start: 0;
li {
+ align-items: center;
+ gap: var(--space-2);
max-width: 16ch;
+
+ .avatar span {
+ width: 20px;
+ height: 20px;
+ font-size: 10px;
+ }
+
a {
+ min-width: 0;
display: block;
overflow: hidden;
text-overflow: ellipsis;
@@ -1086,10 +1101,6 @@ section.campaigns {
/* Campaign editor */
section.campaign {
- .page-content.card.editor {
- padding: 0;
- }
-
ot-tabs {
display: flex;
flex-wrap: wrap;
@@ -1156,13 +1167,6 @@ section.campaign {
.plain-editor {
min-height: 65vh;
}
-
- .alt-body textarea {
- margin-block-start: var(--space-3);
- min-height: 150px;
- width: 100%;
- height: 30vh;
- }
}
/* Templates */
@@ -1406,12 +1410,10 @@ section.users {
/* Logs */
.log-view {
.lines {
- border: 1px solid var(--border);
font-family: var(--font-mono);
font-size: var(--text-7);
height: 70vh;
overflow-y: auto;
- padding: var(--space-4);
}
.line {
diff --git a/static/admin/partials/campaign-archive.html b/static/admin/partials/campaign-archive.html
index 4b5ed5d5..220cb547 100644
--- a/static/admin/partials/campaign-archive.html
+++ b/static/admin/partials/campaign-archive.html
@@ -2,7 +2,7 @@
{{- $root := .Root -}}
{{- $canManage := .CanManage -}}
{{- $canSend := .CanSend -}}
-<div class="card page-content content">
+<div class="page-content content">
<div class="row">
<div class="col-6">
<label data-field>
@@ -19,35 +19,39 @@
{{ end }}
</div>
- <fieldset :disabled="!canArchive || !form.archive">
- <legend>{{ $root.L.T "campaigns.archive" }}</legend>
+ <template x-if="form.archive">
+ <div>
+ <fieldset class="card" :disabled="!canArchive">
+ <legend>{{ $root.L.T "campaigns.archive" }}</legend>
- <fieldset class="group">
- <legend class="mb-0">{{ $root.L.Tc "globals.terms.template" 1 }}</legend>
- <select x-model.number="form.archive_template_id" name="archive_template" :disabled="form.content_type === 'visual'" required>
- <template x-for="t in templatesFor('campaign')" :key="t.id">
- <option :value="t.id" x-text="t.name"></option>
- </template>
- </select>
- <button type="button" data-variant="primary" data-cy="btn-preview" @click="onPreviewArchive">{{ $root.L.T "campaigns.preview" }}</button>
- </fieldset>
+ <fieldset class="group">
+ <legend class="mb-0">{{ $root.L.Tc "globals.terms.template" 1 }}</legend>
+ <select x-model.number="form.archive_template_id" name="archive_template" :disabled="form.content_type === 'visual'" required>
+ <template x-for="t in templatesFor('campaign')" :key="t.id">
+ <option :value="t.id" x-text="t.name"></option>
+ </template>
+ </select>
+ <button type="button" data-variant="primary" data-cy="btn-preview" @click="onPreviewArchive">{{ $root.L.T "campaigns.preview" }}</button>
+ </fieldset>
- <label data-field>
- {{ $root.L.T "campaigns.archiveSlug" }}
- <input name="archive_slug" maxlength="200" x-model="form.archive_slug" data-cy="archive-slug" />
- <small data-hint>{{ $root.L.T "campaigns.archiveSlugHelp" }}</small>
- </label>
+ <label data-field>
+ {{ $root.L.T "campaigns.archiveSlug" }}
+ <input name="archive_slug" maxlength="200" x-model="form.archive_slug" data-cy="archive-slug" />
+ <small data-hint>{{ $root.L.T "campaigns.archiveSlugHelp" }}</small>
+ </label>
- <a class="text-8" :class="{ 'text-lighter': !form.archive }" href="{{ $root.Data.ArchiveURL }}" target="_blank" rel="noopener noreferrer">{{ Icon "link-2" }} {{ $root.Data.ArchiveURL }}</a>
- </fieldset>
+ <a class="text-8" href="{{ $root.Data.ArchiveURL }}" target="_blank" rel="noopener noreferrer">{{ Icon "link-2" }} {{ $root.Data.ArchiveURL }}</a>
+ </fieldset>
- <fieldset :disabled="!canArchive || !form.archive" data-field>
- <legend>{{ $root.L.T "campaigns.archiveMeta" }}</legend>
- <textarea name="archive_meta" x-model="form.archiveMetaStr" data-cy="archive-meta" rows="15"></textarea>
- <small data-hint>{{ $root.L.T "campaigns.archiveMetaHelp" }}</small>
- <template x-if="form.archive && (form.archiveMetaStr === '' || form.archiveMetaStr === '{}')">
- <div class="mt-4"><button type="button" class="outline small" @click="onFillArchiveMeta">{{ $root.L.T "templates.makeDefault" }}</button></div>
- </template>
- </fieldset>
+ <fieldset class="card" :disabled="!canArchive" data-field>
+ <legend>{{ $root.L.T "campaigns.archiveMeta" }}</legend>
+ <textarea name="archive_meta" x-model="form.archiveMetaStr" data-cy="archive-meta" rows="15"></textarea>
+ <small data-hint>{{ $root.L.T "campaigns.archiveMetaHelp" }}</small>
+ <template x-if="form.archiveMetaStr === '' || form.archiveMetaStr === '{}'">
+ <div class="mt-4"><button type="button" class="outline small" @click="onFillArchiveMeta">{{ $root.L.T "templates.makeDefault" }}</button></div>
+ </template>
+ </fieldset>
+ </div>
+ </template>
</div>
{{- end }}
diff --git a/static/admin/partials/campaign-attribs.html b/static/admin/partials/campaign-attribs.html
index ab06b290..cb8912e5 100644
--- a/static/admin/partials/campaign-attribs.html
+++ b/static/admin/partials/campaign-attribs.html
@@ -2,11 +2,13 @@
{{- $root := .Root -}}
{{- $canManage := .CanManage -}}
{{- $canSend := .CanSend -}}
-<div class="card page-content content">
- <label data-field>
- {{ $root.L.T "globals.terms.attribs" }}
- <textarea x-model="form.attribsStr" :disabled="!canEdit" rows="15"></textarea>
- <small data-hint>{{ $root.L.T "campaigns.attribsHelp" }}</small>
- </label>
+<div class="page-content content">
+ <fieldset class="card">
+ <legend id="campaign-attribs-label">{{ $root.L.T "globals.terms.attribs" }}</legend>
+ <div data-field>
+ <textarea x-model="form.attribsStr" :disabled="!canEdit" rows="15" aria-labelledby="campaign-attribs-label"></textarea>
+ <small data-hint>{{ $root.L.T "campaigns.attribsHelp" }}</small>
+ </div>
+ </fieldset>
</div>
{{- end }}
diff --git a/static/admin/partials/campaign-content.html b/static/admin/partials/campaign-content.html
index 8f0d4c95..504010fc 100644
--- a/static/admin/partials/campaign-content.html
+++ b/static/admin/partials/campaign-content.html
@@ -3,34 +3,36 @@
{{- $c := $root.Data.Campaign -}}
{{- $canManage := .CanManage -}}
{{- $canSend := .CanSend -}}
-<div class="card page-content content editor">
- <div class="editor-body" :class="{ 'is-loading': showEditorSpinner }" @editor-ready="editorReady = true" @campaign-save.window="onSave" @campaign-preview.window="onPreviewContent" @richtext-media="onEditorMedia($event)" @visual-media="onEditorMedia($event)" @editor-change="form.body = $event.detail.body; form.body_source = $event.detail.source">
- <template x-if="contentReady && form.content_type === 'richtext'">
- {{ template "richtext-editor" dict "Root" $root "Body" $c.Body "Disabled" (not (or (eq $c.Status "draft") (eq $c.Status "scheduled") (eq $c.Status "paused"))) }}
- </template>
- <template x-if="contentReady && form.content_type === 'html'">
- <code-editor lang="html" @input="form.body = $event.target.value"><textarea>{{ $c.Body }}</textarea></code-editor>
- </template>
- <template x-if="contentReady && form.content_type === 'markdown'">
- <code-editor lang="markdown" @input="form.body = $event.target.value"><textarea>{{ $c.Body }}</textarea></code-editor>
- </template>
- <template x-if="contentReady && form.content_type === 'plain'">
- <textarea class="plain-editor m-0" name="content" x-model="form.body" :disabled="!canEdit"></textarea>
- </template>
- <template x-if="contentReady && form.content_type === 'visual'">
- <visual-editor base="{{ URI "/admin/static/email-builder" }}" @editor-change="form.body = $event.detail.body; form.body_source = $event.detail.source"><textarea>{{ $c.BodySource.String }}</textarea></visual-editor>
- </template>
- </div>
+<div class="page-content content editor">
+ <fieldset class="card">
+ <legend>{{ $root.L.T "campaigns.content" }}</legend>
+ <div class="editor-body" :class="{ 'is-loading': showEditorSpinner }" @editor-ready="editorReady = true" @campaign-save.window="onSave" @campaign-preview.window="onPreviewContent" @richtext-media="onEditorMedia($event)" @visual-media="onEditorMedia($event)" @editor-change="form.body = $event.detail.body; form.body_source = $event.detail.source">
+ <template x-if="contentReady && form.content_type === 'richtext'">
+ {{ template "richtext-editor" dict "Root" $root "Body" $c.Body "Disabled" (not (or (eq $c.Status "draft") (eq $c.Status "scheduled") (eq $c.Status "paused"))) }}
+ </template>
+ <template x-if="contentReady && form.content_type === 'html'">
+ <code-editor lang="html" @input="form.body = $event.target.value"><textarea>{{ $c.Body }}</textarea></code-editor>
+ </template>
+ <template x-if="contentReady && form.content_type === 'markdown'">
+ <code-editor lang="markdown" @input="form.body = $event.target.value"><textarea>{{ $c.Body }}</textarea></code-editor>
+ </template>
+ <template x-if="contentReady && form.content_type === 'plain'">
+ <textarea class="plain-editor m-0" name="content" x-model="form.body" :disabled="!canEdit"></textarea>
+ </template>
+ <template x-if="contentReady && form.content_type === 'visual'">
+ <visual-editor base="{{ URI "/admin/static/email-builder" }}" @editor-change="form.body = $event.detail.body; form.body_source = $event.detail.source"><textarea>{{ $c.BodySource.String }}</textarea></visual-editor>
+ </template>
+ </div>
+ </fieldset>
<template x-if="canEdit && form.content_type !== 'plain'">
- <fieldset class="mb-0">
- <label>
- <input type="checkbox" role="switch" :checked="form.altbody !== null" @change="$event.target.checked ? onAddAltBody() : onRemoveAltBody()" :disabled="!canEdit" /> {{ $root.L.T "campaigns.addAltText" }}
- </label>
+ <fieldset class="card">
+ <legend>{{ $root.L.T "campaigns.addAltText" }}</legend>
+ <input type="checkbox" role="switch" :checked="form.altbody !== null" @change="$event.target.checked ? onAddAltBody() : onRemoveAltBody()" :disabled="!canEdit" />
<template x-if="form.altbody !== null">
- <div class="alt-body">
- <textarea x-model="form.altbody" :disabled="!canEdit"></textarea>
+ <div data-field>
+ <textarea rows="10" aria-label="{{ $root.L.T "campaigns.addAltText" }}" x-model="form.altbody" :disabled="!canEdit"></textarea>
</div>
</template>
</fieldset>
diff --git a/static/admin/partials/campaign-form.html b/static/admin/partials/campaign-form.html
index a8c4ba41..c5fe0a73 100644
--- a/static/admin/partials/campaign-form.html
+++ b/static/admin/partials/campaign-form.html
@@ -4,86 +4,97 @@
{{- $canManage := .CanManage -}}
{{- $canSend := .CanSend -}}
{{- $submit := "onSave" -}}{{ if $isNew }}{{ $submit = "onCreate" }}{{ end }}
-<div class="{{ if not $isNew }}card {{ end }}page-content content">
+<div class="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 />
- </label>
-
- <label data-field>
- {{ $root.L.T "campaigns.subject" }}
- <input name="subject" maxlength="5000" x-model="form.subject" :disabled="!canEdit" required />
- </label>
+ <section>
+ <fieldset class="card">
+ <legend>{{ $root.L.Tc "globals.terms.campaign" 1 }}</legend>
+ <label data-field>
+ {{ $root.L.T "globals.fields.name" }}
+ <input name="name" maxlength="200" x-model="form.name" :disabled="!canEdit" autofocus required />
+ </label>
- <label data-field>
- {{ $root.L.T "campaigns.fromAddress" }}
- <input name="from_email" maxlength="200" x-model="form.from_email" :disabled="!canEdit" placeholder="{{ $root.L.T "campaigns.fromAddressPlaceholder" }}" required />
- </label>
+ <label data-field>
+ {{ $root.L.T "campaigns.subject" }}
+ <input name="subject" maxlength="5000" x-model="form.subject" :disabled="!canEdit" required />
+ </label>
- {{ template "list-selector" dict "Root" $root "Model" "form.lists" "ListID" "campaign-lists" "Label" "globals.terms.lists" "Placeholder" "campaigns.sendToLists" "Disabled" "!canEdit" }}
+ <label data-field>
+ {{ $root.L.T "globals.terms.tags" }}
+ <ot-taginput x-model="form.tags" :disabled="!canEdit"><input placeholder="{{ $root.L.T "globals.terms.tags" }}" maxlength="200" /></ot-taginput>
+ </label>
+ </fieldset>
- <label data-field for="messenger">
- {{ $root.L.Tc "globals.terms.messenger" 1 }}
- <select id="messenger" name="messenger" x-model="form.messenger" :disabled="!canEdit" required>
- {{- range $root.ConfigJS.Messengers }}<option value="{{ . }}">{{ . }}</option>{{ end }}
- </select>
- </label>
+ <fieldset class="card">
+ <legend>{{ $root.L.T "globals.terms.lists" }}</legend>
+ {{ template "list-selector" dict "Root" $root "Model" "form.lists" "ListID" "campaign-lists" "Placeholder" "campaigns.sendToLists" "Disabled" "!canEdit" }}
+ </fieldset>
- <label data-field for="content_type">
- {{ $root.L.T "campaigns.format" }}
- <select id="content_type" name="content_type" x-model="form.content_type" {{ if not $isNew }}disabled{{ else }}:disabled="!canEdit"{{ end }}>
- <option value="richtext">{{ $root.L.T "campaigns.contentType.richtext" }}</option>
- <option value="html">{{ $root.L.T "campaigns.contentType.html" }}</option>
- <option value="markdown">{{ $root.L.T "campaigns.contentType.markdown" }}</option>
- <option value="plain">{{ $root.L.T "campaigns.contentType.plain" }}</option>
- <option value="visual">{{ $root.L.T "campaigns.contentType.visual" }}</option>
- </select>
- </label>
+ <fieldset class="card">
+ <legend>{{ $root.L.Tc "globals.terms.messenger" 1 }}</legend>
+ <label data-field>
+ {{ $root.L.T "campaigns.fromAddress" }}
+ <input name="from_email" maxlength="200" x-model="form.from_email" :disabled="!canEdit" placeholder="{{ $root.L.T "campaigns.fromAddressPlaceholder" }}" required />
+ </label>
- <label data-field>
- {{ $root.L.T "globals.terms.tags" }}
- <ot-taginput x-model="form.tags" :disabled="!canEdit"><input placeholder="{{ $root.L.T "globals.terms.tags" }}" maxlength="200" /></ot-taginput>
- </label>
+ <label data-field for="messenger">
+ {{ $root.L.Tc "globals.terms.messenger" 1 }}
+ <select id="messenger" name="messenger" x-model="form.messenger" :disabled="!canEdit" required>
+ {{- range $root.ConfigJS.Messengers }}<option value="{{ . }}">{{ . }}</option>{{ end }}
+ </select>
+ </label>
- <fieldset>
- <div class="row">
- <div class="col-6">
- <label data-field>
- <input type="checkbox" role="switch" x-model="form.sendLater" @change="onToggleSendLater" :disabled="!canEdit" data-cy="btn-send-later" /> {{ $root.L.T "campaigns.sendLater" }}
- </label>
+ <label data-field for="content_type">
+ {{ $root.L.T "campaigns.format" }}
+ <select id="content_type" name="content_type" x-model="form.content_type" {{ if not $isNew }}disabled{{ else }}:disabled="!canEdit"{{ end }}>
+ <option value="richtext">{{ $root.L.T "campaigns.contentType.richtext" }}</option>
+ <option value="html">{{ $root.L.T "campaigns.contentType.html" }}</option>
+ <option value="markdown">{{ $root.L.T "campaigns.contentType.markdown" }}</option>
+ <option value="plain">{{ $root.L.T "campaigns.contentType.plain" }}</option>
+ <option value="visual">{{ $root.L.T "campaigns.contentType.visual" }}</option>
+ </select>
+ </label>
+ </fieldset>
- <template x-if="form.sendLater">
+ <fieldset class="card">
+ <legend>{{ $root.L.T "campaigns.schedule" }}</legend>
+ <div class="row">
+ <div class="col-6">
<label data-field>
- {{ $root.L.T "campaigns.dateAndTime" }}
- <input type="datetime-local" name="send_at" x-model="form.sendAtLocal" :disabled="!canEdit" />
+ <input type="checkbox" role="switch" x-model="form.sendLater" @change="onToggleSendLater" :disabled="!canEdit" data-cy="btn-send-later" /> {{ $root.L.T "campaigns.sendLater" }}
</label>
- </template>
- </div>
- {{- if and (not $isNew) $canSend }}
- <div class="col-6 col-end hstack justify-end">
- <button type="button" class="outline" data-variant="primary" data-cy="btn-schedule" x-cloak x-show="canSchedule" @click="onStart">{{ Icon "clock" }} {{ $root.L.T "campaigns.schedule" }}</button>
- <button type="button" class="outline" data-variant="danger" data-cy="btn-unschedule" x-cloak x-show="canUnSchedule" @click="onUnschedule">{{ Icon "clock" }} {{ $root.L.T "campaigns.unSchedule" }}</button>
- </div>
- {{- end }}
- </div>
- </fieldset>
- <fieldset>
- <label data-field>
- <input type="checkbox" role="switch" x-model="isHeadersVisible" :disabled="!canEdit" data-cy="btn-headers" /> {{ $root.L.T "settings.smtp.customHeaders" }}
- </label>
+ <template x-if="form.sendLater">
+ <label data-field>
+ {{ $root.L.T "campaigns.dateAndTime" }}
+ <input type="datetime-local" name="send_at" x-model="form.sendAtLocal" :disabled="!canEdit" />
+ </label>
+ </template>
+ </div>
+ {{- if and (not $isNew) $canSend }}
+ <div class="col-6 col-end hstack justify-end">
+ <button type="button" class="outline" data-variant="primary" data-cy="btn-schedule" x-cloak x-show="canSchedule" @click="onStart">{{ Icon "clock" }} {{ $root.L.T "campaigns.schedule" }}</button>
+ <button type="button" class="outline" data-variant="danger" data-cy="btn-unschedule" x-cloak x-show="canUnSchedule" @click="onUnschedule">{{ Icon "clock" }} {{ $root.L.T "campaigns.unSchedule" }}</button>
+ </div>
+ {{- end }}
+ </div>
+ </fieldset>
- <template x-if="isHeadersVisible">
+ <fieldset class="card">
+ <legend>{{ $root.L.T "settings.smtp.customHeaders" }}</legend>
<label data-field>
- <textarea name="headers" x-model="form.headersStr" :disabled="!canEdit" placeholder='[{"X-Custom": "value"}]'></textarea>
- <small data-hint>{{ $root.L.T "campaigns.customHeadersHelp" }}</small>
+ <input type="checkbox" role="switch" x-model="isHeadersVisible" :disabled="!canEdit" data-cy="btn-headers" /> {{ $root.L.T "settings.smtp.customHeaders" }}
</label>
- </template>
- </fieldset>
- {{- if $isNew }}
+
+ <template x-if="isHeadersVisible">
+ <label data-field>
+ <textarea name="headers" x-model="form.headersStr" :disabled="!canEdit" placeholder='[{"X-Custom": "value"}]'></textarea>
+ <small data-hint>{{ $root.L.T "campaigns.customHeadersHelp" }}</small>
+ </label>
+ </template>
+ </fieldset>
</section>
+ {{- if $isNew }}
<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>
@@ -91,7 +102,7 @@
</form>
{{- if not $isNew }}
- <footer class="dialog-foot hstack justify-between mt-6">
+ <footer class="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>
diff --git a/static/admin/partials/list-selector.html b/static/admin/partials/list-selector.html
index cfacebf0..66dacd70 100644
--- a/static/admin/partials/list-selector.html
+++ b/static/admin/partials/list-selector.html
@@ -4,7 +4,7 @@
{{- $listID := .ListID -}}
{{- $disabled := .Disabled -}}
<label data-field>
- {{ $root.L.T .Label }}
+ {{ if .Label }}{{ $root.L.T .Label }}{{ end }}
<ot-taginput x-model="{{ $model }}" {{ if $disabled }}:disabled="{{ $disabled }}"{{ end -}}>
<input list="{{ $listID }}" placeholder="{{ $root.L.T .Placeholder }}" @input="listAutocomplete($el)" @pointerdown="listAutocomplete($el)" @focus="listAutocomplete($el)" />
<datalist id="{{ $listID }}"></datalist>
diff --git a/static/admin/partials/subscriber-form.html b/static/admin/partials/subscriber-form.html
index 5668a112..9506215d 100644
--- a/static/admin/partials/subscriber-form.html
+++ b/static/admin/partials/subscriber-form.html
@@ -4,16 +4,27 @@
{{- $canSave := .CanSave -}}
<form method="post" @submit.prevent="{{ $submit }}">
<div class="page-content content">
- <section class="card">
- {{ template "subscriber-fields" $root }}
+ <section>
+ <fieldset class="card">
+ <legend>{{ $root.L.T "users.profile" }}</legend>
+ {{ template "subscriber-fields" $root }}
+ </fieldset>
+
{{- if .IsNew }}
- {{ template "list-selector" dict "Root" $root "Model" "form.lists" "ListID" "form-lists" "Label" "subscribers.lists" "Placeholder" "subscribers.listsPlaceholder" }}
- <label data-field :aria-disabled="!hasOptinList">
- <input type="checkbox" x-model="form.preconfirm" data-testid="preconfirm" :disabled="!hasOptinList" /> {{ $root.L.T "subscribers.preconfirm" }}
- <small data-hint>{{ $root.L.T "subscribers.preconfirmHelp" }}</small>
- </label>
+ <fieldset class="card">
+ <legend>{{ $root.L.T "subscribers.lists" }}</legend>
+ {{ template "list-selector" dict "Root" $root "Model" "form.lists" "ListID" "form-lists" "Placeholder" "subscribers.listsPlaceholder" }}
+ <label data-field :aria-disabled="!hasOptinList">
+ <input type="checkbox" x-model="form.preconfirm" data-testid="preconfirm" :disabled="!hasOptinList" /> {{ $root.L.T "subscribers.preconfirm" }}
+ <small data-hint>{{ $root.L.T "subscribers.preconfirmHelp" }}</small>
+ </label>
+ </fieldset>
{{- end }}
- {{ template "subscriber-attribs" $root }}
+
+ <fieldset class="card">
+ <legend id="subscriber-attribs-label">{{ $root.L.T "globals.terms.attribs" }}</legend>
+ {{ template "subscriber-attribs" $root }}
+ </fieldset>
</section>
<footer class="hstack justify-between mt-6">
@@ -62,9 +73,8 @@
{{ define "subscriber-attribs" -}}
{{- $root := . -}}
-<label data-field class="mt-6">
- {{ $root.L.T "globals.terms.attribs" }}
- <textarea name="attribs" rows="4" x-model="form.strAttribs" class="monospace"></textarea>
+<div data-field>
+ <textarea name="attribs" aria-labelledby="subscriber-attribs-label" rows="4" x-model="form.strAttribs" class="monospace"></textarea>
<small data-hint>{{ $root.L.T "subscribers.attribsHelp" }} <code>{"job": "developer", "location": "Mars", "has_rocket": true}</code></small>
-</label>
+</div>
{{- end }}
diff --git a/static/admin/views/analytics.html b/static/admin/views/analytics.html
index e91f1d73..9736d5dd 100644
--- a/static/admin/views/analytics.html
+++ b/static/admin/views/analytics.html
@@ -13,39 +13,42 @@
</header>
<div class="vstack gap-6">
- <form method="get" action="{{ URI "/admin/campaigns/analytics" }}" class="card" x-data="analyticsForm()" @submit="submitting = true">
- <div class="row">
- <div class="col-5">
- <label data-field>
- {{ .L.T "globals.terms.campaigns" }}
- <ot-taginput x-model="campaigns">
- <input list="analytics-campaigns" placeholder="{{ .L.T "globals.terms.campaigns" }}" @input="onQuery($el)" @pointerdown="onQuery($el)" @focus="onQuery($el)" />
- <datalist id="analytics-campaigns"></datalist>
- </ot-taginput>
- </label>
- <template x-for="c in campaigns" :key="c.id">
- <input type="hidden" name="id" :value="c.id" />
- </template>
- </div>
+ <form method="get" action="{{ URI "/admin/campaigns/analytics" }}" x-data="analyticsForm()" @submit="submitting = true">
+ <fieldset class="card">
+ <legend>{{ .L.T "analytics.title" }}</legend>
+ <div class="row">
+ <div class="col-5">
+ <label data-field>
+ {{ .L.T "globals.terms.campaigns" }}
+ <ot-taginput x-model="campaigns">
+ <input list="analytics-campaigns" placeholder="{{ .L.T "globals.terms.campaigns" }}" @input="onQuery($el)" @pointerdown="onQuery($el)" @focus="onQuery($el)" />
+ <datalist id="analytics-campaigns"></datalist>
+ </ot-taginput>
+ </label>
+ <template x-for="c in campaigns" :key="c.id">
+ <input type="hidden" name="id" :value="c.id" />
+ </template>
+ </div>
- <div class="col-7">
- <data data-field>
- <label>{{ .L.T "analytics.fromDate" }} &rarr; {{ .L.T "analytics.toDate" }}</label>
- <fieldset class="group">
- <input type="datetime-local" name="from" value="{{ $d.FromInput }}" aria-label="{{ .L.T "analytics.fromDate" }}" data-cy="from" />
- <input type="datetime-local" name="to" value="{{ $d.ToInput }}" aria-label="{{ .L.T "analytics.toDate" }}" data-cy="to" />
- <button type="submit" data-cy="btn-search" aria-label="{{ .L.T "globals.buttons.search" }}" :disabled="campaigns.length === 0 || submitting" :aria-busy="submitting" data-spinner="small">
- {{ .L.T "globals.buttons.view" }}
- </button>
- </fieldset>
- {{- if $d.DisableTracking }}
- <span data-hint>{{ Icon "alert-triangle" }} {{ .L.T "analytics.trackingDisabled" }}</span>
- {{- else if not $d.IndividualTracking }}
- <span data-hint>{{ Icon "alert-triangle" }} {{ .L.T "analytics.nonIndividualTracking" }}</span>
- {{- end }}
- </data>
+ <div class="col-7">
+ <data data-field>
+ <label>{{ .L.T "analytics.fromDate" }} &rarr; {{ .L.T "analytics.toDate" }}</label>
+ <fieldset class="group">
+ <input type="datetime-local" name="from" value="{{ $d.FromInput }}" aria-label="{{ .L.T "analytics.fromDate" }}" data-cy="from" />
+ <input type="datetime-local" name="to" value="{{ $d.ToInput }}" aria-label="{{ .L.T "analytics.toDate" }}" data-cy="to" />
+ <button type="submit" data-cy="btn-search" aria-label="{{ .L.T "globals.buttons.search" }}" :disabled="campaigns.length === 0 || submitting" :aria-busy="submitting" data-spinner="small">
+ {{ .L.T "globals.buttons.view" }}
+ </button>
+ </fieldset>
+ {{- if $d.DisableTracking }}
+ <span data-hint>{{ Icon "alert-triangle" }} {{ .L.T "analytics.trackingDisabled" }}</span>
+ {{- else if not $d.IndividualTracking }}
+ <span data-hint>{{ Icon "alert-triangle" }} {{ .L.T "analytics.nonIndividualTracking" }}</span>
+ {{- end }}
+ </data>
+ </div>
</div>
- </div>
+ </fieldset>
</form>
{{- if $d.HasData }}
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index 0f0ac8c5..f4e22f15 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -47,7 +47,7 @@
</header>
{{- if $isNew }}
- <div role="tablist">
+ <div role="tablist" data-variant="primary">
<a role="tab" aria-selected="true">{{ Icon "mail" }} {{ .L.Tc "globals.terms.campaign" 1 }}</a>
<a role="tab" aria-disabled="true">{{ Icon "file-text" }} {{ .L.T "campaigns.content" }}</a>
<a role="tab" aria-disabled="true">{{ Icon "code" }} {{ .L.T "globals.terms.attribs" }}</a>
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index 305b01a0..4bb562f6 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -118,7 +118,10 @@
<td class="lists">
<ul>
{{- range .ParsedLists }}
- <li><a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a></li>
+ <li class="name-stack">
+ {{ template "avatar" dict "Kind" "list" "Seed" (printf "%d" .ID) "Name" .Name }}
+ <a href="{{ URI "/admin/subscribers/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>
+ </li>
{{- end }}
</ul>
</td>
diff --git a/static/admin/views/import.html b/static/admin/views/import.html
index 8a520425..02a9d3a5 100644
--- a/static/admin/views/import.html
+++ b/static/admin/views/import.html
@@ -14,81 +14,90 @@
<h1 class="page-title">{{ .L.T "import.title" }}</h1>
</header>
- <div class="card page-content">
+ <div class="page-content{{ if not $show }} card{{ end }}">
<!-- Upload form. -->
{{ if $show }}
<form @submit.prevent="onUpload">
- <div class="row fields">
- <div class="col-4">
- <fieldset class="vstack gap-6">
- <legend>{{ .L.T "import.mode" }}</legend>
- <div class="hstack">
- <label><input type="radio" name="mode" value="subscribe" x-model="form.mode" data-testid="check-subscribe" /> {{ .L.T "import.subscribe" }}</label>
- <label><input type="radio" name="mode" value="blocklist" x-model="form.mode" data-testid="check-blocklist" /> {{ .L.T "import.blocklist" }}</label>
- </div>
- <label data-field>
- <input type="checkbox" role="switch" x-model="form.overwriteUserInfo" data-testid="overwrite-user-info" /> {{ .L.T "import.overwriteUserInfo" }}
- <small data-hint>{{ .L.T "import.overwriteUserInfoHelp" }}</small>
- </label>
- </fieldset>
- </div>
- <div class="col-4">
- <fieldset class="vstack gap-6">
- <legend>{{ .L.T "globals.fields.status" }}</legend>
- <template x-if="form.mode === 'subscribe'">
+ <fieldset class="card">
+ <legend>{{ .L.T "import.title" }}</legend>
+ <div class="row fields">
+ <div class="col-4">
+ <fieldset class="vstack gap-6">
+ <legend>{{ .L.T "import.mode" }}</legend>
<div class="hstack">
- <label><input type="radio" name="subStatus" value="unconfirmed" x-model="form.subStatus" data-testid="check-unconfirmed" /> {{ .L.T "subscribers.status.unconfirmed" }}</label>
- <label><input type="radio" name="subStatus" value="confirmed" x-model="form.subStatus" data-testid="check-confirmed" /> {{ .L.T "subscribers.status.confirmed" }}</label>
+ <label><input type="radio" name="mode" value="subscribe" x-model="form.mode" data-testid="check-subscribe" /> {{ .L.T "import.subscribe" }}</label>
+ <label><input type="radio" name="mode" value="blocklist" x-model="form.mode" data-testid="check-blocklist" /> {{ .L.T "import.blocklist" }}</label>
</div>
- </template>
- <template x-if="form.mode === 'blocklist'">
- <label><input type="radio" name="subStatus" value="unsubscribed" x-model="form.subStatus" data-testid="check-unsubscribed" /> {{ .L.T "subscribers.status.unsubscribed" }}</label>
- </template>
- <template x-if="form.mode === 'subscribe'">
<label data-field>
- <input type="checkbox" role="switch" x-model="form.overwriteSubStatus" data-testid="overwrite-sub-status" /> {{ .L.T "import.overwriteSubStatus" }}
- <small data-hint>{{ .L.T "import.overwriteSubStatusHelp" }}</small>
+ <input type="checkbox" role="switch" x-model="form.overwriteUserInfo" data-testid="overwrite-user-info" /> {{ .L.T "import.overwriteUserInfo" }}
+ <small data-hint>{{ .L.T "import.overwriteUserInfoHelp" }}</small>
</label>
- </template>
- </fieldset>
- </div>
- <div class="col-4">
- <fieldset class="vstack gap-6">
- <legend>{{ .L.T "import.csvDelim" }}</legend>
- <label data-field class="delimiter">
- <input name="delim" x-model="form.delim" placeholder="," maxlength="1" required />
- <small data-hint>{{ .L.T "import.csvDelimHelp" }}</small>
- </label>
- </fieldset>
+ </fieldset>
+ </div>
+ <div class="col-4">
+ <fieldset class="vstack gap-6">
+ <legend>{{ .L.T "globals.fields.status" }}</legend>
+ <template x-if="form.mode === 'subscribe'">
+ <div class="hstack">
+ <label><input type="radio" name="subStatus" value="unconfirmed" x-model="form.subStatus" data-testid="check-unconfirmed" /> {{ .L.T "subscribers.status.unconfirmed" }}</label>
+ <label><input type="radio" name="subStatus" value="confirmed" x-model="form.subStatus" data-testid="check-confirmed" /> {{ .L.T "subscribers.status.confirmed" }}</label>
+ </div>
+ </template>
+ <template x-if="form.mode === 'blocklist'">
+ <label><input type="radio" name="subStatus" value="unsubscribed" x-model="form.subStatus" data-testid="check-unsubscribed" /> {{ .L.T "subscribers.status.unsubscribed" }}</label>
+ </template>
+ <template x-if="form.mode === 'subscribe'">
+ <label data-field>
+ <input type="checkbox" role="switch" x-model="form.overwriteSubStatus" data-testid="overwrite-sub-status" /> {{ .L.T "import.overwriteSubStatus" }}
+ <small data-hint>{{ .L.T "import.overwriteSubStatusHelp" }}</small>
+ </label>
+ </template>
+ </fieldset>
+ </div>
+ <div class="col-4">
+ <fieldset class="vstack gap-6">
+ <legend>{{ .L.T "import.csvDelim" }}</legend>
+ <label data-field class="delimiter">
+ <input name="delim" x-model="form.delim" placeholder="," maxlength="1" required />
+ <small data-hint>{{ .L.T "import.csvDelimHelp" }}</small>
+ </label>
+ </fieldset>
+ </div>
</div>
- </div>
+ </fieldset>
<template x-if="form.mode === 'subscribe'">
- {{ template "list-selector" dict "Root" . "Model" "form.lists" "ListID" "import-lists" "Label" "globals.terms.lists" "Placeholder" "import.listSubHelp" }}
+ <fieldset class="card">
+ <legend>{{ .L.T "globals.terms.lists" }}</legend>
+ {{ template "list-selector" dict "Root" . "Model" "form.lists" "ListID" "import-lists" "Placeholder" "import.listSubHelp" }}
+ </fieldset>
</template>
- <div data-field>
- <ot-upload>
- <div data-field class="vstack">
- <input type="file" name="file" accept=".csv,.zip" hidden @change="form.file = $event.target.files[0]" />
- <strong>{{ .L.T "import.csvFile" }}</strong>
+ <fieldset class="card">
+ <legend>{{ .L.T "import.upload" }}</legend>
+ <div data-field>
+ <ot-upload>
+ <div data-field class="vstack">
+ <input type="file" name="file" accept=".csv,.zip" hidden @change="form.file = $event.target.files[0]" />
+ <strong>{{ .L.T "import.csvFile" }}</strong>
- <button type="button" class="ghost" aria-label="{{ .L.T "import.csvFile" }}">
- {{ Icon "upload" }}
- </button>
+ <button type="button" class="ghost" aria-label="{{ .L.T "import.csvFile" }}">
+ {{ Icon "upload" }}
+ </button>
- <div data-files>
- <small data-hint>{{ .L.T "import.csvFileHelp" }}</small>
+ <div data-files>
+ <small data-hint>{{ .L.T "import.csvFileHelp" }}</small>
+ </div>
</div>
- </div>
- </ot-upload>
- </div>
+ </ot-upload>
+ </div>
+ </fieldset>
- <div class="hstack">
+ <footer class="hstack justify-end mt-6">
<button type="submit" data-variant="primary" data-testid="btn-upload" :disabled="!canUpload || isProcessing" :aria-busy="isProcessing">
{{ Icon "upload" }} {{ .L.T "import.upload" }}
</button>
- </div>
+ </footer>
</form>
{{ end }}
@@ -132,7 +141,6 @@
{{ if $show }}
<div class="import-help mt-6">
- <hr />
<h6>{{ .L.T "import.instructions" }}</h6>
<p class="text-light">{{ .L.T "import.instructionsHelp" }}</p>
<blockquote class="csv-example">
diff --git a/static/admin/views/maintenance.html b/static/admin/views/maintenance.html
index 618777cf..63564c89 100644
--- a/static/admin/views/maintenance.html
+++ b/static/admin/views/maintenance.html
@@ -10,8 +10,8 @@
<div class="page-content vstack gap-6">
<!-- Subscribers -->
- <div class="card">
- <h4 class="text-4">{{ .L.T "globals.terms.subscribers" }}</h4>
+ <fieldset class="card">
+ <legend>{{ .L.T "globals.terms.subscribers" }}</legend>
<div class="row">
<div class="col-4">
<label data-field>
@@ -31,11 +31,11 @@
</button>
</div>
</div>
- </div>
+ </fieldset>
<!-- Subscriptions -->
- <div class="card">
- <h4 class="text-4">{{ .L.Tc "globals.terms.subscriptions" 2 }}</h4>
+ <fieldset class="card">
+ <legend>{{ .L.Tc "globals.terms.subscriptions" 2 }}</legend>
<div class="row">
<div class="col-4">
<label data-field>
@@ -59,11 +59,11 @@
</button>
</div>
</div>
- </div>
+ </fieldset>
<!-- Analytics -->
- <div class="card">
- <h4 class="text-4">{{ .L.T "globals.terms.analytics" }}</h4>
+ <fieldset class="card">
+ <legend>{{ .L.T "globals.terms.analytics" }}</legend>
<div class="row">
<div class="col-4">
<label data-field>
@@ -115,35 +115,37 @@
</a>
</div>
</div>
- </div>
+ </fieldset>
{{- if $d.Can "settings:manage" }}
<!-- Database -->
- <form class="card" @submit.prevent="onUpdateDBSettings">
- <h4 class="text-4">{{ .L.T "maintenance.database.title" }}</h4>
- <h5 class="text-5">Vacuum</h5>
- <p class="text-light">{{ .L.T "maintenance.database.vacuumHelp" }}</p>
- <div class="row">
- <div class="col-3">
- <label data-field>
- <input type="checkbox" role="switch" x-model="dbSettings.vacuum" />
- {{ .L.T "globals.buttons.enabled" }}
- </label>
+ <form @submit.prevent="onUpdateDBSettings">
+ <fieldset class="card">
+ <legend>{{ .L.T "maintenance.database.title" }}</legend>
+ <h5 class="text-5">Vacuum</h5>
+ <p class="text-light">{{ .L.T "maintenance.database.vacuumHelp" }}</p>
+ <div class="row">
+ <div class="col-3">
+ <label data-field>
+ <input type="checkbox" role="switch" x-model="dbSettings.vacuum" />
+ {{ .L.T "globals.buttons.enabled" }}
+ </label>
+ </div>
+ <div class="col-4" :aria-disabled="!dbSettings.vacuum">
+ <label data-field>
+ {{ .L.T "settings.maintenance.cron" }}
+ <input placeholder="0 2 * * *" pattern="((\*|[0-9,\-\/]+)\s+){4}(\*|[0-9,\-\/]+)"
+ :disabled="!dbSettings.vacuum" x-model="dbSettings.vacuum_cron_interval" />
+ </label>
+ </div>
+ <div class="col-5 col-end hstack justify-end">
+ <button type="submit" data-variant="primary" data-cy="btn-save-db"
+ :disabled="isSaving" :aria-busy="isSaving" data-spinner="small">
+ {{ Icon "save" }} {{ .L.T "globals.buttons.save" }}
+ </button>
+ </div>
</div>
- <div class="col-4" :aria-disabled="!dbSettings.vacuum">
- <label data-field>
- {{ .L.T "settings.maintenance.cron" }}
- <input placeholder="0 2 * * *" pattern="((\*|[0-9,\-\/]+)\s+){4}(\*|[0-9,\-\/]+)"
- :disabled="!dbSettings.vacuum" x-model="dbSettings.vacuum_cron_interval" />
- </label>
- </div>
- <div class="col-5 col-end hstack justify-end">
- <button type="submit" data-variant="primary" data-cy="btn-save-db"
- :disabled="isSaving" :aria-busy="isSaving" data-spinner="small">
- {{ Icon "save" }} {{ .L.T "globals.buttons.save" }}
- </button>
- </div>
- </div>
+ </fieldset>
</form>
{{- end }}
</div>
diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.html
index 51aba3a3..0fa848f9 100644
--- a/static/admin/views/subscriber.html
+++ b/static/admin/views/subscriber.html
@@ -24,7 +24,7 @@
</h1>
</div>
</div>
- <div class="col-6 col-end align-right hstack justify-end">
+ <div class="col-6 hstack justify-end">
{{- if and (eq $d.Tab "lists") ($d.Can "subscribers:manage") }}
{{ if ne $sub.Status "blocklisted" }}
<button type="button" class="outline" data-testid="btn-send-optin" @click.prevent="onSendOptin" :disabled="!hasOptinSub">{{ Icon "mail" }} {{ .L.T "subscribers.sendOptinConfirm" }}</button>
@@ -38,7 +38,7 @@
</header>
{{- if not $d.IsNew }}
- <div role="tablist">
+ <div role="tablist" data-variant="primary">
<a role="tab" href="{{ $base }}" {{ if eq $d.Tab "profile" }}aria-selected="true"{{ end }}>{{ Icon "user" }} {{ .L.Tc "globals.terms.subscriber" 1 }}</a>
<a role="tab" href="{{ $base }}/lists" {{ if eq $d.Tab "lists" }}aria-selected="true"{{ end }}>{{ Icon "list" }} {{ .L.Tc "globals.terms.lists" 2 }} ({{ len $sub.ParsedLists }})</a>
<a role="tab" href="{{ $base }}/activity" {{ if eq $d.Tab "activity" }}aria-selected="true"{{ end }}>{{ Icon "activity" }} {{ .L.T "subscribers.activity" }}</a>
diff --git a/static/admin/views/template.html b/static/admin/views/template.html
index d561fa24..82dd52d3 100644
--- a/static/admin/views/template.html
+++ b/static/admin/views/template.html
@@ -35,7 +35,8 @@
<form @submit.prevent="onSubmit">
<div class="page-content content">
- <section class="card">
+ <fieldset class="card">
+ <legend>{{ .L.Tc "globals.terms.template" 1 }}</legend>
<div class="row">
<div class="col-9">
<label data-field>
@@ -62,6 +63,9 @@
</label>
</template>
+ </fieldset>
+
+ <section class="card">
<div class="editor-body">
<template x-if="form.type === 'campaign_visual'">
<visual-editor base="{{ URI "/admin/static/email-builder" }}" @editor-change="form.body = $event.detail.body; form.body_source = $event.detail.source"><textarea>{{ $t.BodySource.String }}</textarea></visual-editor>
diff --git a/static/admin/views/templates.html b/static/admin/views/templates.html
index 8b8d55ee..374e8994 100644
--- a/static/admin/views/templates.html
+++ b/static/admin/views/templates.html
@@ -35,7 +35,6 @@
<tr>
<th>{{ .L.T "globals.fields.name" }}</th>
<th>{{ .L.T "globals.fields.type" }}</th>
- <th>{{ .L.T "globals.fields.id" }}</th>
<th>{{ .L.T "globals.fields.createdAt" }}</th>
<th class="actions align-right"></th>
</tr>
@@ -69,7 +68,6 @@
{{- end }}
</div>
</td>
- <td data-label="{{ $.L.T "globals.fields.id" }}">{{ .ID }}</td>
<td class="date-stack" data-label="{{ $.L.T "globals.fields.createdAt" }}">{{ NiceDate .CreatedAt }}</td>
<td class="actions align-right">
<ot-dropdown>