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
Move the 'send test' button on campaign page out of the preview box into the main page.
Kailash Nadh651a8edb681e
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.cssindex fed7429a..4ecd0fa6 100644--- a/static/admin/assets/css/style.css+++ b/static/admin/assets/css/style.css@@ -984,8 +984,8 @@ visual-editor {.campaign-test.campaign-test {position-anchor: --campaign-test-anchor;inset: auto !important;- bottom: calc(anchor(top) + var(--space-1)) !important;- left: anchor(left) !important;+ top: calc(anchor(bottom) + var(--space-1)) !important;+ right: anchor(right) !important;}.media-upload-btn {diff --git a/static/admin/partials/campaign-preview.html b/static/admin/partials/campaign-preview.htmlindex 69cda8e8..68249fd5 100644--- a/static/admin/partials/campaign-preview.html+++ b/static/admin/partials/campaign-preview.html@@ -1,5 +1,4 @@{{ define "campaign-preview" -}}-{{- $canManage := .Data.Can "campaigns:manage" "campaigns:manage_all" -}}<dialog class="preview-modal" x-ref="previewDialog" @close="onPreviewClose"><div class="dialog-card"><header class="dialog-head hstack justify-between">@@ -15,27 +14,7 @@<iframe id="iframe" name="campaign-preview-frame" x-ref="previewFrame" title="{{ .L.T "campaigns.preview" }}" @load="preview.loading = false"></iframe></section><footer class="dialog-foot">- <div class="row">- <div class="col-6 hstack">- {{- if $canManage }}- <ot-dropdown>- <button type="button" class="outline campaign-test-btn dot-indicator" :class="{ 'is-active': form.testEmails.length > 0 }" popovertarget="campaign-test" :disabled="isNew" data-cy="btn-test">{{ Icon "mail" }} {{ .L.T "campaigns.sendTest" }}</button>- <div popover id="campaign-test" class="campaign-test">- <label data-field>- <ot-taginput x-model="form.testEmails"><input type="email" placeholder="{{ .L.T "campaigns.testEmails" }}" :disabled="isNew" @blur="$el.value !== '' && $el.closest('ot-taginput').add($el.value)" autofocus /></ot-taginput>- <small data-hint>{{ .L.T "campaigns.sendTestHelp" }}</small>- </label>- <div class="hstack justify-end">- <button type="button" data-variant="primary" @click="onTest" :disabled="isNew || isLoading('campaigns.test')" :aria-busy="isLoading('campaigns.test')" data-spinner="small">{{ Icon "mail" }} {{ .L.T "campaigns.send" }}</button>- </div>- </div>- </ot-dropdown>- {{- end }}- </div>- <div class="col-6 col-end hstack justify-end">- <button type="button" class="outline" autofocus @click="$refs.previewDialog.close()">{{ .L.T "globals.buttons.close" }}</button>- </div>- </div>+ <button type="button" class="outline" autofocus @click="$refs.previewDialog.close()">{{ .L.T "globals.buttons.close" }}</button></footer></div></dialog>diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.htmlindex 3347a147..7970fc22 100644--- a/static/admin/views/campaign.html+++ b/static/admin/views/campaign.html@@ -36,6 +36,20 @@</div>{{- if $showRight }}<div class="col-6 col-end hstack justify-end">+ {{- if $showActions }}+ <ot-dropdown>+ <button type="button" class="outline external campaign-test-btn dot-indicator" :class="{ 'is-active': form.testEmails.length > 0 }" popovertarget="campaign-test" :disabled="isNew" data-cy="btn-test">{{ Icon "mail" }} {{ .L.T "campaigns.sendTest" }}</button>+ <div popover id="campaign-test" class="campaign-test">+ <label data-field>+ <ot-taginput x-model="form.testEmails"><input type="email" placeholder="{{ .L.T "campaigns.testEmails" }}" :disabled="isNew" @blur="$el.value !== '' && $el.closest('ot-taginput').add($el.value)" autofocus /></ot-taginput>+ <small data-hint>{{ .L.T "campaigns.sendTestHelp" }}</small>+ </label>+ <div class="hstack justify-end">+ <button type="button" data-variant="primary" @click="onTest" :disabled="isNew || isLoading('campaigns.test')" :aria-busy="isLoading('campaigns.test')" data-spinner="small">{{ Icon "mail" }} {{ .L.T "campaigns.send" }}</button>+ </div>+ </div>+ </ot-dropdown>+ {{- end }}{{- if $showPreview }}<button type="button" class="outline external" data-cy="btn-preview" @click="onPreviewContent" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "campaigns.preview" }}</button>{{- end }}diff --git a/tests/specs/campaigns.spec.js b/tests/specs/campaigns.spec.jsindex b0a54f1e..c42e438c 100644--- a/tests/specs/campaigns.spec.js+++ b/tests/specs/campaigns.spec.js@@ -218,7 +218,8 @@ test('previews and test-sends unsaved content without modifying the draft', asynawait fillBody(page, 'plain', 'Unsaved hello {{ .Subscriber.Name }}');await button(page, 'Preview').click();await expect(page.frameLocator('.preview-modal iframe').locator('body')).toContainText('Unsaved hello Demo Subscriber');- await button(page, 'Send test message').click();+ await button(page.locator('.preview-modal'), 'Close').click();+ await button(page.locator('.page-header'), 'Send test message').click();await page.locator('#campaign-test input[type="email"]').fill('[email protected]');await page.locator('#campaign-test input[type="email"]').press('Enter');await button(page.locator('#campaign-test'), 'Send').click();