' +
@@ -25,6 +62,7 @@
function buildToolbar() {
var row = document.createElement('div');
row.className = 'newsletter-campaign-toolbar';
+ row.setAttribute('data-newsletter-preview-toolbar', '1');
row.innerHTML =
'
' +
'
';
@@ -55,10 +93,26 @@
return input ? input.value : '';
}
- async function composePreviewHtml(templateId, emailBodyHtml) {
+ function getSelectedWeeklyArticleIds() {
+ var form = document.querySelector('form[data-edit-form]') || document.getElementById('w-editor-form');
+ if (!form) return '';
+ var fd = new FormData(form);
+ var ids = fd.getAll('weekly_articles') || [];
+ var clean = [];
+ for (var i = 0; i < ids.length; i++) {
+ var v = String(ids[i] || '').trim();
+ if (v) clean.push(v);
+ }
+ return clean.join(',');
+ }
+
+ async function composePreviewHtml(templateId, emailBodyHtml, campaignType, weeklyArticleIds, weeklyItemTemplateHtml) {
var body = new URLSearchParams();
body.set('template_id', templateId || '');
body.set('email_body_html', emailBodyHtml || '');
+ body.set('campaign_type', campaignType || 'general');
+ body.set('weekly_article_ids', weeklyArticleIds || '');
+ body.set('weekly_item_template_html', weeklyItemTemplateHtml || '');
var resp = await fetch('/newsletter/campaigns/preview-compose/', {
method: 'POST',
@@ -78,50 +132,214 @@
}
function resolveHtmlFieldContainer(htmlInput) {
- return (
- document.querySelector('[data-field="html_template"]') ||
- htmlInput.closest('.w-field') ||
- htmlInput.parentNode
- );
+ function isVisible(node) {
+ if (!node) return false;
+ var style = window.getComputedStyle(node);
+ return style.display !== 'none' && style.visibility !== 'hidden';
+ }
+ var candidates = [
+ document.querySelector('[data-field="newsletter_template"]'),
+ document.querySelector('[data-field="subject_template"]'),
+ document.querySelector('[data-field="list_id"]'),
+ document.querySelector('.fields'),
+ document.querySelector('[data-edit-form]'),
+ document.querySelector('[data-field="html_template"]'),
+ htmlInput ? htmlInput.closest('.w-field') : null,
+ htmlInput ? htmlInput.parentNode : null,
+ ];
+ for (var i = 0; i < candidates.length; i++) {
+ if (isVisible(candidates[i])) return candidates[i];
+ }
+ return candidates[0] || null;
+ }
+
+ function resolvePreviewAnchor(htmlInput) {
+ var scheduledInput = document.getElementById('id_scheduled_at');
+ var scheduledPanelSection =
+ document.getElementById('panel-scheduled_at-section') ||
+ (scheduledInput ? scheduledInput.closest('section.w-panel') : null);
+ if (scheduledPanelSection && scheduledPanelSection.parentNode) {
+ return { container: scheduledPanelSection.parentNode, beforeNode: scheduledPanelSection };
+ }
+ var scheduledField =
+ document.querySelector('[data-field="scheduled_at"]') ||
+ (scheduledInput &&
+ (scheduledInput.closest('li[data-contentpath]') ||
+ scheduledInput.closest('.w-field') ||
+ scheduledInput.closest('li') ||
+ scheduledInput.closest('section') ||
+ resolveFieldContainer(scheduledInput)));
+ if (scheduledField && scheduledField.parentNode) {
+ return { container: scheduledField.parentNode, beforeNode: scheduledField };
+ }
+ var fallback = resolveHtmlFieldContainer(htmlInput);
+ if (fallback && fallback.parentNode) {
+ return { container: fallback.parentNode, beforeNode: fallback };
+ }
+ return null;
+ }
+
+ function setupWeeklyArticlePager() {
+ var weeklyField =
+ document.querySelector('[data-field="weekly_articles"]') ||
+ resolveFieldContainer(document.querySelector('input[name="weekly_articles"]'));
+ if (!weeklyField) {
+ return;
+ }
+ var inputs = weeklyField.querySelectorAll('input[name="weekly_articles"]');
+ if (!inputs || !inputs.length) {
+ return;
+ }
+
+ var rows = [];
+ for (var i = 0; i < inputs.length; i++) {
+ var row = inputs[i].closest('li') || inputs[i].closest('label') || inputs[i].parentNode;
+ if (row) {
+ rows.push(row);
+ }
+ }
+ if (!rows.length) {
+ return;
+ }
+
+ for (var r = 0; r < rows.length; r++) {
+ rows[r].classList.add('newsletter-article-row');
+ }
+
+ var shell = document.createElement('div');
+ shell.className = 'newsletter-article-pager';
+ shell.innerHTML =
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
';
+ weeklyField.insertBefore(shell, weeklyField.firstChild);
+
+ var pageSizeSelect = shell.querySelector('[data-article-page-size]');
+ var prevBtn = shell.querySelector('[data-article-prev]');
+ var nextBtn = shell.querySelector('[data-article-next]');
+ var info = shell.querySelector('[data-article-page-info]');
+ var page = 1;
+ var pageSize = 10;
+
+ function renderPage() {
+ var total = rows.length;
+ var totalPages = Math.max(1, Math.ceil(total / pageSize));
+ if (page > totalPages) page = totalPages;
+ var start = (page - 1) * pageSize;
+ var end = start + pageSize;
+ for (var idx = 0; idx < rows.length; idx++) {
+ rows[idx].style.display = idx >= start && idx < end ? '' : 'none';
+ }
+ info.textContent = '第 ' + page + ' / ' + totalPages + ' 頁，共 ' + total + ' 則';
+ prevBtn.disabled = page <= 1;
+ nextBtn.disabled = page >= totalPages;
+ }
+
+ pageSizeSelect.addEventListener('change', function () {
+ pageSize = parseInt(pageSizeSelect.value, 10) || 10;
+ page = 1;
+ renderPage();
+ });
+ prevBtn.addEventListener('click', function () {
+ if (page > 1) {
+ page -= 1;
+ renderPage();
+ }
+ });
+ nextBtn.addEventListener('click', function () {
+ page += 1;
+ renderPage();
+ });
+ renderPage();
}
function boot() {
var templateSelect = document.getElementById('id_newsletter_template');
var htmlInput = document.getElementById('id_html_template');
+ var campaignTypeInput = document.getElementById('id_campaign_type');
+ var weeklyItemTemplateInput = document.getElementById('id_item_template_html');
+ var campaignType =
+ campaignTypeInput && (campaignTypeInput.value || '').trim()
+ ? (campaignTypeInput.value || '').trim()
+ : document.querySelector('.newsletter-weekly-only')
+ ? 'weekly_news'
+ : 'general';
+ var isWeekly = campaignType === 'weekly_news';
- if (!templateSelect || !htmlInput) {
+ if (!templateSelect) {
return;
}
- var htmlFieldContainer = resolveHtmlFieldContainer(htmlInput);
- var toolbar = htmlFieldContainer.querySelector('[data-campaign-toolbar]') || buildToolbar();
+ if (campaignTypeInput) {
+ toggleFieldVisibility(campaignType);
+ campaignTypeInput.addEventListener('change', function () {
+ toggleFieldVisibility(campaignTypeInput.value || 'general');
+ });
+ }
+ setupWeeklyArticlePager();
+
+ if (!htmlInput && !isWeekly) {
+ return;
+ }
+
+ var previewAnchor = resolvePreviewAnchor(htmlInput);
+ if (!previewAnchor) {
+ return;
+ }
+ var htmlFieldContainer = previewAnchor.container;
+ var insertBeforeNode = previewAnchor.beforeNode;
+ var existingToolbars = document.querySelectorAll('[data-newsletter-preview-toolbar]');
+ var toolbar = existingToolbars.length ? existingToolbars[0] : buildToolbar();
+ for (var t = 1; t < existingToolbars.length; t++) {
+ existingToolbars[t].remove();
+ }
var previewBtn = toolbar.querySelector('[data-preview-newsletter-campaign]');
var statusNode = toolbar.querySelector('[data-campaign-status]');
- var previewShell =
- htmlFieldContainer.querySelector('[data-campaign-preview-shell]') || createPreviewShell();
+ var existingShells = document.querySelectorAll('[data-newsletter-preview-shell]');
+ var previewShell = existingShells.length ? existingShells[0] : createPreviewShell();
+ for (var s = 1; s < existingShells.length; s++) {
+ existingShells[s].remove();
+ }
var previewFrame = previewShell.querySelector('[data-campaign-preview-frame]');
var previewCloseBtn = previewShell.querySelector('[data-campaign-preview-close]');
- if (!toolbar.parentNode) {
- htmlFieldContainer.insertBefore(toolbar, htmlFieldContainer.firstChild);
+ if (toolbar.parentNode !== htmlFieldContainer || toolbar.nextSibling !== insertBeforeNode) {
+ htmlFieldContainer.insertBefore(toolbar, insertBeforeNode);
}
- if (!previewShell.parentNode) {
+ if (previewShell.parentNode !== htmlFieldContainer) {
htmlFieldContainer.insertBefore(previewShell, toolbar.nextSibling);
}
- if (previewCloseBtn) {
+ if (previewCloseBtn && !previewCloseBtn.dataset.bound) {
+ previewCloseBtn.dataset.bound = '1';
previewCloseBtn.addEventListener('click', function () {
previewShell.hidden = true;
});
}
- previewBtn.addEventListener('click', async function () {
- var bodyHtml = htmlInput.value || '';
+ if (!previewBtn.dataset.bound) {
+ previewBtn.dataset.bound = '1';
+ previewBtn.addEventListener('click', async function () {
+ var bodyHtml = htmlInput ? htmlInput.value || '' : '';
var templateId = (templateSelect.value || '').trim();
+ var campaignType =
+ campaignTypeInput && (campaignTypeInput.value || '').trim()
+ ? (campaignTypeInput.value || '').trim()
+ : document.querySelector('.newsletter-weekly-only')
+ ? 'weekly_news'
+ : 'general';
+ var weeklyArticleIds = getSelectedWeeklyArticleIds();
+ var weeklyItemTemplateHtml = weeklyItemTemplateInput ? weeklyItemTemplateInput.value || '' : '';
var html = '';
try {
- html = (await composePreviewHtml(templateId, bodyHtml)).trim();
+ html = (await composePreviewHtml(templateId, bodyHtml, campaignType, weeklyArticleIds, weeklyItemTemplateHtml)).trim();
} catch (err) {
statusNode.hidden = false;
statusNode.textContent = err.message;
@@ -139,7 +357,8 @@
return;
}
statusNode.hidden = true;
- });
+ });
+ }
}
if (document.readyState === 'loading') {
diff --git a/innovedus_cms/base/templates/base/wagtail/newsletter_campaign_type_select.html b/innovedus_cms/base/templates/base/wagtail/newsletter_campaign_type_select.html
new file mode 100644
index 0000000..b5603fc
--- /dev/null
+++ b/innovedus_cms/base/templates/base/wagtail/newsletter_campaign_type_select.html
@@ -0,0 +1,37 @@
+{% extends "wagtailadmin/base.html" %}
+{% load i18n wagtailadmin_tags %}
+
+{% block titletag %}{% trans "Choose Newsletter Type" %}{% endblock %}
+
+{% block content %}
+ {% include "wagtailadmin/shared/header.html" with title=_("Create a newsletter") icon="mail" %}
+
+
+
{% trans "Please choose a newsletter type before editing." %}
+
+
+
+{% endblock %}
diff --git a/innovedus_cms/base/views.py b/innovedus_cms/base/views.py
index 72d3b61..92f89ce 100644
--- a/innovedus_cms/base/views.py
+++ b/innovedus_cms/base/views.py
@@ -27,6 +27,7 @@ from .models import (
)
from .newsletter import (
MemberCenterClient,
+ build_weekly_news_body_html,
build_from_email,
compose_newsletter_template_html,
extract_token,
@@ -535,6 +536,9 @@ def newsletter_template_payload(request, template_id: int):
def newsletter_campaign_preview_compose(request):
template_id_raw = (request.POST.get("template_id") or "").strip()
email_body_html = request.POST.get("email_body_html") or ""
+ campaign_type = (request.POST.get("campaign_type") or NewsletterCampaign.TYPE_GENERAL).strip()
+ weekly_item_template_html = request.POST.get("weekly_item_template_html") or ""
+ weekly_article_ids_raw = request.POST.get("weekly_article_ids") or ""
template_html = ""
if template_id_raw:
@@ -545,9 +549,21 @@ def newsletter_campaign_preview_compose(request):
template_obj = get_object_or_404(NewsletterTemplate, pk=template_id)
template_html = template_obj.template_html or ""
+ body_html = email_body_html
+ if campaign_type == NewsletterCampaign.TYPE_WEEKLY_NEWS:
+ article_ids = []
+ for token in weekly_article_ids_raw.split(","):
+ token = token.strip()
+ if token.isdigit():
+ article_ids.append(int(token))
+ body_html = build_weekly_news_body_html(
+ article_page_ids=article_ids,
+ item_template_html=weekly_item_template_html,
+ )
+
composed = compose_newsletter_template_html(
layout_html=template_html,
- email_body_html=email_body_html,
+ email_body_html=body_html,
)
rendered = render_newsletter_html_for_send_job(composed)
return JsonResponse({"html": rendered})
diff --git a/innovedus_cms/base/wagtail_hooks.py b/innovedus_cms/base/wagtail_hooks.py
index 451f31f..7a05fd0 100644
--- a/innovedus_cms/base/wagtail_hooks.py
+++ b/innovedus_cms/base/wagtail_hooks.py
@@ -1,6 +1,10 @@
from django import forms
+from django.contrib.admin.views.decorators import staff_member_required
+from django.urls import path
from django.urls import reverse
from django.utils.translation import gettext as _
+from django.shortcuts import redirect
+from django.shortcuts import render
from wagtail import hooks
from wagtail.admin.panels import FieldPanel
from wagtail.admin.widgets import Button
@@ -19,14 +23,114 @@ from .models import NewsletterCampaign, NewsletterDispatchRecord, NewsletterSyst
SEND_NEWSLETTER_PERMISSION = "base.send_newslettercampaign"
+def _newsletter_campaign_add_url() -> str:
+ candidates = [
+ "wagtailsnippets_base_newslettercampaign:add",
+ "base_newslettercampaign:add",
+ ]
+ for name in candidates:
+ try:
+ return reverse(name)
+ except Exception:
+ continue
+ return "/admin/snippets/base/newslettercampaign/add/"
+
+
+@staff_member_required
+def newsletter_campaign_type_select_view(request):
+ return render(
+ request,
+ "base/wagtail/newsletter_campaign_type_select.html",
+ {
+ "title": _("Choose Newsletter Type"),
+ "add_url": _newsletter_campaign_add_url(),
+ "type_general": NewsletterCampaign.TYPE_GENERAL,
+ "type_weekly_news": NewsletterCampaign.TYPE_WEEKLY_NEWS,
+ },
+ )
+
+
+@staff_member_required
+def newsletter_campaign_add_by_type_view(request, campaign_type: str):
+ campaign_type = (campaign_type or "").strip()
+ allowed = {NewsletterCampaign.TYPE_GENERAL, NewsletterCampaign.TYPE_WEEKLY_NEWS}
+ if campaign_type not in allowed:
+ return redirect("newsletter_campaign_type_select")
+ return redirect(f"{_newsletter_campaign_add_url()}?campaign_type={campaign_type}")
+
+
+@hooks.register("register_admin_urls")
+def register_newsletter_admin_urls():
+ return [
+ path(
+ "newsletter/campaigns/type-select/",
+ newsletter_campaign_type_select_view,
+ name="newsletter_campaign_type_select",
+ ),
+ path(
+ "newsletter/campaigns/add/
/",
+ newsletter_campaign_add_by_type_view,
+ name="newsletter_campaign_add_by_type",
+ ),
+ ]
+
+
class NewsletterCampaignCreateView(CreateView):
+ def _resolve_campaign_type(self):
+ candidate = (
+ self.request.POST.get("campaign_type")
+ or self.request.GET.get("campaign_type")
+ or ""
+ ).strip()
+ if candidate in {NewsletterCampaign.TYPE_GENERAL, NewsletterCampaign.TYPE_WEEKLY_NEWS}:
+ return candidate
+ return ""
+
+ def get(self, request, *args, **kwargs):
+ campaign_type = self._resolve_campaign_type()
+ if campaign_type in {NewsletterCampaign.TYPE_GENERAL, NewsletterCampaign.TYPE_WEEKLY_NEWS}:
+ return super().get(request, *args, **kwargs)
+ return redirect("newsletter_campaign_type_select")
+
+ def post(self, request, *args, **kwargs):
+ campaign_type = self._resolve_campaign_type()
+ if campaign_type not in {NewsletterCampaign.TYPE_GENERAL, NewsletterCampaign.TYPE_WEEKLY_NEWS}:
+ # Do not redirect on POST; inject a safe default so form validation can run.
+ post_data = request.POST.copy()
+ is_weekly_hint = bool(post_data.getlist("weekly_articles")) or bool(
+ (post_data.get("item_template_html") or "").strip()
+ )
+ post_data["campaign_type"] = (
+ NewsletterCampaign.TYPE_WEEKLY_NEWS if is_weekly_hint else NewsletterCampaign.TYPE_GENERAL
+ )
+ request.POST = post_data
+ return super().post(request, *args, **kwargs)
+
def get_initial(self):
initial = super().get_initial()
+ campaign_type = self._resolve_campaign_type()
+ if campaign_type in {NewsletterCampaign.TYPE_GENERAL, NewsletterCampaign.TYPE_WEEKLY_NEWS}:
+ initial["campaign_type"] = campaign_type
if (initial.get("list_id") or "").strip():
- return initial
+ return self._with_default_template(initial)
default_list_id = (NewsletterSystemSettings.load().member_center_list_id or "").strip()
if default_list_id:
initial["list_id"] = default_list_id
+ return self._with_default_template(initial)
+
+ def _with_default_template(self, initial: dict):
+ if initial.get("newsletter_template"):
+ return initial
+ campaign_type = initial.get("campaign_type") or NewsletterCampaign.TYPE_GENERAL
+ qs = NewsletterTemplate.objects.all()
+ if campaign_type == NewsletterCampaign.TYPE_WEEKLY_NEWS:
+ candidate = qs.filter(name__icontains="weekly").order_by("-updated_at", "-created_at").first()
+ if not candidate:
+ candidate = qs.order_by("-updated_at", "-created_at").first()
+ else:
+ candidate = qs.order_by("-updated_at", "-created_at").first()
+ if candidate:
+ initial["newsletter_template"] = candidate.pk
return initial
@@ -39,14 +143,19 @@ class NewsletterCampaignViewSet(SnippetViewSet):
add_view_class = NewsletterCampaignCreateView
form_class = NewsletterCampaignAdminForm
base_form_class = NewsletterCampaignAdminForm
- list_display = ["title", "list_id", "status", "scheduled_at", "sent_at", "updated_at"]
+ list_display = ["title", "campaign_type", "list_id", "status", "scheduled_at", "sent_at", "updated_at"]
list_filter = ["status"]
search_fields = ["title", "list_id", "subject_template"]
+
+ def get_form_class(self, for_update=False):
+ return NewsletterCampaignAdminForm
+
panels = [
FieldPanel("title"),
+ FieldPanel("campaign_type"),
FieldPanel(
"newsletter_template",
- help_text=_("Choose a template, then click 'Apply template' in the editor area."),
+ help_text=_("Choose a template; default is picked from campaign type."),
),
FieldPanel(
"list_id",
@@ -59,8 +168,15 @@ class NewsletterCampaignViewSet(SnippetViewSet):
features=["h2", "h3", "bold", "italic", "link", "image", "ul", "ol"],
),
help_text=_("Use image picker/upload from Wagtail. Prefer image URLs instead of Base64 in CMS."),
+ classname="newsletter-general-only",
),
- FieldPanel("text_template"),
+ FieldPanel("text_template", classname="newsletter-general-only"),
+ FieldPanel(
+ "weekly_articles",
+ widget=forms.CheckboxSelectMultiple(),
+ classname="newsletter-weekly-only",
+ ),
+ FieldPanel("item_template_html", classname="newsletter-weekly-only"),
FieldPanel("scheduled_at"),
]