Enhance newsletter generation and dashboard functionality

- Introduce a new period selection feature in the dashboard for generating newsletters, allowing users to choose between "last month" and "last X days."
- Refactor newsletter generation logic to support filtering by article type (new, edited, or all) and improve the handling of filters in the dashboard.
- Update the dashboard template to include new input fields for period and article type, enhancing user experience.
- Improve CSS styles for send notifications and sections in the dashboard, providing clearer feedback on newsletter sending status.

app/main.py

@@ -30,6 +30,7 @@ from app.services.newsletter import (
     filter_articles,
     parse_display_options,
     parse_highlights,
+    resolve_period,
     split_articles_by_type,
 )
 from app.services.smtp_sender import get_smtp_settings, run_scheduled_send_if_due, send_newsletter
@@ -72,7 +73,14 @@ async def add_security_headers(request: Request, call_next):
     response.headers["X-Content-Type-Options"] = "nosniff"
     response.headers["X-Frame-Options"] = "DENY"
     response.headers["Referrer-Policy"] = "same-origin"
-    response.headers["Content-Security-Policy"] = "default-src 'self'; style-src 'self'; script-src 'self';"
+    # Die Newsletter-Vorschau läuft in einem srcdoc-iframe und erbt diese CSP.
+    # E-Mail-HTML benötigt zwingend Inline-Styles; das Logo liegt auf einem externen https-Host.
+    response.headers["Content-Security-Policy"] = (
+        "default-src 'self'; "
+        "img-src 'self' https: data:; "
+        "style-src 'self' 'unsafe-inline'; "
+        "script-src 'self';"
+    )
     if not cookie_token:
         response.set_cookie(
             CSRF_COOKIE_NAME,
@@ -199,6 +207,63 @@ def logout(request: Request, csrf_token: str = Form(...)):
     return response
 
 
+def _empty_filters() -> dict:
+    return {
+        "days": 30,
+        "period": "days",
+        "article_type": "all",
+        "category": "",
+        "display": DEFAULT_DISPLAY,
+        "editor_tip": "",
+        "highlights": "",
+    }
+
+
+async def _generate_newsletter(
+    *,
+    period_mode: str,
+    days: int,
+    article_type: str,
+    category: str,
+    display,
+    editor_tip: str,
+    highlight_list: list[str],
+) -> dict:
+    p = resolve_period(period_mode, days)
+    result = {
+        "period": p,
+        "wiki_error": None,
+        "articles": [],
+        "articles_new": [],
+        "articles_edited": [],
+        "plain_text": "",
+        "raw_html": "",
+        "outlook_html": "",
+        "subject": "",
+    }
+    try:
+        articles = await wiki_service.get_recent_changes(
+            days=p["days"], article_type=article_type, start=p["start"], end=p["end"]
+        )
+        filtered = filter_articles(articles, category_filter=category or None)
+        new_articles, edited_articles = split_articles_by_type(filtered)
+        prange = (p["start_str"], p["end_str"])
+        result.update(
+            {
+                "articles": filtered,
+                "articles_new": new_articles,
+                "articles_edited": edited_articles,
+                "subject": create_subject(p["days"], category, p["label"]),
+                "plain_text": create_plain_text(filtered, p["days"], display, category, editor_tip, highlight_list, p["label"], prange, article_type),
+                "raw_html": create_html(filtered, p["days"], display, category, editor_tip, highlight_list, p["label"], prange, article_type),
+                "outlook_html": create_outlook_html(filtered, p["days"], display, category, editor_tip, highlight_list, p["label"], prange, article_type),
+            }
+        )
+    except WikiFetchError as exc:
+        result["wiki_error"] = exc.message
+    return result
+
+
 @app.get("/dashboard", response_class=HTMLResponse)
 async def dashboard(request: Request, db: Session = Depends(get_db), current_user: User = Depends(get_current_user)):
     context = _base_context(request, current_user, db)
@@ -209,15 +274,10 @@ async def dashboard(request: Request, db: Session = Depends(get_db), current_use
         "raw_html": "",
         "outlook_html": "",
         "plain_text": "",
-        "filters": {
+        "subject": "",
-            "days": 30,
+        "filters": _empty_filters(),
-            "only_edited": False,
-            "category": "",
-            "display": DEFAULT_DISPLAY,
-            "editor_tip": "",
-            "highlights": "",
-        },
         "wiki_error": None,
+        "send_result": None,
     })
     logs = db.query(SendLog).order_by(SendLog.created_at.desc()).limit(20).all()
     context["send_logs"] = logs
