')
+ return sx_call("blog-data-table-content")
tablename = getattr(original_post, "__tablename__", "?")
+ model_data = _extract_model_data(original_post, 0, 2)
- def _render_scalar_table(obj):
- rows = []
- for col in obj.__mapper__.columns:
- key = col.key
- if key == "_sa_instance_state":
- continue
- val = getattr(obj, key, None)
- if val is None:
- val_html = '\u2014'
- elif hasattr(val, "isoformat"):
- val_html = f'
{esc(val.isoformat())}
'
- elif isinstance(val, str):
- val_html = f'
{esc(val)}
'
- else:
- val_html = f'
{esc(str(val))}
'
- rows.append(
- f'
'
- f'
{esc(key)}
'
- f'
{val_html}
'
- )
- return (
- '
'
- '
'
- '
'
- '
Field
'
- '
Value
'
- '
' + "".join(rows) + '
'
- )
+ return sx_call("blog-data-table-content",
+ tablename=tablename, model_data=model_data)
- def _render_model(obj, depth=0, max_depth=2):
- parts = [_render_scalar_table(obj)]
- rel_parts = []
- for rel in obj.__mapper__.relationships:
- rel_name = rel.key
- loaded = rel_name in obj.__dict__
- value = getattr(obj, rel_name, None) if loaded else None
- cardinality = "many" if rel.uselist else "one"
- cls_name = rel.mapper.class_.__name__
- loaded_label = "" if loaded else " \u2022 not loaded"
-
- inner = ""
- if value is None:
- inner = '\u2014'
- elif rel.uselist:
- items = list(value) if value else []
- inner = f'
{len(items)} item{"" if len(items) == 1 else "s"}
'
- if items and depth < max_depth:
- sub_rows = []
- for i, it in enumerate(items, 1):
- ident_parts = []
- for k in ("id", "ghost_id", "uuid", "slug", "name", "title"):
- if k in it.__mapper__.c:
- v = getattr(it, k, "")
- ident_parts.append(f"{k}={v}")
- summary = " \u2022 ".join(ident_parts) if ident_parts else str(it)
- child_html = ""
- if depth < max_depth:
- child_html = f'
{_render_model(it, depth + 1, max_depth)}
'
- else:
- child_html = '
\u2026max depth reached\u2026
'
- sub_rows.append(
- f'
'
- f'
{i}
'
- f'
{esc(summary)}
{child_html}
'
- )
- inner += (
- '
'
- '
'
- '
#
'
- '
Summary
'
- + "".join(sub_rows) + '
'
- )
- else:
- child = value
- ident_parts = []
- for k in ("id", "ghost_id", "uuid", "slug", "name", "title"):
- if k in child.__mapper__.c:
- v = getattr(child, k, "")
- ident_parts.append(f"{k}={v}")
- summary = " \u2022 ".join(ident_parts) if ident_parts else str(child)
- inner = f'
{esc(summary)}
'
- if depth < max_depth:
- inner += f'
{_render_model(child, depth + 1, max_depth)}
'
- else:
- inner += '
\u2026max depth reached\u2026
'
-
- rel_parts.append(
- f'
'
- f'
'
- f'Relationship: {esc(rel_name)}'
- f' {cardinality} \u2192 {esc(cls_name)}{loaded_label}
'
- f'
{inner}
'
- )
- if rel_parts:
- parts.append('
' + "".join(rel_parts) + '
')
- return '
' + "".join(parts) + '
'
-
- html = (
- f'
'
- f'
Model: Post \u2022 Table: {esc(tablename)}
'
- f'{_render_model(original_post, 0, 2)}
'
- )
- return _raw_html_sx(html)
+# ---------------------------------------------------------------------------
+# Preview content
+# ---------------------------------------------------------------------------
async def _h_post_preview_content(slug=None, **kw):
await _ensure_post_data(slug)
@@ -269,38 +417,91 @@ async def _h_post_preview_content(slug=None, **kw):
preview = await services.blog_page.preview_data(g.s)
- sections: list[str] = []
- if preview.get("sx_pretty"):
- sections.append(sx_call("blog-preview-section",
- title="S-Expression Source", content=SxExpr(preview["sx_pretty"])))
- if preview.get("json_pretty"):
- sections.append(sx_call("blog-preview-section",
- title="Lexical JSON", content=SxExpr(preview["json_pretty"])))
- if preview.get("sx_rendered"):
- rendered_sx = sx_call("blog-preview-rendered", html=preview["sx_rendered"])
- sections.append(sx_call("blog-preview-section",
- title="SX Rendered", content=rendered_sx))
- if preview.get("lex_rendered"):
- rendered_sx = sx_call("blog-preview-rendered", html=preview["lex_rendered"])
- sections.append(sx_call("blog-preview-section",
- title="Lexical Rendered", content=rendered_sx))
+ return sx_call("blog-preview-content",
+ sx_pretty=SxExpr(preview["sx_pretty"]) if preview.get("sx_pretty") else None,
+ json_pretty=SxExpr(preview["json_pretty"]) if preview.get("json_pretty") else None,
+ sx_rendered=preview.get("sx_rendered") or None,
+ lex_rendered=preview.get("lex_rendered") or None)
- if not sections:
- return sx_call("blog-preview-empty")
- inner = " ".join(sections)
- return sx_call("blog-preview-panel", sections=SxExpr(f"(<> {inner})"))
+# ---------------------------------------------------------------------------
+# Entries browser
+# ---------------------------------------------------------------------------
+
+def _extract_associated_entries_data(all_calendars, associated_entry_ids, post_slug: str) -> list:
+ """Extract associated entry data for .sx rendering."""
+ from quart import url_for as qurl
+ from shared.utils import host_url
+
+ entries = []
+ for calendar in all_calendars:
+ cal_entries = getattr(calendar, "entries", []) or []
+ cal_name = getattr(calendar, "name", "")
+ cal_post = getattr(calendar, "post", None)
+ cal_fi = getattr(cal_post, "feature_image", None) if cal_post else None
+ cal_title = getattr(cal_post, "title", "") if cal_post else ""
+
+ for entry in cal_entries:
+ e_id = getattr(entry, "id", None)
+ if e_id not in associated_entry_ids:
+ continue
+ if getattr(entry, "deleted_at", None) is not None:
+ continue
+
+ e_name = getattr(entry, "name", "")
+ e_start = getattr(entry, "start_at", None)
+ e_end = getattr(entry, "end_at", None)
+
+ toggle_url = host_url(qurl("blog.post.admin.toggle_entry",
+ slug=post_slug, entry_id=e_id))
+
+ date_str = e_start.strftime("%A, %B %d, %Y at %H:%M") if e_start else ""
+ if e_end:
+ date_str += f" \u2013 {e_end.strftime('%H:%M')}"
+
+ entries.append({
+ "name": e_name,
+ "confirm_text": f"This will remove {e_name} from this post",
+ "toggle_url": toggle_url,
+ "cal_image": cal_fi or "",
+ "cal_title": cal_title,
+ "date_str": f"{cal_name} \u2022 {date_str}",
+ })
+
+ return entries
+
+
+def _extract_calendar_browser_data(all_calendars, post_slug: str) -> list:
+ """Extract calendar browser data for .sx rendering."""
+ from quart import url_for as qurl
+ from shared.utils import host_url
+
+ calendars = []
+ for cal in all_calendars:
+ cal_post = getattr(cal, "post", None)
+ cal_fi = getattr(cal_post, "feature_image", None) if cal_post else None
+ cal_title = getattr(cal_post, "title", "") if cal_post else ""
+ cal_name = getattr(cal, "name", "")
+ view_url = host_url(qurl("blog.post.admin.calendar_view",
+ slug=post_slug, calendar_id=cal.id))
+ calendars.append({
+ "name": cal_name,
+ "title": cal_title,
+ "image": cal_fi or "",
+ "view_url": view_url,
+ })
+ return calendars
async def _h_post_entries_content(slug=None, **kw):
await _ensure_post_data(slug)
- from quart import g, url_for as qurl
+ from quart import g
from sqlalchemy import select
- from markupsafe import escape as esc
from shared.models.calendars import Calendar
- from shared.utils import host_url
+ from shared.sx.helpers import sx_call
+ from shared.sx.parser import SxExpr
+ from shared.browser.app.csrf import generate_csrf_token
from bp.post.services.entry_associations import get_post_entry_ids
- from bp.post.admin.routes import _render_associated_entries
post_id = g.post_data["post"]["id"]
post_slug = g.post_data["post"]["slug"]
@@ -314,59 +515,31 @@ async def _h_post_entries_content(slug=None, **kw):
for calendar in all_calendars:
await g.s.refresh(calendar, ["entries", "post"])
- # Associated entries list
- assoc_html = _render_associated_entries(all_calendars, associated_entry_ids, post_slug)
+ csrf = generate_csrf_token()
+ entry_data = _extract_associated_entries_data(
+ all_calendars, associated_entry_ids, post_slug)
+ calendar_data = _extract_calendar_browser_data(all_calendars, post_slug)
- # Calendar browser
- cal_items: list[str] = []
- for cal in all_calendars:
- cal_post = getattr(cal, "post", None)
- cal_fi = getattr(cal_post, "feature_image", None) if cal_post else None
- cal_title = esc(getattr(cal_post, "title", "")) if cal_post else ""
- cal_name = esc(getattr(cal, "name", ""))
- cal_view_url = host_url(qurl("blog.post.admin.calendar_view", slug=post_slug, calendar_id=cal.id))
+ entries_panel = sx_call("blog-associated-entries-from-data",
+ entries=entry_data, csrf=csrf)
- img_html = (
- f''
- if cal_fi else
- ''
- )
- cal_items.append(
- f''
- f''
- f'{img_html}'
- f'
{field_label("Alt text", "settings-feature_image_alt")}{text_input("feature_image_alt", gp.get("feature_image_alt") or "", "Describe the feature image")}
'
+ # Published at — trim to datetime-local format
+ pub_at = gp.get("published_at") or ""
+ pub_at_val = pub_at[:16] if pub_at else ""
- seo_sec = (
- f'
{field_label("Meta title", "settings-meta_title")}{text_input("meta_title", gp.get("meta_title") or "", "SEO title", maxlength=300)}'
- f'
Recommended: 70 characters. Max: 300.
'
- f'
{field_label("Meta description", "settings-meta_description")}{textarea_input("meta_description", gp.get("meta_description") or "", "SEO description", rows=2, maxlength=500)}'
- f'
Recommended: 156 characters.
'
- f'
{field_label("Canonical URL", "settings-canonical_url")}{text_input("canonical_url", gp.get("canonical_url") or "", "https://example.com/original-post", input_type="url")}
'
- )
+ return sx_call("blog-settings-form-content",
+ csrf=csrf,
+ updated_at=gp.get("updated_at") or "",
+ is_page=is_page,
+ save_success=save_success,
+ slug=gp.get("slug") or "",
+ published_at=pub_at_val,
+ featured=bool(gp.get("featured")),
+ visibility=gp.get("visibility") or "public",
+ email_only=bool(gp.get("email_only")),
+ tags=tag_names,
+ feature_image_alt=gp.get("feature_image_alt") or "",
+ meta_title=gp.get("meta_title") or "",
+ meta_description=gp.get("meta_description") or "",
+ canonical_url=gp.get("canonical_url") or "",
+ og_title=gp.get("og_title") or "",
+ og_description=gp.get("og_description") or "",
+ og_image=gp.get("og_image") or "",
+ twitter_title=gp.get("twitter_title") or "",
+ twitter_description=gp.get("twitter_description") or "",
+ twitter_image=gp.get("twitter_image") or "",
+ custom_template=gp.get("custom_template") or "")
- og_sec = (
- f'
{field_label("OG title", "settings-og_title")}{text_input("og_title", gp.get("og_title") or "")}
'
- f'
{field_label("OG description", "settings-og_description")}{textarea_input("og_description", gp.get("og_description") or "", rows=2)}
'
- f'
{field_label("OG image URL", "settings-og_image")}{text_input("og_image", gp.get("og_image") or "", "https://...", input_type="url")}
'
- )
- tw_sec = (
- f'
{field_label("Twitter title", "settings-twitter_title")}{text_input("twitter_title", gp.get("twitter_title") or "")}
'
- f'
{field_label("Twitter description", "settings-twitter_description")}{textarea_input("twitter_description", gp.get("twitter_description") or "", rows=2)}
'
- f'
{field_label("Twitter image URL", "settings-twitter_image")}{text_input("twitter_image", gp.get("twitter_image") or "", "https://...", input_type="url")}
'
- )
+# ---------------------------------------------------------------------------
+# Post edit content
+# ---------------------------------------------------------------------------
- tmpl_placeholder = 'custom-page.hbs' if is_page else 'custom-post.hbs'
- adv_sec = f'
{field_label("Custom template", "settings-custom_template")}{text_input("custom_template", gp.get("custom_template") or "", tmpl_placeholder)}