smueller/TK-Wiki-Newsletter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance newsletter generation with editorial features

Browse Source 
- Introduce optional fields for "Top Highlights" and "Editorial Note" in the newsletter dashboard, allowing editors to highlight key articles and provide additional context.
- Update the HTML and plain text generation functions to incorporate these new fields, ensuring they are displayed correctly in the newsletter output.
- Modify the dashboard template to include input areas for these new features, improving the user interface for newsletter creation.
This commit is contained in:
smueller
2026-07-07 13:26:26 +02:00
parent b35c524ba5
commit 83e6908f9f
4 changed files with 483 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -10,7 +10,13 @@ Produktionsnahes internes Tool zur Erstellung von Thomas-Krenn.AG Newslettern au
- Zeitraum in Tagen - Zeitraum in Tagen
- Nur bearbeitete Artikel - Nur bearbeitete Artikel
- Kategorie - Kategorie
- Redaktioneller Feinschliff pro Ausgabe:
- **Redaktionsnotiz** – optionaler Hinweistext, der als eigene Box im Newsletter erscheint
- **Top-Highlights** – bis zu 3 Artikel per Titel hervorheben (erscheinen oben als Highlight-Box)
- Datenquelle: MediaWiki API (`recentchanges` über `wikiDE/api.php`) - Datenquelle: MediaWiki API (`recentchanges` über `wikiDE/api.php`)
- E-Mail-Layout im Thomas-Krenn Corporate Design:
- Hero-Header mit Logo, Artikel-Karten mit „Zum Beitrag“-Button, Kontakt- und Adress-Footer
- Neu-/Bearbeitet-Trennung, Zusammenfassungs-Kacheln, Outlook-taugliche Kopiervorschau
- Export: - Export:
- Plain Text (für Outlook) - Plain Text (für Outlook)
- Raw HTML - Raw HTML

26
app/main.py
View File

@@ -29,6 +29,7 @@ from app.services.newsletter import (
create_subject, create_subject,
filter_articles, filter_articles,
parse_display_options, parse_display_options,
parse_highlights,
split_articles_by_type, split_articles_by_type,
) )
from app.services.smtp_sender import get_smtp_settings, run_scheduled_send_if_due, send_newsletter from app.services.smtp_sender import get_smtp_settings, run_scheduled_send_if_due, send_newsletter
@@ -213,6 +214,8 @@ async def dashboard(request: Request, db: Session = Depends(get_db), current_use
"only_edited": False, "only_edited": False,
"category": "", "category": "",
"display": DEFAULT_DISPLAY, "display": DEFAULT_DISPLAY,
"editor_tip": "",
"highlights": "",
}, },
"wiki_error": None, "wiki_error": None,
}) })
@@ -231,6 +234,8 @@ async def dashboard_generate(
show_date: str | None = Form(None), show_date: str | None = Form(None),
show_user: str | None = Form(None), show_user: str | None = Form(None),
show_category: str | None = Form(None), show_category: str | None = Form(None),
editor_tip: str = Form(""),
highlights: str = Form(""),
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: User = Depends(require_editor_or_admin), current_user: User = Depends(require_editor_or_admin),
): ):
@@ -238,6 +243,7 @@ async def dashboard_generate(
days = max(1, min(days, 90)) days = max(1, min(days, 90))
only_edited_flag = only_edited == "true" only_edited_flag = only_edited == "true"
display = parse_display_options(show_date, show_user, show_category) display = parse_display_options(show_date, show_user, show_category)
highlight_list = parse_highlights(highlights)
wiki_error = None wiki_error = None
filtered: list = [] filtered: list = []
articles_new: list = [] articles_new: list = []
@@ -250,9 +256,9 @@ async def dashboard_generate(
filtered = filter_articles(articles, category_filter=category or None) filtered = filter_articles(articles, category_filter=category or None)
articles_new, articles_edited = split_articles_by_type(filtered) articles_new, articles_edited = split_articles_by_type(filtered)
title = create_subject(days, category) title = create_subject(days, category)
plain_text = create_plain_text(filtered, days, display, category) plain_text = create_plain_text(filtered, days, display, category, editor_tip, highlight_list)
raw_html = create_html(filtered, days, display, category) raw_html = create_html(filtered, days, display, category, editor_tip, highlight_list)
outlook_html = create_outlook_html(filtered, days, display, category) outlook_html = create_outlook_html(filtered, days, display, category, editor_tip, highlight_list)
run_scheduled_send_if_due(db, title, raw_html, plain_text) run_scheduled_send_if_due(db, title, raw_html, plain_text)
except WikiFetchError as exc: except WikiFetchError as exc:
wiki_error = exc.message wiki_error = exc.message
@@ -270,6 +276,8 @@ async def dashboard_generate(
"only_edited": only_edited_flag, "only_edited": only_edited_flag,
"category": category, "category": category,
"display": display, "display": display,
"editor_tip": editor_tip,
"highlights": highlights,
}, },
"send_logs": db.query(SendLog).order_by(SendLog.created_at.desc()).limit(20).all(), "send_logs": db.query(SendLog).order_by(SendLog.created_at.desc()).limit(20).all(),
"wiki_error": wiki_error, "wiki_error": wiki_error,
@@ -288,20 +296,24 @@ async def send_now(
show_date: str | None = Form(None), show_date: str | None = Form(None),
show_user: str | None = Form(None), show_user: str | None = Form(None),
show_category: str | None = Form(None), show_category: str | None = Form(None),
editor_tip: str = Form(""),
highlights: str = Form(""),
db: Session = Depends(get_db), db: Session = Depends(get_db),
current_user: User = Depends(require_editor_or_admin), current_user: User = Depends(require_editor_or_admin),
): ):
validate_csrf(request, csrf_token) validate_csrf(request, csrf_token)
display = parse_display_options(show_date, show_user, show_category) display = parse_display_options(show_date, show_user, show_category)
only_edited_flag = only_edited == "true" only_edited_flag = only_edited == "true"
highlight_list = parse_highlights(highlights)
days = max(1, min(days, 90))
try: try:
articles = await wiki_service.get_recent_changes(days=max(1, min(days, 90)), only_edited=only_edited_flag) articles = await wiki_service.get_recent_changes(days=days, only_edited=only_edited_flag)
except WikiFetchError as exc: except WikiFetchError as exc:
raise HTTPException(status_code=502, detail=exc.message) from exc raise HTTPException(status_code=502, detail=exc.message) from exc
filtered = filter_articles(articles, category_filter=category or None) filtered = filter_articles(articles, category_filter=category or None)
title = create_subject(max(1, min(days, 90)), category) title = create_subject(days, category)
plain_text = create_plain_text(filtered, max(1, min(days, 90)), display, category) plain_text = create_plain_text(filtered, days, display, category, editor_tip, highlight_list)
raw_html = create_html(filtered, max(1, min(days, 90)), display, category) raw_html = create_html(filtered, days, display, category, editor_tip, highlight_list)
recipients = [r.strip() for r in get_config(db, "smtp.recipients", "").split(",") if r.strip()] 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) send_newsletter(db, title, raw_html, plain_text, recipients, scheduled=False)
return RedirectResponse(url="/dashboard", status_code=status.HTTP_302_FOUND) return RedirectResponse(url="/dashboard", status_code=status.HTTP_302_FOUND)