@@ -228,8 +288,9 @@ async def dashboard(request: Request, db: Session = Depends(get_db), current_use
 async def dashboard_generate(
     request: Request,
     csrf_token: str = Form(...),
+    period: str = Form("days"),
     days: int = Form(30),
-    only_edited: str | None = Form(None),
+    article_type: str = Form("all"),
     category: str = Form(""),
     show_date: str | None = Form(None),
     show_user: str | None = Form(None),
@@ -241,57 +302,57 @@ async def dashboard_generate(
 ):
     validate_csrf(request, csrf_token)
     days = max(1, min(days, 90))
-    only_edited_flag = only_edited == "true"
+    if article_type not in ("all", "new", "edited"):
+        article_type = "all"
     display = parse_display_options(show_date, show_user, show_category)
     highlight_list = parse_highlights(highlights)
-    wiki_error = None
+
-    filtered: list = []
+    gen = await _generate_newsletter(
-    articles_new: list = []
+        period_mode=period,
-    articles_edited: list = []
+        days=days,
-    plain_text = ""
+        article_type=article_type,
-    raw_html = ""
+        category=category,
-    outlook_html = ""
+        display=display,
-    try:
+        editor_tip=editor_tip,
-        articles = await wiki_service.get_recent_changes(days=days, only_edited=only_edited_flag)
+        highlight_list=highlight_list,
-        filtered = filter_articles(articles, category_filter=category or None)
+    )
-        articles_new, articles_edited = split_articles_by_type(filtered)
+    if not gen["wiki_error"]:
-        title = create_subject(days, category)
+        run_scheduled_send_if_due(db, gen["subject"], gen["raw_html"], gen["plain_text"])
-        plain_text = create_plain_text(filtered, days, display, category, editor_tip, highlight_list)
+
-        raw_html = create_html(filtered, days, display, category, editor_tip, highlight_list)
-        outlook_html = create_outlook_html(filtered, days, display, category, editor_tip, highlight_list)
-        run_scheduled_send_if_due(db, title, raw_html, plain_text)
-    except WikiFetchError as exc:
-        wiki_error = exc.message
     context = _base_context(request, current_user, db)
     context.update(
         {
-            "articles": filtered,
+            "articles": gen["articles"],
-            "articles_new": articles_new,
+            "articles_new": gen["articles_new"],
-            "articles_edited": articles_edited,
+            "articles_edited": gen["articles_edited"],
-            "raw_html": raw_html,
+            "raw_html": gen["raw_html"],
-            "outlook_html": outlook_html,
+            "outlook_html": gen["outlook_html"],
-            "plain_text": plain_text,
+            "plain_text": gen["plain_text"],
+            "subject": gen["subject"],
             "filters": {
                 "days": days,
-                "only_edited": only_edited_flag,
+                "period": period,
+                "article_type": article_type,
                 "category": category,
                 "display": display,
                 "editor_tip": editor_tip,
                 "highlights": highlights,
             },
             "send_logs": db.query(SendLog).order_by(SendLog.created_at.desc()).limit(20).all(),
-            "wiki_error": wiki_error,
+            "wiki_error": gen["wiki_error"],
+            "send_result": None,
         }
     )
     return _render(request, "dashboard.html", context)
 
 
-@app.post("/newsletter/send-now")
+@app.post("/newsletter/send-now", response_class=HTMLResponse)
 async def send_now(
     request: Request,
     csrf_token: str = Form(...),
+    period: str = Form("days"),
     days: int = Form(30),
-    only_edited: str | None = Form(None),
+    article_type: str = Form("all"),
     category: str = Form(""),
     show_date: str | None = Form(None),
     show_user: str | None = Form(None),
@@ -303,20 +364,56 @@ async def send_now(
 ):
     validate_csrf(request, csrf_token)
     display = parse_display_options(show_date, show_user, show_category)
-    only_edited_flag = only_edited == "true"
+    if article_type not in ("all", "new", "edited"):
+        article_type = "all"
     highlight_list = parse_highlights(highlights)
     days = max(1, min(days, 90))
-    try:
+
-        articles = await wiki_service.get_recent_changes(days=days, only_edited=only_edited_flag)
+    gen = await _generate_newsletter(
-    except WikiFetchError as exc:
+        period_mode=period,
-        raise HTTPException(status_code=502, detail=exc.message) from exc
+        days=days,
-    filtered = filter_articles(articles, category_filter=category or None)
+        article_type=article_type,
-    title = create_subject(days, category)
+        category=category,
-    plain_text = create_plain_text(filtered, days, display, category, editor_tip, highlight_list)
+        display=display,
-    raw_html = create_html(filtered, days, display, category, editor_tip, highlight_list)
+        editor_tip=editor_tip,
+        highlight_list=highlight_list,
+    )
+
+    send_result: dict[str, str]
+    if gen["wiki_error"]:
+        send_result = {"status": "failed", "message": f"Versand abgebrochen – Wiki-Fehler: {gen['wiki_error']}"}
+    elif not gen["articles"]:
+        send_result = {"status": "failed", "message": "Versand abgebrochen – im Zeitraum wurden keine Artikel gefunden."}
+    else:
         recipients = [r.strip() for r in get_config(db, "smtp.recipients", "").split(",") if r.strip()]
-    send_newsletter(db, title, raw_html, plain_text, recipients, scheduled=False)
+        status_code, detail = send_newsletter(db, gen["subject"], gen["raw_html"], gen["plain_text"], recipients, scheduled=False)
-    return RedirectResponse(url="/dashboard", status_code=status.HTTP_302_FOUND)
+        send_result = {"status": status_code, "message": detail}
+
+    context = _base_context(request, current_user, db)
+    context.update(
+        {
+            "articles": gen["articles"],
+            "articles_new": gen["articles_new"],
+            "articles_edited": gen["articles_edited"],
+            "raw_html": gen["raw_html"],
+            "outlook_html": gen["outlook_html"],
+            "plain_text": gen["plain_text"],
+            "subject": gen["subject"],
+            "filters": {
+                "days": days,
+                "period": period,
+                "article_type": article_type,
+                "category": category,
+                "display": display,
+                "editor_tip": editor_tip,
+                "highlights": highlights,
+            },
+            "send_logs": db.query(SendLog).order_by(SendLog.created_at.desc()).limit(20).all(),
+            "wiki_error": gen["wiki_error"],
+            "send_result": send_result,
+        }
+    )
+    return _render(request, "dashboard.html", context)
 
 
 @app.post("/admin/smtp")

app/services/newsletter.py

@@ -101,13 +101,59 @@ def split_articles_by_type(articles: list[dict[str, Any]]) -> tuple[list[dict[st
     return new_articles, edited_articles
 
 
-def create_subject(days: int, category: str = "") -> str:
+def create_subject(days: int, category: str = "", period_label: str | None = None) -> str:
-    base = f"Interner Wiki-Newsletter – {ORG_NAME} ({days} Tage)"
+    label = period_label or f"{days} Tage"
+    base = f"Interner Wiki-Newsletter – {ORG_NAME} ({label})"
     if category.strip():
         return f"{base} | Kategorie: {category.strip()}"
     return base
 
 
+_MONTHS_DE = [
+    "Januar", "Februar", "März", "April", "Mai", "Juni",
+    "Juli", "August", "September", "Oktober", "November", "Dezember",
+]
+
+
+def _month_label(dt: datetime) -> str:
+    return f"{_MONTHS_DE[dt.month - 1]} {dt.year}"
+
+
+def resolve_period(mode: str, days: int) -> dict[str, Any]:
+    """Berechnet Start/Ende und Beschriftung für einen Zeitraum-Modus.
+
+    - "last_month": voriger Kalendermonat (z. B. 01.06.–01.07.)
+    - sonst: die letzten N Tage
+    """
+    now = datetime.now()
+    if mode == "last_month":
+        first_this_month = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+        last_day_prev = first_this_month - timedelta(days=1)
+        start = last_day_prev.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+        end = first_this_month
+        return {
+            "mode": "last_month",
+            "start": start,
+            "end": end,
+            "start_str": start.strftime("%d.%m.%Y"),
+            "end_str": end.strftime("%d.%m.%Y"),
+            "label": _month_label(start),
+            "days": max(1, (end - start).days),
+        }
+    days = max(1, min(days, 90))
+    end = now
+    start = now - timedelta(days=days)
+    return {
+        "mode": "days",
+        "start": start,
+        "end": end,
+        "start_str": start.strftime("%d.%m.%Y"),
+        "end_str": end.strftime("%d.%m.%Y"),
+        "label": f"{days} Tage",
+        "days": days,
+    }
+
+
 def parse_highlights(raw: str | None) -> list[str]:
     """Zerlegt das Highlight-Eingabefeld (Titel pro Zeile) in eine Liste."""
     if not raw:
@@ -155,17 +201,23 @@ def create_plain_text(
     category: str = "",
     editor_tip: str = "",
     highlights: list[str] | None = None,
+    period_label: str | None = None,
+    period: tuple[str, str] | None = None,
+    article_type: str = "all",
 ) -> str:
     display = display or DEFAULT_DISPLAY
     new_articles, edited_articles = split_articles_by_type(articles)
-    period_start, period_end = _period_range(days)
+    show_new = article_type in ("all", "new")
+    show_edited = article_type in ("all", "edited")
+    period_start, period_end = period if period else _period_range(days)
+    period_desc = period_label or f"{days} Tage"
     created_at = datetime.now().strftime("%d.%m.%Y %H:%M")
 
     lines = [
         LINE,
         f"{ORG_NAME.upper()} – INTERNER WIKI-NEWSLETTER",
         LINE,
-        f"Zeitraum:     {period_start} bis {period_end} ({days} Tage)",
+        f"Zeitraum:     {period_start} bis {period_end} ({period_desc})",
         f"Erstellt am:  {created_at}",
     ]
     if category.strip():
@@ -202,8 +254,10 @@ def create_plain_text(
         lines.append(_plain_footer(new_articles, edited_articles))
         return "\n".join(lines).strip()
 
+    if show_new:
         lines.extend(_plain_section("NEUE ARTIKEL", new_articles, display, empty_text="Keine neuen Artikel im Zeitraum."))
         lines.append("")
+    if show_edited:
         lines.extend(
             _plain_section(
                 "BEARBEITETE ARTIKEL",
@@ -239,12 +293,17 @@ def create_html(
     category: str = "",
     editor_tip: str = "",
     highlights: list[str] | None = None,
+    period_label: str | None = None,
+    period: tuple[str, str] | None = None,
+    article_type: str = "all",
 ) -> str:
     display = display or DEFAULT_DISPLAY
     new_articles, edited_articles = split_articles_by_type(articles)
-    period_start, period_end = _period_range(days)
+    show_new = article_type in ("all", "new")
+    show_edited = article_type in ("all", "edited")
+    period_start, period_end = period if period else _period_range(days)
     total = len(new_articles) + len(edited_articles)
-    subject = escape(create_subject(days, category))
+    subject = escape(create_subject(days, category, period_label))
     preheader = escape(_summary_sentence(total))
     period_label = escape(f"{period_start} – {period_end}")
     summary_text = escape(_summary_sentence(total))
@@ -255,12 +314,12 @@ def create_html(
     if not new_articles and not edited_articles:
         body = _html_empty_card("Für diesen Zeitraum wurden keine passenden Wiki-Änderungen gefunden.")
     else:
-        body = "\n".join(
+        sections = []
-            [
+        if show_new:
-                _html_section("Neue Artikel", new_articles, display, "Keine neuen Artikel im Zeitraum.", kind="new"),
+            sections.append(_html_section("Neue Artikel", new_articles, display, "Keine neuen Artikel im Zeitraum.", kind="new"))
-                _html_section("Bearbeitete Artikel", edited_articles, display, "Keine bearbeiteten Artikel im Zeitraum.", kind="edited"),
+        if show_edited:
-            ]
+            sections.append(_html_section("Bearbeitete Artikel", edited_articles, display, "Keine bearbeiteten Artikel im Zeitraum.", kind="edited"))
-        )
+        body = "\n".join(sections)
 
     summary_section = (
         f'<tr><td style="padding:24px 32px 0 32px;" class="mobile-padding">{_html_summary(new_articles, edited_articles)}</td></tr>'
@@ -616,13 +675,18 @@ def create_outlook_html(
     category: str = "",
     editor_tip: str = "",
     highlights: list[str] | None = None,
+    period_label: str | None = None,
+    period: tuple[str, str] | None = None,
+    article_type: str = "all",
 ) -> str:
     """Word/Outlook-kompatibles HTML mit font-Tags und bgcolor (überlebt Einfügen in Outlook)."""
     display = display or DEFAULT_DISPLAY
     new_articles, edited_articles = split_articles_by_type(articles)
-    period_start, period_end = _period_range(days)
+    show_new = article_type in ("all", "new")
+    show_edited = article_type in ("all", "edited")
+    period_start, period_end = period if period else _period_range(days)
     total = len(new_articles) + len(edited_articles)
-    subject = escape(create_subject(days, category))
+    subject = escape(create_subject(days, category, period_label))
     period_label = f"{period_start} – {period_end}"
     summary_text = _summary_sentence(total)
 
@@ -636,18 +700,12 @@ def create_outlook_html(
   </td>
 </tr>"""
     else:
-        body_rows = "\n".join(
+        sections = []
-            [
+        if show_new:
-                _outlook_section("Neue Artikel", new_articles, display, "Keine neuen Artikel im Zeitraum.", kind="new"),
+            sections.append(_outlook_section("Neue Artikel", new_articles, display, "Keine neuen Artikel im Zeitraum.", kind="new"))
-                _outlook_section(
+        if show_edited:
-                    "Bearbeitete Artikel",
+            sections.append(_outlook_section("Bearbeitete Artikel", edited_articles, display, "Keine bearbeiteten Artikel im Zeitraum.", kind="edited"))
-                    edited_articles,
+        body_rows = "\n".join(sections)
-                    display,
-                    "Keine bearbeiteten Artikel im Zeitraum.",
-                    kind="edited",
-                ),
-            ]
-        )
 
     category_block = ""
     if category.strip():

app/services/smtp_sender.py

@@ -32,14 +32,16 @@ def send_newsletter(
     text_content: str,
     recipients: Sequence[str],
     scheduled: bool = False,
-) -> None:
+) -> tuple[str, str]:
     settings = get_smtp_settings(db)
     if settings["enabled"].lower() != "true":
-        _log(db, subject, recipients, "skipped", "SMTP ist deaktiviert.", scheduled)
+        detail = "SMTP ist deaktiviert. Bitte in der SMTP-Konfiguration aktivieren."
-        return
+        _log(db, subject, recipients, "skipped", detail, scheduled)
+        return "skipped", detail
     if not settings["host"] or not settings["from_email"] or not recipients:
-        _log(db, subject, recipients, "failed", "SMTP unvollständig konfiguriert.", scheduled)
+        detail = "SMTP unvollständig konfiguriert (Host, Absender oder Empfänger fehlen)."
-        return
+        _log(db, subject, recipients, "failed", detail, scheduled)
+        return "failed", detail
 
     msg = MIMEMultipart("alternative")
     msg.attach(MIMEText(text_content, "plain", "utf-8"))
@@ -56,9 +58,13 @@ def send_newsletter(
             if settings["username"]:
                 server.login(settings["username"], settings["password"])
             server.sendmail(settings["from_email"], list(recipients), msg.as_string())
-        _log(db, subject, recipients, "sent", "Versand erfolgreich.", scheduled)
+        detail = f"Versand erfolgreich an {len(recipients)} Empfänger."
+        _log(db, subject, recipients, "sent", detail, scheduled)
+        return "sent", detail
     except Exception as exc:
-        _log(db, subject, recipients, "failed", f"Versandfehler: {exc}", scheduled)
+        detail = f"Versandfehler: {exc}"
+        _log(db, subject, recipients, "failed", detail, scheduled)
+        return "failed", detail
 
 
 def run_scheduled_send_if_due(db: Session, subject: str, html_content: str, text_content: str) -> None:

app/services/wiki.py

@@ -19,11 +19,18 @@ class WikiService:
     def __init__(self) -> None:
         self.api_url = settings.wiki_api_url
 
-    async def get_recent_changes(self, days: int = 30, only_edited: bool = False) -> list[dict[str, Any]]:
+    async def get_recent_changes(
-        now = datetime.now(timezone.utc)
+        self,
-        start = now - timedelta(days=days)
+        days: int = 30,
-        rcstart = now.strftime("%Y-%m-%dT%H:%M:%SZ")
+        article_type: str = "all",
-        rcend = start.strftime("%Y-%m-%dT%H:%M:%SZ")
+        start: datetime | None = None,
+        end: datetime | None = None,
+    ) -> list[dict[str, Any]]:
+        # MediaWiki listet neueste Änderungen zuerst: rcstart = obere (neuere) Grenze, rcend = untere (ältere).
+        upper = end or datetime.now(timezone.utc)
+        lower = start or (upper - timedelta(days=days))
+        rcstart = upper.strftime("%Y-%m-%dT%H:%M:%SZ")
+        rcend = lower.strftime("%Y-%m-%dT%H:%M:%SZ")
 
         params: dict[str, str] = {
             "action": "query",
@@ -35,7 +42,9 @@ class WikiService:
             "rcend": rcend,
             "rcnamespace": "0",
         }
-        if only_edited:
+        if article_type == "new":
+            params["rctype"] = "new"
+        elif article_type == "edited":
             params["rctype"] = "edit"
         else:
             params["rctype"] = "new|edit"

app/static/css/main.css

@@ -510,6 +510,42 @@ tbody tr:hover { background: #FAFAFA; }
     display: block;
 }
 
+.send-section {
+    margin-top: 1.25rem;
+    padding: 1rem 1.1rem;
+    border: 1px solid var(--tk-border);
+    border-left: 4px solid var(--tk-orange);
+    border-radius: var(--radius);
+    background: var(--tk-gray-light);
+}
+
+.send-banner {
+    margin-top: 1rem;
+    padding: 0.75rem 1rem;
+    border-radius: var(--radius);
+    font-size: 0.9rem;
+    font-weight: 600;
+    border: 1px solid transparent;
+}
+
+.send-banner-sent {
+    background: #E7F5EC;
+    color: #1E7A43;
+    border-color: #B7E0C6;
+}
+
+.send-banner-failed {
+    background: #FDEAEA;
+    color: #B42318;
+    border-color: #F5C2C0;
+}
+
+.send-banner-skipped {
+    background: var(--tk-orange-light);
+    color: var(--tk-orange-dark);
+    border-color: #F5C9A6;
+}
+
 .textarea-actions {
     display: flex;
     gap: 0.5rem;

app/templates/dashboard.html

@@ -35,16 +35,27 @@
             <form method="post" action="/dashboard" class="form-grid">
                 <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                 <div class="form-row">
-                    <label>Zeitraum (Tage)
+                    <label>Zeitraum
+                        <select name="period">
+                            <option value="days" {% if filters.period != 'last_month' %}selected{% endif %}>Letzte X Tage</option>
+                            <option value="last_month" {% if filters.period == 'last_month' %}selected{% endif %}>Letzter Monat (voller Kalendermonat)</option>
+                        </select>
+                    </label>
+                    <label>Tage (nur bei „Letzte X Tage“)
                         <input type="number" name="days" min="1" max="90" value="{{ filters.days }}">
                     </label>
+                </div>
+                <div class="form-row">
                     <label>Kategorie (optional)
                         <input type="text" name="category" value="{{ filters.category }}" placeholder="z. B. Linux">
                     </label>
                 </div>
-                <label class="checkbox">
+                <label>Artikel-Auswahl
-                    <input type="checkbox" name="only_edited" value="true" {% if filters.only_edited %}checked{% endif %}>
+                    <select name="article_type">
-                    Nur bearbeitete Artikel (keine neu erstellten)
+                        <option value="all" {% if filters.article_type == 'all' %}selected{% endif %}>Alle (neue &amp; bearbeitete)</option>
+                        <option value="new" {% if filters.article_type == 'new' %}selected{% endif %}>Nur neue Artikel</option>
+                        <option value="edited" {% if filters.article_type == 'edited' %}selected{% endif %}>Nur bearbeitete Artikel (keine neu erstellten)</option>
+                    </select>
                 </label>
                 <fieldset class="display-options">
                     <legend>Anzeige im Newsletter</legend>
@@ -100,8 +111,42 @@
             <textarea id="newsletter-html-source" class="hidden-source" hidden readonly>{{ raw_html }}</textarea>
             <textarea id="newsletter-outlook-source" class="hidden-source" hidden readonly>{{ outlook_html }}</textarea>
             <textarea id="newsletter-plain-source" class="hidden-source" hidden readonly>{{ plain_text }}</textarea>
+
+            {% if send_result %}
+            <div class="send-banner send-banner-{{ send_result.status }}">{{ send_result.message }}</div>
+            {% endif %}
+
+            {% if raw_html and (articles_new or articles_edited) %}
+            <div class="send-section">
+                <h4 style="margin:0 0 0.35rem;">Per E-Mail versenden</h4>
+                <p class="hint" style="margin:0 0 0.75rem;">Bitte oben die Vorschau prüfen. Beim Versenden wird genau dieser Newsletter (aktuelle Filter) an die Verteilerliste geschickt.</p>
+                <p class="hint" style="margin:0 0 0.75rem;">
+                    <strong>Betreff:</strong> {{ subject }}<br>
+                    <strong>Empfänger:</strong> {{ smtp.recipients if smtp.recipients else "— keine konfiguriert —" }}
+                    {% if smtp.enabled != "true" %}<br><strong style="color:var(--tk-orange-dark);">SMTP ist deaktiviert</strong> – bitte zuerst in „SMTP-Konfiguration“ aktivieren.{% endif %}
+                </p>
+                {% if user.role in ["admin", "editor"] %}
+                <form method="post" action="/newsletter/send-now" onsubmit="return confirm('Diesen Newsletter jetzt per E-Mail an die Verteilerliste senden?');">
+                    <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
+                    <input type="hidden" name="period" value="{{ filters.period }}">
+                    <input type="hidden" name="days" value="{{ filters.days }}">
+                    <input type="hidden" name="category" value="{{ filters.category }}">
+                    <input type="hidden" name="article_type" value="{{ filters.article_type }}">
+                    <input type="hidden" name="show_date" value="{{ 'true' if filters.display.show_date else 'false' }}">
+                    <input type="hidden" name="show_user" value="{{ 'true' if filters.display.show_user else 'false' }}">
+                    <input type="hidden" name="show_category" value="{{ 'true' if filters.display.show_category else 'false' }}">
+                    <input type="hidden" name="highlights" value="{{ filters.highlights }}">
+                    <input type="hidden" name="editor_tip" value="{{ filters.editor_tip }}">
+                    <button type="submit" class="btn-primary">Newsletter jetzt senden</button>
+                </form>
+                {% else %}
+                <p class="hint">Sie haben Leserechte – Versand nur für Editor/Admin.</p>
+                {% endif %}
+            </div>
+            {% endif %}
         </section>
 
+        {% if filters.article_type != 'edited' %}
         <section class="card card-accent-gray">
             <div class="card-header">
                 <h3>Neue Artikel <span class="count-badge orange">{{ articles_new|length }}</span></h3>
@@ -131,7 +176,9 @@
                 </table>
             </div>
         </section>
+        {% endif %}
 
+        {% if filters.article_type != 'new' %}
         <section class="card card-accent-gray">
             <div class="card-header">
                 <h3>Bearbeitete Artikel <span class="count-badge">{{ articles_edited|length }}</span></h3>
@@ -161,6 +208,7 @@
                 </table>
             </div>
         </section>
+        {% endif %}
 
         <details class="card-details">
             <summary>Weitere Ausgabeformate</summary>
@@ -179,27 +227,6 @@
             </div>
         </details>
 
-        {% if user.role in ["admin", "editor"] %}
-        <details class="card-details">
-            <summary>SMTP-Versand</summary>
-            <div class="details-body">
-                <p class="hint">Newsletter direkt per E-Mail versenden (aktuell gewählte Filter).</p>
-                <form method="post" action="/newsletter/send-now">
-                    <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
-                    <input type="hidden" name="days" value="{{ filters.days }}">
-                    <input type="hidden" name="category" value="{{ filters.category }}">
-                    <input type="hidden" name="only_edited" value="{{ 'true' if filters.only_edited else 'false' }}">
-                    <input type="hidden" name="show_date" value="{{ 'true' if filters.display.show_date else 'false' }}">
-                    <input type="hidden" name="show_user" value="{{ 'true' if filters.display.show_user else 'false' }}">
-                    <input type="hidden" name="show_category" value="{{ 'true' if filters.display.show_category else 'false' }}">
-                    <input type="hidden" name="highlights" value="{{ filters.highlights }}">
-                    <input type="hidden" name="editor_tip" value="{{ filters.editor_tip }}">
-                    <button type="submit" class="btn-secondary">Newsletter jetzt senden</button>
-                </form>
-            </div>
-        </details>
-        {% endif %}
-
         {% if user.role == "admin" %}
         <details class="card-details">
             <summary>SMTP-Konfiguration</summary>

preview_send.html

@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Interner Wiki-Newsletter – Thomas-Krenn.AG (30 Tage)</title>
+  <style type="text/css">
+    html, body { margin:0 !important; padding:0 !important; width:100% !important; background:#ECEEF1; }
+    table, td { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }
+    img { border:0; outline:none; text-decoration:none; -ms-interpolation-mode:bicubic; }
+    a { text-decoration:none; }
+    .preheader { display:none !important; visibility:hidden; opacity:0; color:transparent; height:0; width:0; max-height:0; max-width:0; overflow:hidden; mso-hide:all; }
+    @media only screen and (max-width: 700px) {
+      .email-container { width:100% !important; }
+      .mobile-padding { padding-left:16px !important; padding-right:16px !important; }
+      .mobile-headline { font-size:28px !important; line-height:34px !important; }
+      .mobile-card-title { font-size:18px !important; line-height:25px !important; }
+    }
+  </style>
+  <!--[if mso]>
+  <style type="text/css">
+    body, table, td, p, a, li, h1, h2, h3, span, strong { font-family: Arial, sans-serif !important; }
+  </style>
+  <![endif]-->
+</head>
+<body style="margin:0;padding:0;background:#ECEEF1;font-family:Arial, Helvetica, sans-serif;color:#1A1A1A;">
+  <div class="preheader">Es gibt 3 neue bzw. aktualisierte Wiki-Artikel.&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;</div>
+  <center role="article" aria-roledescription="email" lang="de" style="width:100%;background:#ECEEF1;">
+    <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#ECEEF1" style="width:100%;background:#ECEEF1;">
+      <tr>
+        <td align="center" style="padding:22px 10px;">
+          <table role="presentation" width="700" cellpadding="0" cellspacing="0" border="0" class="email-container" style="width:100%;max-width:700px;background:#FFFFFF;border-top:4px solid #ED6B06;">
+            <tr>
+              <td align="center" style="padding:24px 32px 18px 32px;background:#4A4A4A;" class="mobile-padding">
+                <img src="https://www.thomas-krenn.com/res/pics/tk_logo_340px.png" width="190" alt="Thomas-Krenn Logo" style="display:block;margin:0 auto;border:0;outline:none;text-decoration:none;height:auto;">
+              </td>
+            </tr>
+            <tr>
+              <td style="padding:0 32px;" class="mobile-padding">
+                <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#4A4A4A;">
+                  <tr>
+                    <td style="padding:28px 26px;font-family:Arial, Helvetica, sans-serif;">
+                      <div style="font-size:12px;line-height:16px;font-weight:bold;color:#ED6B06;letter-spacing:1px;text-transform:uppercase;">Thomas-Krenn Wiki Update</div>
+                      <div class="mobile-headline" style="font-size:32px;line-height:38px;font-weight:bold;color:#FFFFFF;margin-top:10px;">Die neuesten Wiki-Artikel</div>
+                      <div style="font-size:16px;line-height:25px;color:#DDDDDD;margin-top:10px;">07.06.2026 – 07.07.2026 &nbsp;|&nbsp; Es gibt 3 neue bzw. aktualisierte Wiki-Artikel.</div>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td style="padding:22px 32px 6px 32px;" class="mobile-padding">
+                <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:#FFF4ED;border-left:4px solid #ED6B06;">
+                  <tr>
+                    <td style="padding:18px 20px;font-family:Arial, Helvetica, sans-serif;font-size:15px;line-height:24px;color:#1A1A1A;">
+                      <p style="margin:0 0 10px;font-family:Arial, Helvetica, sans-serif;">Servus,</p>
+                      <p style="margin:0;font-family:Arial, Helvetica, sans-serif;">hier ist deine Übersicht mit den neuesten Beiträgen aus dem Thomas-Krenn-Wiki vom 07.06.2026 bis 07.07.2026.</p>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            
+            <tr><td style="padding:8px 32px 4px 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#FFF4ED;border:1px solid #F5C9A6;border-radius:12px;"><tr><td style="padding:16px 18px 8px 18px;font-family:Arial, Helvetica, sans-serif;font-size:11px;line-height:15px;color:#C95605;font-weight:bold;letter-spacing:.8px;text-transform:uppercase;">Top Highlights</td></tr><tr><td style="padding:0 18px 12px 18px;"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding:0 0 8px 0;font-family:Arial, Helvetica, sans-serif;font-size:15px;line-height:22px;color:#1A1A1A;"><span style="display:inline-block;min-width:22px;font-weight:bold;color:#ED6B06;">1.</span> <a href="https://www.thomas-krenn.com/de/wiki/RAID_Grundlagen_und_Konfiguration" target="_blank" style="color:#1A1A1A;text-decoration:none;">RAID Grundlagen und Konfiguration</a></td></tr></table></td></tr></table></td></tr>
+            <tr><td style="padding:26px 32px 8px 32px;font-family:Arial, Helvetica, sans-serif;" class="mobile-padding"><div style="font-family:Arial, Helvetica, sans-serif;font-size:18px;line-height:24px;font-weight:bold;color:#4A4A4A;border-bottom:2px solid #ED6B06;padding-bottom:8px;">Neue Artikel <span style="color:#ED6B06;">(2)</span></div></td></tr><tr><td style="padding:0 32px 16px 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#FFFFFF;border:1px solid #E0E0E0;border-left:4px solid #ED6B06;border-radius:12px;"><tr><td style="padding:16px 22px 4px 22px;font-family:Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;font-weight:bold;letter-spacing:.7px;text-transform:uppercase;color:#ED6B06;">1. Neuer Beitrag</td></tr><tr><td class="mobile-card-title" style="padding:0 22px 8px 22px;font-family:Arial, Helvetica, sans-serif;font-size:20px;line-height:27px;font-weight:bold;color:#4A4A4A;"><a href="https://www.thomas-krenn.com/de/wiki/Proxmox_VE_Cluster_einrichten" target="_blank" style="color:#4A4A4A;text-decoration:none;">Proxmox VE Cluster einrichten</a></td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:13px;line-height:20px;color:#6B6B6B;">Veröffentlicht am 02.07.2026 14:10 von AnnaSchmidt.</td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:18px;color:#6B6B6B;">Kategorie: Virtualisierung</td></tr><tr><td style="padding:2px 22px 18px 22px;"><table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin:0 auto;"><tr><td bgcolor="#ED6B06" style="background:#ED6B06;border-radius:6px;"><a href="https://www.thomas-krenn.com/de/wiki/Proxmox_VE_Cluster_einrichten" target="_blank" style="display:inline-block;padding:12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:14px;line-height:18px;font-weight:bold;color:#FFFFFF;text-decoration:none;">Zum Beitrag →</a></td></tr></table></td></tr></table></td></tr><tr><td style="padding:0 32px 16px 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#FFFFFF;border:1px solid #E0E0E0;border-left:4px solid #ED6B06;border-radius:12px;"><tr><td style="padding:16px 22px 4px 22px;font-family:Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;font-weight:bold;letter-spacing:.7px;text-transform:uppercase;color:#ED6B06;">2. Neuer Beitrag</td></tr><tr><td class="mobile-card-title" style="padding:0 22px 8px 22px;font-family:Arial, Helvetica, sans-serif;font-size:20px;line-height:27px;font-weight:bold;color:#4A4A4A;"><a href="https://www.thomas-krenn.com/de/wiki/RAID_Grundlagen_und_Konfiguration" target="_blank" style="color:#4A4A4A;text-decoration:none;">RAID Grundlagen und Konfiguration</a></td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:13px;line-height:20px;color:#6B6B6B;">Veröffentlicht am 01.07.2026 09:30 von MaxMuster.</td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:18px;color:#6B6B6B;">Kategorie: Storage, Linux</td></tr><tr><td style="padding:2px 22px 18px 22px;"><table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin:0 auto;"><tr><td bgcolor="#ED6B06" style="background:#ED6B06;border-radius:6px;"><a href="https://www.thomas-krenn.com/de/wiki/RAID_Grundlagen_und_Konfiguration" target="_blank" style="display:inline-block;padding:12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:14px;line-height:18px;font-weight:bold;color:#FFFFFF;text-decoration:none;">Zum Beitrag →</a></td></tr></table></td></tr></table></td></tr>
+<tr><td style="padding:26px 32px 8px 32px;font-family:Arial, Helvetica, sans-serif;" class="mobile-padding"><div style="font-family:Arial, Helvetica, sans-serif;font-size:18px;line-height:24px;font-weight:bold;color:#4A4A4A;border-bottom:2px solid #4A4A4A;padding-bottom:8px;">Bearbeitete Artikel <span style="color:#4A4A4A;">(1)</span></div></td></tr><tr><td style="padding:0 32px 16px 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#FFFFFF;border:1px solid #E0E0E0;border-left:4px solid #4A4A4A;border-radius:12px;"><tr><td style="padding:16px 22px 4px 22px;font-family:Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;font-weight:bold;letter-spacing:.7px;text-transform:uppercase;color:#4A4A4A;">1. Aktualisierter Beitrag</td></tr><tr><td class="mobile-card-title" style="padding:0 22px 8px 22px;font-family:Arial, Helvetica, sans-serif;font-size:20px;line-height:27px;font-weight:bold;color:#4A4A4A;"><a href="https://www.thomas-krenn.com/de/wiki/ESXi_8_Update_Hinweise" target="_blank" style="color:#4A4A4A;text-decoration:none;">ESXi 8 Update Hinweise</a></td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:13px;line-height:20px;color:#6B6B6B;">Veröffentlicht am 03.07.2026 12:00 von TomWeber.</td></tr><tr><td style="padding:0 22px 12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:18px;color:#6B6B6B;">Kategorie: VMware</td></tr><tr><td style="padding:2px 22px 18px 22px;"><table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin:0 auto;"><tr><td bgcolor="#ED6B06" style="background:#ED6B06;border-radius:6px;"><a href="https://www.thomas-krenn.com/de/wiki/ESXi_8_Update_Hinweise" target="_blank" style="display:inline-block;padding:12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:14px;line-height:18px;font-weight:bold;color:#FFFFFF;text-decoration:none;">Zum Beitrag →</a></td></tr></table></td></tr></table></td></tr>
+            <tr><td style="padding:24px 32px 0 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-top:4px;font-family:Arial, Helvetica, sans-serif;">
+  <tr>
+    <td style="padding:0 0 10px;font-family:Arial, Helvetica, sans-serif;font-size:14px;line-height:20px;font-weight:bold;color:#4A4A4A;">Zusammenfassung</td>
+  </tr>
+  <tr>
+    <td style="font-family:Arial, Helvetica, sans-serif;">
+      <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="font-family:Arial, Helvetica, sans-serif;">
+        <tr>
+          <td width="33%" style="padding:18px 12px;background:#FFF4ED;border:1px solid #E0E0E0;text-align:center;font-family:Arial, Helvetica, sans-serif;">
+            <div style="font-family:Arial, Helvetica, sans-serif;font-size:28px;line-height:32px;font-weight:bold;color:#ED6B06;">2</div>
+            <div style="margin-top:4px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:16px;color:#6B6B6B;">Neue Artikel</div>
+          </td>
+          <td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
+          <td width="33%" style="padding:18px 12px;background:#EEEEEE;border:1px solid #E0E0E0;text-align:center;font-family:Arial, Helvetica, sans-serif;">
+            <div style="font-family:Arial, Helvetica, sans-serif;font-size:28px;line-height:32px;font-weight:bold;color:#4A4A4A;">1</div>
+            <div style="margin-top:4px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:16px;color:#6B6B6B;">Bearbeitet</div>
+          </td>
+          <td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
+          <td width="33%" style="padding:18px 12px;background:#F5F5F5;border:1px solid #E0E0E0;text-align:center;font-family:Arial, Helvetica, sans-serif;">
+            <div style="font-family:Arial, Helvetica, sans-serif;font-size:28px;line-height:32px;font-weight:bold;color:#4A4A4A;">3</div>
+            <div style="margin-top:4px;font-family:Arial, Helvetica, sans-serif;font-size:12px;line-height:16px;color:#6B6B6B;">Gesamt</div>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table></td></tr>
+            <tr><td style="padding:16px 32px 4px 32px;" class="mobile-padding"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:#F5F5F5;border:1px solid #E0E0E0;border-radius:12px;"><tr><td style="padding:16px 18px 8px 18px;font-family:Arial, Helvetica, sans-serif;font-size:11px;line-height:15px;color:#4A4A4A;font-weight:bold;letter-spacing:.8px;text-transform:uppercase;">Redaktionsnotiz</td></tr><tr><td style="padding:0 18px 16px 18px;font-family:Arial, Helvetica, sans-serif;font-size:15px;line-height:24px;color:#1A1A1A;">Bitte gebt bis Freitag Feedback zu den neuen RAID-Artikeln.</td></tr></table></td></tr>
+            <tr>
+              <td align="center" style="padding:28px 32px 4px 32px;" class="mobile-padding">
+                <table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin:0 auto;"><tr><td bgcolor="#ED6B06" style="background:#ED6B06;border-radius:6px;"><a href="https://www.thomas-krenn.com/de/wiki/Hauptseite" target="_blank" style="display:inline-block;padding:12px 22px;font-family:Arial, Helvetica, sans-serif;font-size:14px;line-height:18px;font-weight:bold;color:#FFFFFF;text-decoration:none;">Zum Thomas-Krenn-Wiki →</a></td></tr></table>
+              </td>
+            </tr>
+            <tr>
+              <td style="padding:24px 32px 28px 32px;" class="mobile-padding">
+                <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0">
+                  <tr>
+                    <td style="font-family:Arial, Helvetica, sans-serif;font-size:15px;line-height:24px;color:#1A1A1A;">
+                      Fragen oder ein Themenwunsch? Meldet euch gern beim Wiki-Team.<br><br>
+                      Viele Grüße<br>
+                      Euer Thomas-Krenn-Wiki Team
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td style="background:#4A4A4A;padding:22px 20px;text-align:center;font-family:Arial, Helvetica, sans-serif;">
+                <div style="font-size:12px;line-height:19px;color:#EEF0F2;">
+                  Thomas-Krenn.AG | Speltenbach-Steinäcker 1 | D-94078 Freyung<br>
+                  Tel.: +49 8551 9150 0 | Fax: +49 8551 9150 55 |
+                  <a href="https://www.thomas-krenn.com/de/wiki/Hauptseite" target="_blank" style="color:#ED6B06;text-decoration:underline;">thomas-krenn.com</a><br>
+                  <span style="color:#AEB2B7;">Automatisch erstellter interner Newsletter &middot; Nur für den internen Gebrauch</span>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </center>
+</body>
+</html>