Merge branch 'macros'

# Conflicts:
#	blog/bp/post/admin/routes.py
#	events/sxc/pages/calendar.py
#	events/sxc/pages/entries.py
#	events/sxc/pages/slots.py
#	events/sxc/pages/tickets.py

market/sxc/pages/helpers.py

@@ -129,7 +129,7 @@ async def _h_page_admin_data(slug=None, **kw) -> dict:
         m_name = getattr(m, "name", "") or (m.get("name", "") if isinstance(m, dict) else "")
         href = prefix + f"/{post_slug}/{m_slug}/"
         del_url = url_for("page_admin.delete_market", market_slug=m_slug)
-        csrf_hdr = f'{{"X-CSRFToken":"{csrf}"}}'
+        csrf_hdr = {"X-CSRFToken": csrf}
         markets.append({
             "href": href, "name": m_name, "slug": m_slug,
             "del-url": del_url, "csrf-hdr": csrf_hdr,

market/sxc/pages/renders.py

@@ -175,7 +175,7 @@ def render_like_toggle_button(slug: str, liked: bool, *,
     return sx_call(
         "market-like-toggle-button",
         colour=colour, action=like_url,
-        hx_headers=f'{{"X-CSRFToken": "{csrf}"}}',
+        hx_headers={"X-CSRFToken": csrf},
         label=label, icon_cls=icon,
     )