695
app/services/newsletter.py
View File

@@ -6,6 +6,7 @@ from urllib.parse import quote
WIKI_ARTICLE_BASE = "https://www.thomas-krenn.com/de/wiki/" WIKI_ARTICLE_BASE = "https://www.thomas-krenn.com/de/wiki/"
WIKI_HOME_URL = "https://www.thomas-krenn.com/de/wiki/Hauptseite" WIKI_HOME_URL = "https://www.thomas-krenn.com/de/wiki/Hauptseite"
ORG_NAME = "Thomas-Krenn.AG" ORG_NAME = "Thomas-Krenn.AG"
TK_LOGO_URL = "https://www.thomas-krenn.com/res/pics/tk_logo_340px.png"
LINE = "=" * 78 LINE = "=" * 78
SUBLINE = "-" * 78 SUBLINE = "-" * 78
@@ -14,6 +15,7 @@ FONT = "Arial, Helvetica, sans-serif"
COLOR_TK_ORANGE = "#ED6B06" COLOR_TK_ORANGE = "#ED6B06"
COLOR_TK_ORANGE_DARK = "#C95605" COLOR_TK_ORANGE_DARK = "#C95605"
COLOR_TK_ORANGE_LIGHT = "#FFF4ED" COLOR_TK_ORANGE_LIGHT = "#FFF4ED"
COLOR_TK_ORANGE_BORDER = "#F5C9A6"
COLOR_TK_GRAY_DARK = "#4A4A4A" COLOR_TK_GRAY_DARK = "#4A4A4A"
COLOR_TK_GRAY = "#6B6B6B" COLOR_TK_GRAY = "#6B6B6B"
COLOR_TK_GRAY_LIGHT = "#F5F5F5" COLOR_TK_GRAY_LIGHT = "#F5F5F5"
@@ -23,6 +25,7 @@ COLOR_HEADING = COLOR_TK_GRAY_DARK
COLOR_LINK = COLOR_TK_ORANGE COLOR_LINK = COLOR_TK_ORANGE
COLOR_BORDER = "#E0E0E0" COLOR_BORDER = "#E0E0E0"
COLOR_BG = COLOR_TK_GRAY_LIGHT COLOR_BG = COLOR_TK_GRAY_LIGHT
COLOR_PAGE_BG = "#ECEEF1"
COLOR_WHITE = "#FFFFFF" COLOR_WHITE = "#FFFFFF"
COLOR_ACCENT_NEW = COLOR_TK_ORANGE COLOR_ACCENT_NEW = COLOR_TK_ORANGE
COLOR_ACCENT_NEW_BG = COLOR_TK_ORANGE_LIGHT COLOR_ACCENT_NEW_BG = COLOR_TK_ORANGE_LIGHT
@@ -105,11 +108,53 @@ def create_subject(days: int, category: str = "") -> str:
return base return base
def parse_highlights(raw: str | None) -> list[str]:
"""Zerlegt das Highlight-Eingabefeld (Titel pro Zeile) in eine Liste."""
if not raw:
return []
return [line.strip() for line in raw.splitlines() if line.strip()]
def _match_highlights(
articles: list[dict[str, Any]],
highlights: list[str] | None,
) -> list[dict[str, Any]]:
"""Ordnet Highlight-Titel den geladenen Artikeln zu (max. 3)."""
if not highlights:
return []
result: list[dict[str, Any]] = []
for wanted in highlights:
key = wanted.strip().lower()
if not key:
continue
for article in articles:
if article.get("title", "").strip().lower() == key:
result.append(article)
break
if len(result) >= 3:
break
return result
def _summary_sentence(total: int) -> str:
if total == 0:
return "Aktuell wurden keine neuen Wiki-Artikel gefunden."
if total == 1:
return "Es gibt einen neuen bzw. aktualisierten Wiki-Artikel."
return f"Es gibt {total} neue bzw. aktualisierte Wiki-Artikel."
# ---------------------------------------------------------------------------
# Plain-Text
# ---------------------------------------------------------------------------
def create_plain_text( def create_plain_text(
articles: list[dict[str, Any]], articles: list[dict[str, Any]],
days: int, days: int,
display: DisplayOptions | None = None, display: DisplayOptions | None = None,
category: str = "", category: str = "",
editor_tip: str = "",
highlights: list[str] | None = None,
) -> str: ) -> str:
display = display or DEFAULT_DISPLAY display = display or DEFAULT_DISPLAY
new_articles, edited_articles = split_articles_by_type(articles) new_articles, edited_articles = split_articles_by_type(articles)
@@ -135,6 +180,14 @@ def create_plain_text(
] ]
) )
highlight_articles = _match_highlights(new_articles + edited_articles, highlights)
if highlight_articles:
lines.extend([SUBLINE, "TOP HIGHLIGHTS", SUBLINE, ""])
for idx, item in enumerate(highlight_articles, start=1):
lines.append(f" {idx}. {item.get('title', 'Ohne Titel')}")
lines.append(f" {_article_url(item.get('title', ''))}")
lines.append("")
if not new_articles and not edited_articles: if not new_articles and not edited_articles:
lines.extend( lines.extend(
[ [
@@ -143,9 +196,10 @@ def create_plain_text(
SUBLINE, SUBLINE,
"Im gewählten Zeitraum wurden keine passenden Wiki-Änderungen gefunden.", "Im gewählten Zeitraum wurden keine passenden Wiki-Änderungen gefunden.",
"", "",
_plain_footer(new_articles, edited_articles),
] ]
) )
lines.extend(_plain_editor_tip(editor_tip))
lines.append(_plain_footer(new_articles, edited_articles))
return "\n".join(lines).strip() return "\n".join(lines).strip()
lines.extend(_plain_section("NEUE ARTIKEL", new_articles, display, empty_text="Keine neuen Artikel im Zeitraum.")) lines.extend(_plain_section("NEUE ARTIKEL", new_articles, display, empty_text="Keine neuen Artikel im Zeitraum."))
@@ -159,24 +213,47 @@ def create_plain_text(
) )
) )
lines.append("") lines.append("")
lines.extend(_plain_editor_tip(editor_tip))
lines.append(_plain_footer(new_articles, edited_articles)) lines.append(_plain_footer(new_articles, edited_articles))
return "\n".join(lines).strip() return "\n".join(lines).strip()
def _plain_editor_tip(editor_tip: str) -> list[str]:
text = (editor_tip or "").strip()
if not text:
return []
lines = [SUBLINE, "REDAKTIONSNOTIZ", SUBLINE, ""]
lines.extend(f" {line}" for line in text.splitlines())
lines.append("")
return lines
# ---------------------------------------------------------------------------
# HTML (Standard, für SMTP-Versand & Quelltext)
# ---------------------------------------------------------------------------
def create_html( def create_html(
articles: list[dict[str, Any]], articles: list[dict[str, Any]],
days: int, days: int,
display: DisplayOptions | None = None, display: DisplayOptions | None = None,
category: str = "", category: str = "",
editor_tip: str = "",
highlights: list[str] | None = None,
) -> str: ) -> str:
display = display or DEFAULT_DISPLAY display = display or DEFAULT_DISPLAY
new_articles, edited_articles = split_articles_by_type(articles) new_articles, edited_articles = split_articles_by_type(articles)
period_start, period_end = _period_range(days) period_start, period_end = _period_range(days)
created_at = datetime.now().strftime("%d.%m.%Y %H:%M") total = len(new_articles) + len(edited_articles)
subject = escape(create_subject(days, category)) subject = escape(create_subject(days, category))
preheader = escape(_summary_sentence(total))
period_label = escape(f"{period_start} – {period_end}")
summary_text = escape(_summary_sentence(total))
highlight_articles = _match_highlights(new_articles + edited_articles, highlights)
highlights_section = _html_highlights(highlight_articles)
if not new_articles and not edited_articles: if not new_articles and not edited_articles:
body = f'<p style="margin:0;font-family:{FONT};font-size:15px;line-height:24px;color:{COLOR_MUTED};">Im gewählten Zeitraum wurden keine passenden Wiki-Änderungen gefunden.</p>' body = _html_empty_card("Für diesen Zeitraum wurden keine passenden Wiki-Änderungen gefunden.")
else: else:
body = "\n".join( body = "\n".join(
[ [
@@ -185,85 +262,280 @@ def create_html(
] ]
) )
summary = _html_summary(new_articles, edited_articles) summary_section = (
intro = escape(_intro_sentence(period_start, period_end)) f'<tr><td style="padding:24px 32px 0 32px;" class="mobile-padding">{_html_summary(new_articles, edited_articles)}</td></tr>'
category_hint = (
f'<tr><td style="padding:0 32px 0;font-family:{FONT};"><p style="margin:0 0 16px;font-family:{FONT};font-size:13px;line-height:20px;color:{COLOR_MUTED};"><strong style="color:{COLOR_HEADING};">Filter:</strong> Kategorie {escape(category.strip())}</p></td></tr>'
if category.strip()
else ""
) )
editor_tip_section = _html_editor_tip(editor_tip)
category_hint = ""
if category.strip():
category_hint = (
f'<tr><td style="padding:0 32px 4px 32px;font-family:{FONT};" class="mobile-padding">'
f'<p style="margin:0;font-family:{FONT};font-size:13px;line-height:20px;color:{COLOR_MUTED};">'
f'<strong style="color:{COLOR_HEADING};">Filter:</strong> Kategorie {escape(category.strip())}</p></td></tr>'
)
return f"""<!DOCTYPE html> return f"""<!DOCTYPE html>
<html lang="de" xmlns="http://www.w3.org/1999/xhtml"> <html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{subject}</title> <title>{subject}</title>
<style type="text/css">
html, body {{ margin:0 !important; padding:0 !important; width:100% !important; background:{COLOR_PAGE_BG}; }}
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]> <!--[if mso]>
<style type="text/css"> <style type="text/css">
body, table, td, p, a, li, h1, h2, h3, span, strong {{ font-family: Arial, sans-serif !important; }} body, table, td, p, a, li, h1, h2, h3, span, strong {{ font-family: Arial, sans-serif !important; }}
</style> </style>
<![endif]--> <![endif]-->
</head> </head>
<body style="margin:0;padding:0;background:{COLOR_BG};font-family:{FONT};color:{COLOR_TEXT};"> <body style="margin:0;padding:0;background:{COLOR_PAGE_BG};font-family:{FONT};color:{COLOR_TEXT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:{COLOR_BG};font-family:{FONT};"> <div class="preheader">{preheader}&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;</div>
<tr> <center role="article" aria-roledescription="email" lang="de" style="width:100%;background:{COLOR_PAGE_BG};">
<td align="center" style="padding:28px 16px;font-family:{FONT};"> <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="{COLOR_PAGE_BG}" style="width:100%;background:{COLOR_PAGE_BG};">
<table role="presentation" width="680" cellpadding="0" cellspacing="0" border="0" style="width:680px;max-width:680px;background:{COLOR_WHITE};border:1px solid {COLOR_BORDER};font-family:{FONT};"> <tr>
<tr> <td align="center" style="padding:22px 10px;">
<td style="height:5px;background:{COLOR_TK_ORANGE};font-size:0;line-height:0;">&nbsp;</td> <table role="presentation" width="700" cellpadding="0" cellspacing="0" border="0" class="email-container" style="width:100%;max-width:700px;background:{COLOR_WHITE};border-top:4px solid {COLOR_TK_ORANGE};">
</tr> <tr>
<tr> <td align="center" style="padding:24px 32px 18px 32px;background:{COLOR_TK_GRAY_DARK};" class="mobile-padding">
<td style="background:{COLOR_TK_GRAY_DARK};padding:30px 36px 28px;font-family:{FONT};"> <img src="{TK_LOGO_URL}" width="190" alt="Thomas-Krenn Logo" style="display:block;margin:0 auto;border:0;outline:none;text-decoration:none;height:auto;">
<p style="margin:0;font-family:{FONT};font-size:11px;line-height:16px;letter-spacing:1.2px;text-transform:uppercase;color:{COLOR_TK_ORANGE};">Interner Newsletter</p> </td>
<h1 style="margin:10px 0 0;font-family:{FONT};font-size:28px;line-height:34px;font-weight:bold;color:{COLOR_WHITE};">Thomas-Krenn Wiki Update</h1> </tr>
<p style="margin:10px 0 0;font-family:{FONT};font-size:14px;line-height:21px;color:#CCCCCC;">{escape(ORG_NAME)}</p> <tr>
</td> <td style="padding:0 32px;" class="mobile-padding">
</tr> <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%;background:{COLOR_TK_GRAY_DARK};">
<tr> <tr>
<td style="padding:28px 36px 0;font-family:{FONT};"> <td style="padding:28px 26px;font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:{COLOR_TK_ORANGE_LIGHT};border-left:4px solid {COLOR_TK_ORANGE};font-family:{FONT};"> <div style="font-size:12px;line-height:16px;font-weight:bold;color:{COLOR_TK_ORANGE};letter-spacing:1px;text-transform:uppercase;">Thomas-Krenn Wiki Update</div>
<tr> <div class="mobile-headline" style="font-size:32px;line-height:38px;font-weight:bold;color:{COLOR_WHITE};margin-top:10px;">Die neuesten Wiki-Artikel</div>
<td style="padding:18px 20px;font-family:{FONT};font-size:15px;line-height:24px;color:{COLOR_TEXT};"> <div style="font-size:16px;line-height:25px;color:#DDDDDD;margin-top:10px;">{period_label} &nbsp;|&nbsp; {summary_text}</div>
<p style="margin:0 0 10px;font-family:{FONT};font-size:15px;line-height:24px;">Liebe Kolleginnen und Kollegen,</p> </td>
<p style="margin:0;font-family:{FONT};font-size:15px;line-height:24px;">{intro}</p> </tr>
</td> </table>
</tr> </td>
</table> </tr>
</td> <tr>
</tr> <td style="padding:22px 32px 6px 32px;" class="mobile-padding">
{category_hint} <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:{COLOR_TK_ORANGE_LIGHT};border-left:4px solid {COLOR_TK_ORANGE};">
<tr> <tr>
<td style="padding:8px 36px 0;font-family:{FONT};"> <td style="padding:18px 20px;font-family:{FONT};font-size:15px;line-height:24px;color:{COLOR_TEXT};">
<p style="margin:0 0 18px;font-family:{FONT};font-size:12px;line-height:18px;color:{COLOR_MUTED};">Erstellt am {created_at}</p> <p style="margin:0 0 10px;font-family:{FONT};">Servus,</p>
</td> <p style="margin:0;font-family:{FONT};">hier ist deine Übersicht mit den neuesten Beiträgen aus dem Thomas-Krenn-Wiki vom {escape(period_start)} bis {escape(period_end)}.</p>
</tr> </td>
<tr> </tr>
<td style="padding:0 36px 30px;font-family:{FONT};"> </table>
{body} </td>
{summary} </tr>
<table role="presentation" cellpadding="0" cellspacing="0" border="0" align="center" style="margin:32px auto 0;font-family:{FONT};"> {category_hint}
<tr> {highlights_section}
<td align="center" style="background:{COLOR_TK_ORANGE};padding:14px 28px;font-family:{FONT};"> {body}
<a href="{WIKI_HOME_URL}" style="font-family:{FONT};font-size:14px;line-height:20px;font-weight:bold;color:{COLOR_WHITE};text-decoration:none;">Zum Thomas-Krenn-Wiki &rarr;</a> {summary_section}
</td> {editor_tip_section}
</tr> <tr>
</table> <td align="center" style="padding:28px 32px 4px 32px;" class="mobile-padding">
</td> {_cta_button(WIKI_HOME_URL, "Zum Thomas-Krenn-Wiki →")}
</tr> </td>
<tr> </tr>
<td style="padding:20px 36px;background:{COLOR_BG};border-top:1px solid {COLOR_BORDER};font-family:{FONT};font-size:11px;line-height:17px;color:{COLOR_MUTED};text-align:center;"> <tr>
Automatisch erstellter interner Newsletter &middot; Nur für den Gebrauch bei {escape(ORG_NAME)} <td style="padding:24px 32px 28px 32px;" class="mobile-padding">
</td> <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0">
</tr> <tr>
</table> <td style="font-family:{FONT};font-size:15px;line-height:24px;color:{COLOR_TEXT};">
</td> Fragen oder ein Themenwunsch? Meldet euch gern beim Wiki-Team.<br><br>
</tr> Viele Grüße<br>
</table> Euer Thomas-Krenn-Wiki Team
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td style="background:{COLOR_TK_GRAY_DARK};padding:22px 20px;text-align:center;font-family:{FONT};">
<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="{WIKI_HOME_URL}" target="_blank" style="color:{COLOR_TK_ORANGE};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> </body>
</html>""" </html>"""
def _cta_button(url: str, label: str) -> str:
return (
f'<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin:0 auto;">'
f'<tr><td bgcolor="{COLOR_TK_ORANGE}" style="background:{COLOR_TK_ORANGE};border-radius:6px;">'
f'<a href="{escape(url)}" target="_blank" style="display:inline-block;padding:12px 22px;font-family:{FONT};'
f'font-size:14px;line-height:18px;font-weight:bold;color:{COLOR_WHITE};text-decoration:none;">{escape(label)}</a>'
f'</td></tr></table>'
)
def _html_empty_card(text: str) -> str:
return (
f'<tr><td style="padding:8px 32px 8px 32px;" class="mobile-padding">'
f'<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" '
f'style="width:100%;background:{COLOR_WHITE};border:1px solid {COLOR_BORDER};border-radius:12px;">'
f'<tr><td style="padding:20px 22px;font-family:{FONT};font-size:15px;line-height:23px;color:{COLOR_TEXT};">'
f'{escape(text)}</td></tr></table></td></tr>'
)
def _html_highlights(items: list[dict[str, Any]]) -> str:
if not items:
return ""
rows = ""
for idx, item in enumerate(items[:3], start=1):
url = escape(_article_url(item.get("title", "")))
title = escape(item.get("title", "Ohne Titel"))
rows += (
f'<tr><td style="padding:0 0 8px 0;font-family:{FONT};font-size:15px;line-height:22px;color:{COLOR_TEXT};">'
f'<span style="display:inline-block;min-width:22px;font-weight:bold;color:{COLOR_TK_ORANGE};">{idx}.</span> '
f'<a href="{url}" target="_blank" style="color:{COLOR_TEXT};text-decoration:none;">{title}</a></td></tr>'
)
return (
f'<tr><td style="padding:8px 32px 4px 32px;" class="mobile-padding">'
f'<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" '
f'style="width:100%;background:{COLOR_TK_ORANGE_LIGHT};border:1px solid {COLOR_TK_ORANGE_BORDER};border-radius:12px;">'
f'<tr><td style="padding:16px 18px 8px 18px;font-family:{FONT};font-size:11px;line-height:15px;'
f'color:{COLOR_TK_ORANGE_DARK};font-weight:bold;letter-spacing:.8px;text-transform:uppercase;">Top Highlights</td></tr>'
f'<tr><td style="padding:0 18px 12px 18px;"><table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0">{rows}</table></td></tr>'
f'</table></td></tr>'
)
def _html_editor_tip(editor_tip: str) -> str:
text = (editor_tip or "").strip()
if not text:
return ""
body = escape(text).replace("\n", "<br>")
return (
f'<tr><td style="padding:16px 32px 4px 32px;" class="mobile-padding">'
f'<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" '
f'style="width:100%;background:{COLOR_TK_GRAY_LIGHT};border:1px solid {COLOR_BORDER};border-radius:12px;">'
f'<tr><td style="padding:16px 18px 8px 18px;font-family:{FONT};font-size:11px;line-height:15px;'
f'color:{COLOR_HEADING};font-weight:bold;letter-spacing:.8px;text-transform:uppercase;">Redaktionsnotiz</td></tr>'
f'<tr><td style="padding:0 18px 16px 18px;font-family:{FONT};font-size:15px;line-height:24px;color:{COLOR_TEXT};">{body}</td></tr>'
f'</table></td></tr>'
)
def _html_section(
heading: str,
items: list[dict[str, Any]],
display: DisplayOptions,
empty_text: str,
kind: str = "edited",
) -> str:
accent = COLOR_ACCENT_NEW if kind == "new" else COLOR_ACCENT_EDIT
heading_html = (
f'<tr><td style="padding:26px 32px 8px 32px;font-family:{FONT};" class="mobile-padding">'
f'<div style="font-family:{FONT};font-size:18px;line-height:24px;font-weight:bold;color:{COLOR_HEADING};'
f'border-bottom:2px solid {accent};padding-bottom:8px;">{escape(heading)} '
f'<span style="color:{accent};">({len(items)})</span></div></td></tr>'
)
if not items:
return heading_html + (
f'<tr><td style="padding:8px 32px 4px 32px;font-family:{FONT};font-size:14px;line-height:22px;'
f'color:{COLOR_MUTED};" class="mobile-padding">{escape(empty_text)}</td></tr>'
)
cards = "".join(_html_article_card(idx, item, display, kind) for idx, item in enumerate(items, start=1))
return heading_html + cards
def _html_article_card(idx: int, item: dict[str, Any], display: DisplayOptions, kind: str) -> str:
accent = COLOR_ACCENT_NEW if kind == "new" else COLOR_ACCENT_EDIT
eyebrow = "Neuer Beitrag" if kind == "new" else "Aktualisierter Beitrag"
title = escape(item.get("title", "Ohne Titel"))
url = escape(_article_url(item.get("title", "")))
meta_bits: list[str] = []
if display["show_date"]:
meta_bits.append(f"am {_format_ts(item.get('timestamp'))}")
if display["show_user"]:
meta_bits.append(f"von {escape(str(item.get('user', '-')))}")
meta_html = ""
if meta_bits:
meta_html = (
f'<tr><td style="padding:0 22px 12px 22px;font-family:{FONT};font-size:13px;line-height:20px;'
f'color:{COLOR_MUTED};">Veröffentlicht {" ".join(meta_bits)}.</td></tr>'
)
cat_html = ""
if display["show_category"]:
cat = ", ".join(item.get("categories", [])) or "Keine Kategorie"
cat_html = (
f'<tr><td style="padding:0 22px 12px 22px;font-family:{FONT};font-size:12px;line-height:18px;'
f'color:{COLOR_MUTED};">Kategorie: {escape(cat)}</td></tr>'
)
return (
f'<tr><td style="padding:0 32px 16px 32px;" class="mobile-padding">'
f'<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" '
f'style="width:100%;background:{COLOR_WHITE};border:1px solid {COLOR_BORDER};border-left:4px solid {accent};border-radius:12px;">'
f'<tr><td style="padding:16px 22px 4px 22px;font-family:{FONT};font-size:11px;line-height:16px;font-weight:bold;'
f'letter-spacing:.7px;text-transform:uppercase;color:{accent};">{idx}. {eyebrow}</td></tr>'
f'<tr><td class="mobile-card-title" style="padding:0 22px 8px 22px;font-family:{FONT};font-size:20px;'
f'line-height:27px;font-weight:bold;color:{COLOR_HEADING};">'
f'<a href="{url}" target="_blank" style="color:{COLOR_HEADING};text-decoration:none;">{title}</a></td></tr>'
f'{meta_html}{cat_html}'
f'<tr><td style="padding:2px 22px 18px 22px;">{_cta_button(url, "Zum Beitrag →")}</td></tr>'
f'</table></td></tr>'
)
def _html_summary(new_articles: list[dict[str, Any]], edited_articles: list[dict[str, Any]]) -> str:
total = len(new_articles) + len(edited_articles)
return f"""<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-top:4px;font-family:{FONT};">
<tr>
<td style="padding:0 0 10px;font-family:{FONT};font-size:14px;line-height:20px;font-weight:bold;color:{COLOR_HEADING};">Zusammenfassung</td>
</tr>
<tr>
<td style="font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="font-family:{FONT};">
<tr>
<td width="33%" style="padding:18px 12px;background:{COLOR_ACCENT_NEW_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_ACCENT_NEW};">{len(new_articles)}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Neue Artikel</div>
</td>
<td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
<td width="33%" style="padding:18px 12px;background:{COLOR_ACCENT_EDIT_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_ACCENT_EDIT};">{len(edited_articles)}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Bearbeitet</div>
</td>
<td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
<td width="33%" style="padding:18px 12px;background:{COLOR_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_HEADING};">{total}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Gesamt</div>
</td>
</tr>
</table>
</td>
</tr>
</table>"""
# ---------------------------------------------------------------------------
# Outlook/Word-kompatibles HTML (UI-Vorschau & Copy-Paste in Outlook)
# ---------------------------------------------------------------------------
OUTLOOK_FONT = "Arial, sans-serif" OUTLOOK_FONT = "Arial, sans-serif"
OUTLOOK_TEXT = COLOR_TEXT OUTLOOK_TEXT = COLOR_TEXT
OUTLOOK_MUTED = COLOR_TK_GRAY OUTLOOK_MUTED = COLOR_TK_GRAY
@@ -315,37 +587,52 @@ def _outlook_font(
) )
def _outlook_link(title: str, url: str, *, bold: bool = True) -> str: def _outlook_link(title: str, url: str, *, bold: bool = True, color: str = OUTLOOK_LINK, size: str = "2") -> str:
weight = "<b>" if bold else "" weight = "<b>" if bold else ""
weight_end = "</b>" if bold else "" weight_end = "</b>" if bold else ""
return ( return (
f'<a href="{escape(url)}" ' f'<a href="{escape(url)}" '
f'style="color:{OUTLOOK_LINK} !important;text-decoration:none !important;mso-style-priority:100 !important;">' f'style="color:{color} !important;text-decoration:none !important;mso-style-priority:100 !important;">'
f'<span style="color:{OUTLOOK_LINK} !important;" data-ogsc="{OUTLOOK_LINK}">' f'<span style="color:{color} !important;" data-ogsc="{color}">'
f'<font face="Arial" color="{OUTLOOK_LINK}" size="2">' f'<font face="Arial" color="{color}" size="{size}">'
f"{weight}{escape(title)}{weight_end}" f"{weight}{escape(title)}{weight_end}"
f"</font></span></a>" f"</font></span></a>"
) )
def _outlook_cta(url: str, label: str) -> str:
return (
f'<table cellpadding="0" cellspacing="0" border="0"><tr>'
f'<td bgcolor="{OUTLOOK_ORANGE}" style="background-color:{OUTLOOK_ORANGE} !important;padding:9px 16px;" data-ogsb="{OUTLOOK_ORANGE}">'
f'{_outlook_link(label, url, color="#FFFFFF")}'
f'</td></tr></table>'
)
def create_outlook_html( def create_outlook_html(
articles: list[dict[str, Any]], articles: list[dict[str, Any]],
days: int, days: int,
display: DisplayOptions | None = None, display: DisplayOptions | None = None,
category: str = "", category: str = "",
editor_tip: str = "",
highlights: list[str] | None = None,
) -> str: ) -> str:
"""Word/Outlook-kompatibles HTML mit font-Tags und bgcolor (überlebt Einfügen in Outlook).""" """Word/Outlook-kompatibles HTML mit font-Tags und bgcolor (überlebt Einfügen in Outlook)."""
display = display or DEFAULT_DISPLAY display = display or DEFAULT_DISPLAY
new_articles, edited_articles = split_articles_by_type(articles) new_articles, edited_articles = split_articles_by_type(articles)
period_start, period_end = _period_range(days) period_start, period_end = _period_range(days)
created_at = datetime.now().strftime("%d.%m.%Y %H:%M") total = len(new_articles) + len(edited_articles)
intro = _intro_sentence(period_start, period_end)
subject = escape(create_subject(days, category)) subject = escape(create_subject(days, category))
period_label = f"{period_start} – {period_end}"
summary_text = _summary_sentence(total)
highlight_articles = _match_highlights(new_articles + edited_articles, highlights)
highlights_rows = _outlook_highlights(highlight_articles)
if not new_articles and not edited_articles: if not new_articles and not edited_articles:
body_rows = f"""<tr> body_rows = f"""<tr>
<td {_outlook_td_attrs(colspan=2, extra_style="padding:12px 0;")}> <td {_outlook_td_attrs(extra_style="padding:12px 0;")}>
{_outlook_font("Im gewählten Zeitraum wurden keine passenden Wiki-Änderungen gefunden.", color=OUTLOOK_MUTED)} {_outlook_font("Für diesen Zeitraum wurden keine passenden Wiki-Änderungen gefunden.", color=OUTLOOK_MUTED)}
</td> </td>
</tr>""" </tr>"""
else: else:
@@ -371,14 +658,15 @@ def create_outlook_html(
f"</p>" f"</p>"
) )
total = len(new_articles) + len(edited_articles)
summary_row = f"""<tr> summary_row = f"""<tr>
<td {_outlook_td_attrs(colspan=2, extra_style=f"padding:16px 0 0;border-top:1px solid {OUTLOOK_BORDER};")}> <td {_outlook_td_attrs(extra_style=f"padding:16px 0 0;border-top:1px solid {OUTLOOK_BORDER};")}>
{_outlook_font("Zusammenfassung: ", color=OUTLOOK_HEADING, bold=True, size="1")} {_outlook_font("Zusammenfassung: ", color=OUTLOOK_HEADING, bold=True, size="1")}
{_outlook_font(f"{len(new_articles)} neu · {len(edited_articles)} bearbeitet · {total} gesamt", color=OUTLOOK_MUTED, size="1")} {_outlook_font(f"{len(new_articles)} neu · {len(edited_articles)} bearbeitet · {total} gesamt", color=OUTLOOK_MUTED, size="1")}
</td> </td>
</tr>""" </tr>"""
editor_tip_row = _outlook_editor_tip(editor_tip)
return f"""<!DOCTYPE html> return f"""<!DOCTYPE html>
<html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word"> <html lang="de" xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word">
<head> <head>
@@ -407,33 +695,39 @@ def create_outlook_html(
</style> </style>
</head> </head>
<body bgcolor="{OUTLOOK_WHITE}" style="margin:0;padding:16px;background-color:{OUTLOOK_WHITE} !important;color:{OUTLOOK_TEXT} !important;" data-ogsb="{OUTLOOK_WHITE}"> <body bgcolor="{OUTLOOK_WHITE}" style="margin:0;padding:16px;background-color:{OUTLOOK_WHITE} !important;color:{OUTLOOK_TEXT} !important;" data-ogsb="{OUTLOOK_WHITE}">
<table width="600" cellpadding="0" cellspacing="0" border="0" align="center" bgcolor="{OUTLOOK_WHITE}" style="width:600px;background-color:{OUTLOOK_WHITE} !important;" data-ogsb="{OUTLOOK_WHITE}"> <table width="640" cellpadding="0" cellspacing="0" border="0" align="center" bgcolor="{OUTLOOK_WHITE}" style="width:640px;background-color:{OUTLOOK_WHITE} !important;" data-ogsb="{OUTLOOK_WHITE}">
<tr> <tr>
<td {_outlook_td_attrs(bg=OUTLOOK_ORANGE, extra_style="height:5px;font-size:0;line-height:0;")}>&nbsp;</td> <td {_outlook_td_attrs(bg=OUTLOOK_ORANGE, extra_style="height:5px;font-size:0;line-height:0;")}>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td {_outlook_td_attrs(bg=OUTLOOK_GRAY_DARK, extra_style="padding:16px 20px;")}> <td {_outlook_td_attrs(bg=OUTLOOK_GRAY_DARK, extra_style="padding:16px 20px;text-align:center;")} align="center">
{_outlook_font("Interner Newsletter", color=OUTLOOK_ORANGE, size="1")}<br> <img src="{TK_LOGO_URL}" width="180" alt="Thomas-Krenn Logo" style="display:block;margin:0 auto;border:0;height:auto;">
{_outlook_font("Thomas-Krenn Wiki Update", color=OUTLOOK_WHITE, size="5", bold=True)}<br> </td>
{_outlook_font(ORG_NAME, color="#CCCCCC", size="2")} </tr>
<tr>
<td {_outlook_td_attrs(bg=OUTLOOK_GRAY_DARK, extra_style="padding:18px 20px;")}>
{_outlook_font("Thomas-Krenn Wiki Update", color=OUTLOOK_ORANGE, size="1", bold=True)}<br>
{_outlook_font("Die neuesten Wiki-Artikel", color=OUTLOOK_WHITE, size="5", bold=True)}<br>
{_outlook_font(f"{period_label} | {summary_text}", color="#DDDDDD", size="2")}
</td> </td>
</tr> </tr>
<tr> <tr>
<td {_outlook_td_attrs(extra_style="padding:20px;")}> <td {_outlook_td_attrs(extra_style="padding:20px;")}>
<p style="margin:0 0 8px;">{_outlook_font("Liebe Kolleginnen und Kollegen,")}</p> <p style="margin:0 0 8px;">{_outlook_font("Servus,")}</p>
<p style="margin:0 0 12px;">{_outlook_font(intro)}</p> <p style="margin:0 0 16px;">{_outlook_font(f"hier ist deine Übersicht mit den neuesten Beiträgen aus dem Thomas-Krenn-Wiki vom {period_start} bis {period_end}.")}</p>
<p style="margin:0 0 16px;">{_outlook_font(f"Erstellt am: {created_at}", color=OUTLOOK_MUTED, size="1")}</p>
{category_block} {category_block}
{highlights_rows}
<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="{OUTLOOK_WHITE}" style="background-color:{OUTLOOK_WHITE} !important;" data-ogsb="{OUTLOOK_WHITE}"> <table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="{OUTLOOK_WHITE}" style="background-color:{OUTLOOK_WHITE} !important;" data-ogsb="{OUTLOOK_WHITE}">
{body_rows} {body_rows}
{summary_row} {summary_row}
{editor_tip_row}
<tr> <tr>
<td {_outlook_td_attrs(colspan=2, extra_style="padding:20px 0 0;")}> <td {_outlook_td_attrs(extra_style="padding:20px 0 0;")}>
{_outlook_link("Zum Thomas-Krenn-Wiki →", WIKI_HOME_URL)} {_outlook_cta(WIKI_HOME_URL, "Zum Thomas-Krenn-Wiki →")}
</td> </td>
</tr> </tr>
<tr> <tr>
<td {_outlook_td_attrs(colspan=2, extra_style=f"padding:16px 0 0;border-top:1px solid {OUTLOOK_BORDER};")}> <td {_outlook_td_attrs(extra_style=f"padding:16px 0 0;border-top:1px solid {OUTLOOK_BORDER};")}>
{_outlook_font(f"Automatisch erstellter interner Newsletter · Nur für den Gebrauch bei {ORG_NAME}", color=OUTLOOK_MUTED, size="1")} {_outlook_font(f"Automatisch erstellter interner Newsletter · Nur für den Gebrauch bei {ORG_NAME}", color=OUTLOOK_MUTED, size="1")}
</td> </td>
</tr> </tr>
@@ -445,6 +739,39 @@ def create_outlook_html(
</html>""" </html>"""
def _outlook_highlights(items: list[dict[str, Any]]) -> str:
if not items:
return ""
rows = ""
for idx, item in enumerate(items[:3], start=1):
url = _article_url(item.get("title", ""))
rows += (
f'<tr><td {_outlook_td_attrs(bg=OUTLOOK_WHITE, extra_style="padding:2px 0;")}>'
f'{_outlook_font(f"{idx}. ", color=OUTLOOK_ORANGE, bold=True)}'
f'{_outlook_link(item.get("title", "Ohne Titel"), url, color=OUTLOOK_TEXT, bold=False)}'
f'</td></tr>'
)
return (
f'<table width="100%" cellpadding="0" cellspacing="0" border="0" '
f'bgcolor="{OUTLOOK_WHITE}" style="background-color:{OUTLOOK_WHITE} !important;margin:0 0 8px;" data-ogsb="{OUTLOOK_WHITE}">'
f'<tr><td {_outlook_td_attrs(extra_style="padding:0 0 6px;")}>'
f'{_outlook_font("Top Highlights", color=OUTLOOK_ORANGE, size="2", bold=True)}</td></tr>'
f'{rows}</table>'
)
def _outlook_editor_tip(editor_tip: str) -> str:
text = (editor_tip or "").strip()
if not text:
return ""
body = "<br>".join(_outlook_font(line) for line in text.splitlines())
return (
f'<tr><td {_outlook_td_attrs(bg=COLOR_TK_GRAY_LIGHT, extra_style=f"padding:14px 16px;margin-top:16px;border:1px solid {OUTLOOK_BORDER};")}>'
f'{_outlook_font("Redaktionsnotiz", color=OUTLOOK_HEADING, size="1", bold=True)}<br>'
f'{body}</td></tr>'
)
def _outlook_meta_line(item: dict[str, Any], display: DisplayOptions) -> str: def _outlook_meta_line(item: dict[str, Any], display: DisplayOptions) -> str:
parts: list[str] = [] parts: list[str] = []
if display["show_date"]: if display["show_date"]:
@@ -457,28 +784,6 @@ def _outlook_meta_line(item: dict[str, Any], display: DisplayOptions) -> str:
return " | ".join(parts) return " | ".join(parts)
def _outlook_article_rows(items: list[dict[str, Any]], display: DisplayOptions) -> str:
rows: list[str] = []
for idx, item in enumerate(items, 1):
title = item.get("title", "Ohne Titel")
url = _article_url(item.get("title", ""))
meta = _outlook_meta_line(item, display)
meta_html = ""
if meta:
meta_html = f"<br>{_outlook_font(meta, color=OUTLOOK_MUTED, size='1')}"
rows.append(
f"""<tr>
<td {_outlook_td_attrs(width="28", valign="top", extra_style=f"padding:8px 8px 10px 0;border-bottom:1px solid {OUTLOOK_BORDER};")}>
{_outlook_font(f"{idx}.")}
</td>
<td {_outlook_td_attrs(valign="top", extra_style=f"padding:8px 0 10px;border-bottom:1px solid {OUTLOOK_BORDER};")}>
{_outlook_link(title, url)}{meta_html}
</td>
</tr>"""
)
return "\n".join(rows)
def _outlook_section( def _outlook_section(
heading: str, heading: str,
items: list[dict[str, Any]], items: list[dict[str, Any]],
@@ -488,19 +793,47 @@ def _outlook_section(
) -> str: ) -> str:
accent = OUTLOOK_ORANGE if kind == "new" else OUTLOOK_GRAY_DARK accent = OUTLOOK_ORANGE if kind == "new" else OUTLOOK_GRAY_DARK
header = f"""<tr> header = f"""<tr>
<td {_outlook_td_attrs(colspan=2, extra_style=f"padding:18px 0 8px;border-bottom:2px solid {accent};")}> <td {_outlook_td_attrs(extra_style=f"padding:18px 0 8px;border-bottom:2px solid {accent};")}>
{_outlook_font(f"{heading} ({len(items)})", color=accent, size="3", bold=True)} {_outlook_font(f"{heading} ({len(items)})", color=accent, size="3", bold=True)}
</td> </td>
</tr>""" </tr>"""
if not items: if not items:
return header + f"""<tr> return header + f"""<tr>
<td {_outlook_td_attrs(colspan=2, extra_style="padding:8px 0;")}> <td {_outlook_td_attrs(extra_style="padding:8px 0;")}>
{_outlook_font(empty_text, color=OUTLOOK_MUTED)} {_outlook_font(empty_text, color=OUTLOOK_MUTED)}
</td> </td>
</tr>""" </tr>"""
return header + _outlook_article_rows(items, display) cards = "\n".join(_outlook_article_card(idx, item, display, kind) for idx, item in enumerate(items, start=1))
return header + cards
def _outlook_article_card(idx: int, item: dict[str, Any], display: DisplayOptions, kind: str) -> str:
accent = OUTLOOK_ORANGE if kind == "new" else OUTLOOK_GRAY_DARK
eyebrow = "Neuer Beitrag" if kind == "new" else "Aktualisierter Beitrag"
title = item.get("title", "Ohne Titel")
url = _article_url(item.get("title", ""))
meta = _outlook_meta_line(item, display)
meta_html = f'<br>{_outlook_font(meta, color=OUTLOOK_MUTED, size="1")}' if meta else ""
return f"""<tr>
<td {_outlook_td_attrs(extra_style="padding:8px 0;")}>
<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="{OUTLOOK_WHITE}" style="background-color:{OUTLOOK_WHITE} !important;border:1px solid {OUTLOOK_BORDER};" data-ogsb="{OUTLOOK_WHITE}">
<tr>
<td {_outlook_td_attrs(bg=accent, width="6", extra_style="font-size:0;line-height:0;width:6px;")}>&nbsp;</td>
<td {_outlook_td_attrs(extra_style="padding:12px 16px;")}>
{_outlook_font(f"{idx}. {eyebrow}", color=accent, size="1", bold=True)}<br>
{_outlook_link(title, url, size="3")}{meta_html}<br>
<span style="display:inline-block;margin-top:8px;">{_outlook_cta(url, "Zum Beitrag →")}</span>
</td>
</tr>
</table>
</td>
</tr>"""
# ---------------------------------------------------------------------------
# Plain-Text-Helfer
# ---------------------------------------------------------------------------
def _plain_section( def _plain_section(
heading: str, heading: str,
items: list[dict[str, Any]], items: list[dict[str, Any]],
@@ -551,148 +884,16 @@ def _plain_footer(new_articles: list[dict[str, Any]], edited_articles: list[dict
f"Wiki: {WIKI_HOME_URL}", f"Wiki: {WIKI_HOME_URL}",
"", "",
SUBLINE, SUBLINE,
f"Dieser Newsletter wurde automatisch erstellt und ist nur für den internen", "Dieser Newsletter wurde automatisch erstellt und ist nur für den internen",
f"Gebrauch bei {ORG_NAME} bestimmt.", f"Gebrauch bei {ORG_NAME} bestimmt.",
LINE, LINE,
] ]
) )
def _html_section( # ---------------------------------------------------------------------------
heading: str, # Gemeinsame Helfer
items: list[dict[str, Any]], # ---------------------------------------------------------------------------
display: DisplayOptions,
empty_text: str,
kind: str = "edited",
) -> str:
accent = COLOR_ACCENT_NEW if kind == "new" else COLOR_ACCENT_EDIT
accent_bg = COLOR_ACCENT_NEW_BG if kind == "new" else COLOR_ACCENT_EDIT_BG
badge = "NEU" if kind == "new" else "AKTUALISIERT"
blocks = [
f"""<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-top:28px;font-family:{FONT};">
<tr>
<td style="padding:0;font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:{accent_bg};border:1px solid {COLOR_BORDER};font-family:{FONT};">
<tr>
<td style="width:6px;background:{accent};font-size:0;line-height:0;">&nbsp;</td>
<td style="padding:14px 16px;font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="font-family:{FONT};">
<tr>
<td style="font-family:{FONT};">
<h2 style="margin:0;font-family:{FONT};font-size:17px;line-height:22px;font-weight:bold;color:{COLOR_HEADING};">{escape(heading)}</h2>
</td>
<td align="right" style="font-family:{FONT};white-space:nowrap;">
<span style="display:inline-block;padding:4px 10px;background:{accent};font-family:{FONT};font-size:11px;line-height:14px;font-weight:bold;color:{COLOR_WHITE};">{badge}</span>
<span style="display:inline-block;margin-left:8px;padding:4px 10px;background:{COLOR_WHITE};border:1px solid {COLOR_BORDER};font-family:{FONT};font-size:11px;line-height:14px;color:{COLOR_MUTED};">{len(items)}</span>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>"""
]
if not items:
blocks.append(
f'<p style="margin:14px 0 0;padding:0 4px;font-family:{FONT};font-size:14px;line-height:22px;color:{COLOR_MUTED};">{escape(empty_text)}</p>'
)
return "\n".join(blocks)
blocks.append(
f'<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-top:10px;font-family:{FONT};">'
)
for idx, item in enumerate(items, start=1):
blocks.append(_html_item_row(idx, item, display, accent))
blocks.append("</table>")
return "\n".join(blocks)
def _html_meta_tags(item: dict[str, Any], display: DisplayOptions) -> str:
tags: list[str] = []
if display["show_date"]:
tags.append(_html_meta_tag("Datum", _format_ts(item.get("timestamp"))))
if display["show_user"]:
tags.append(_html_meta_tag("Benutzer", str(item.get("user", "-"))))
if display["show_category"]:
cat = ", ".join(item.get("categories", [])) or "Keine Kategorie"
tags.append(_html_meta_tag("Kategorie", cat))
if not tags:
return ""
return f'<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="margin-top:10px;font-family:{FONT};"><tr>{"".join(tags)}</tr></table>'
def _html_meta_tag(label: str, value: str) -> str:
return f"""<td style="padding:0 8px 0 0;font-family:{FONT};">
<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="font-family:{FONT};">
<tr>
<td style="padding:5px 10px;background:{COLOR_BG};border:1px solid {COLOR_BORDER};font-family:{FONT};font-size:11px;line-height:16px;color:{COLOR_MUTED};">
<strong style="font-family:{FONT};color:{COLOR_TEXT};">{escape(label)}:</strong> {escape(value)}
</td>
</tr>
</table>
</td>"""
def _html_item_row(idx: int, item: dict[str, Any], display: DisplayOptions, accent: str) -> str:
title = escape(item.get("title", "Ohne Titel"))
url = escape(_article_url(item.get("title", "")))
meta_html = _html_meta_tags(item, display)
return f"""<tr>
<td style="padding:0 0 10px;font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="background:{COLOR_WHITE};border:1px solid {COLOR_BORDER};font-family:{FONT};">
<tr>
<td style="width:4px;background:{accent};font-size:0;line-height:0;">&nbsp;</td>
<td style="padding:14px 16px;font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="font-family:{FONT};">
<tr>
<td style="width:26px;vertical-align:top;font-family:{FONT};font-size:13px;line-height:20px;font-weight:bold;color:{accent};">{idx}.</td>
<td style="vertical-align:top;font-family:{FONT};">
<a href="{url}" style="font-family:{FONT};font-size:15px;line-height:22px;font-weight:bold;color:{COLOR_LINK};text-decoration:none;">{title}</a>
{meta_html}
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>"""
def _html_summary(new_articles: list[dict[str, Any]], edited_articles: list[dict[str, Any]]) -> str:
total = len(new_articles) + len(edited_articles)
return f"""<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-top:32px;font-family:{FONT};">
<tr>
<td style="padding:0 0 10px;font-family:{FONT};font-size:14px;line-height:20px;font-weight:bold;color:{COLOR_HEADING};">Zusammenfassung</td>
</tr>
<tr>
<td style="font-family:{FONT};">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="font-family:{FONT};">
<tr>
<td width="33%" style="padding:18px 12px;background:{COLOR_ACCENT_NEW_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_ACCENT_NEW};">{len(new_articles)}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Neue Artikel</div>
</td>
<td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
<td width="33%" style="padding:18px 12px;background:{COLOR_ACCENT_EDIT_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_ACCENT_EDIT};">{len(edited_articles)}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Bearbeitet</div>
</td>
<td width="4" style="font-size:0;line-height:0;">&nbsp;</td>
<td width="33%" style="padding:18px 12px;background:{COLOR_BG};border:1px solid {COLOR_BORDER};text-align:center;font-family:{FONT};">
<div style="font-family:{FONT};font-size:28px;line-height:32px;font-weight:bold;color:{COLOR_HEADING};">{total}</div>
<div style="margin-top:4px;font-family:{FONT};font-size:12px;line-height:16px;color:{COLOR_MUTED};">Gesamt</div>
</td>
</tr>
</table>
</td>
</tr>
</table>"""
def _article_url(title: str) -> str: def _article_url(title: str) -> str:
return f"{WIKI_ARTICLE_BASE}{quote(title.replace(' ', '_'))}" return f"{WIKI_ARTICLE_BASE}{quote(title.replace(' ', '_'))}"

10
app/templates/dashboard.html
View File

@@ -61,6 +61,14 @@
Kategorie anzeigen Kategorie anzeigen
</label> </label>
</fieldset> </fieldset>
<label>Top-Highlights (optional)
<textarea name="highlights" rows="3" placeholder="Ein Artikeltitel pro Zeile – muss exakt einem gefundenen Artikel entsprechen (max. 3)">{{ filters.highlights }}</textarea>
</label>
<p class="hint">Hervorgehobene Artikel erscheinen als „Top Highlights“-Box oben im Newsletter.</p>
<label>Redaktionsnotiz (optional)
<textarea name="editor_tip" rows="3" placeholder="Optionaler Hinweis der Redaktion für diese Ausgabe…">{{ filters.editor_tip }}</textarea>
</label>
<p class="hint">Wird nur angezeigt, wenn Text hinterlegt ist – erscheint als eigene Box im Newsletter.</p>
{% if wiki_error %} {% if wiki_error %}
<p class="error">{{ wiki_error }}</p> <p class="error">{{ wiki_error }}</p>
{% endif %} {% endif %}
@@ -184,6 +192,8 @@
<input type="hidden" name="show_date" value="{{ 'true' if filters.display.show_date 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_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="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> <button type="submit" class="btn-secondary">Newsletter jetzt senden</button>
</form> </form>
</div> </div>