Fix enrollment rendering parity and header-safe Step 7 layout

app/services/html_builder.py

@@ -405,11 +405,47 @@ def build_handbook_html(
             "tier_label": tier_label,
         })
 
-    # Stable tier ordering: Tier One (non_cosigner) → Tier Two (cosigner) → others, then alphabetical
+    # Explicit university display order
+    _UNIVERSITY_ORDER: list[str] = [
+        "Indiana University of Pennsylvania",
+        "Missouri State University",
+        "University of Louisville",
+        "University of Delaware",
+        "Grand Valley State University",
+        "Quinnipiac University",
+        "William Jessup University",
+        "Wilkes University",
+        "University of South Dakota",
+        "California Baptist University",
+        "Illinois State University",
+        "Virginia Commonwealth University",
+        "Rutgers University-Camden",
+        "University of Oklahoma",
+        "Saint Louis University",
+        "University of Alabama at Birmingham",
+        "Oregon State University",
+        "Rochester Institute of Technology",
+        "Lewis University",
+        "Texas State University",
+        "Drew University",
+        "University of Missouri- Saint Louis",
+        "Montana State University",
+        "Oklahoma City University",
+        "University of Dayton",
+        "Webster University",
+        "Rockhurst University",
+    ]
+    _uni_order_map = {name.lower().strip(): idx for idx, name in enumerate(_UNIVERSITY_ORDER)}
+
     def _tier_sort(u: dict) -> tuple:
+        name_lower = (u.get("name") or "").lower().strip()
+        explicit = _uni_order_map.get(name_lower)
+        if explicit is not None:
+            return (0, explicit, 0)
+        # Universities not in the explicit list go after, sorted by tier then alpha
         t = u.get("tier")
         rank = t if isinstance(t, int) else 99
-        return (rank, (u.get("name") or "").lower(), u.get("id", 0))
+        return (1, rank, name_lower, u.get("id", 0))
     active_universities.sort(key=_tier_sort)
 
     # ── Normalise globals ──

app/services/normalizer.py

@@ -363,6 +363,13 @@ def _normalize_steps(steps: list) -> list[dict]:
         step_title = str(s.get("title", s.get("step_title", ""))).strip()
         body = _normalize_text_content(str(s.get("body", s.get("description", ""))).strip())
 
+        if step_num == 2:
+            # Fix malformed source spacing around application fee token.
+            body = body.replace("**$20 **that", "**$20** that")
+            body = body.replace("**USD 20 **that", "**$20** that")
+            body = re.sub(r"\bUSD\s+20\b", "$20", body, flags=re.IGNORECASE)
+            body = re.sub(r"\$20\s*that\b", "$20 that", body, flags=re.IGNORECASE)
+
         # Pre-format body with bold emphasis on REGULAR, PRIME, $ amounts
         # and convert URLs to clickable bold links
         from markupsafe import Markup
@@ -398,7 +405,9 @@ def _normalize_steps(steps: list) -> list[dict]:
             })
 
         qr = str(s.get("qr_url", s.get("qr_image", ""))).strip()
-        if step_num == 1 and not qr:
+        telegram_url = ""
+        telegram_help_text = ""
+        if step_num == 1:
             telegram_ref = ""
             # Check links array for Telegram URLs first
             for lnk in links:
@@ -412,19 +421,66 @@ def _normalize_steps(steps: list) -> list[dict]:
                 m = re.search(r"(https?://(?:t\.me|telegram\.me)/[^\s<)]+)", body, flags=re.IGNORECASE)
                 if m:
                     telegram_ref = m.group(1)
+
+            if not telegram_ref:
+                telegram_ref = "https://t.me/+ivtij2xRull4yYmY5"
+
             if telegram_ref:
+                telegram_url = telegram_ref
                 # Use branded Telegram QR from static assets (matches Word doc)
                 # Embed as data URI so it works reliably in Playwright/Docker
                 import base64
-                branded_qr = Path(__file__).resolve().parent.parent / "static" / "img" / "telegram_qr.png"
-                if branded_qr.exists():
-                    b64 = base64.b64encode(branded_qr.read_bytes()).decode()
-                    qr = f"data:image/png;base64,{b64}"
-                else:
-                    qr = (
-                        "https://api.qrserver.com/v1/create-qr-code/?size=160x160&data="
-                        + quote_plus(telegram_ref)
-                    )
+                if not qr:
+                    branded_qr = Path(__file__).resolve().parent.parent / "static" / "img" / "telegram_qr.png"
+                    if branded_qr.exists():
+                        b64 = base64.b64encode(branded_qr.read_bytes()).decode()
+                        qr = f"data:image/png;base64,{b64}"
+                    else:
+                        qr = (
+                            "https://api.qrserver.com/v1/create-qr-code/?size=160x160&data="
+                            + quote_plus(telegram_ref)
+                        )
+
+                followup_re = (
+                    r"(This telegram group will help you interact with program administrators and "
+                    r"other prospective students where you can ask any questions you may have about "
+                    r"the program\.?)"
+                )
+                m_help = re.search(followup_re, body, flags=re.IGNORECASE)
+                if m_help:
+                    telegram_help_text = m_help.group(1).strip()
+
+                body = re.sub(r"https?://(?:t\.me|telegram\.me)/[^\s<)]+", "", body, flags=re.IGNORECASE)
+                body = re.sub(followup_re, "", body, flags=re.IGNORECASE)
+                body = re.sub(r"\n{2,}", "\n", body).strip()
+                body_html = Markup(linkify_urls(emphasize_keywords(body))) if body else ""
+
+        if step_num == 2:
+            website_url = ""
+            for lnk in links:
+                u = str(lnk.get("url", "")).strip()
+                if "internationalscholarsprogram.com" in u.lower():
+                    website_url = u
+                    break
+            if website_url and "internationalscholarsprogram.com" not in body.lower():
+                body = re.sub(
+                    r"\bVisit\s+and\s+submit\s+your\s+application\.",
+                    "Visit www.internationalscholarsprogram.com and submit your application.",
+                    body,
+                    flags=re.IGNORECASE,
+                )
+                body = re.sub(
+                    r"\bVisit\s{2,}and\s+submit\s+your\s+application\.",
+                    "Visit www.internationalscholarsprogram.com and submit your application.",
+                    body,
+                    flags=re.IGNORECASE,
+                )
+                body_html = Markup(linkify_urls(emphasize_keywords(body))) if body else ""
+
+            links = [
+                l for l in links
+                if "internationalscholarsprogram.com" not in str(l.get("url", "")).lower()
+            ]
 
         result.append({
             "number": step_num,
@@ -434,6 +490,8 @@ def _normalize_steps(steps: list) -> list[dict]:
             "links": links,
             "plain_links": plain_links,
             "qr_url": qr,
+            "telegram_url": telegram_url,
+            "telegram_help_text": telegram_help_text,
         })
     return result
 

app/static/css/print.css

@@ -864,10 +864,10 @@ table.programs td a,
 }
 
 .hb-step {
-    margin: 0 0 12pt;
-    padding: 8pt 0 8pt 12pt;
-    border-left: 3pt solid #199970;
-    background: #F6FBF9;
+    margin: 0 0 14pt;
+    padding: 0;
+    border-left: none;
+    background: transparent;
     page-break-inside: avoid;
     break-inside: avoid;
 }
@@ -876,23 +876,53 @@ table.programs td a,
     font-size: 10.5pt;
     font-weight: 700;
     color: #199970;
-    margin: 0 0 4pt;
+    margin: 0 0 5pt;
     line-height: 1.25;
     page-break-after: avoid;
     break-after: avoid;
 }
 
 .hb-step-qr-wrap {
-    margin: 6pt 0 8pt;
+    margin: 4pt 0 6pt;
     text-align: center;
 }
 
+.hb-step-link-line {
+    margin: 2pt 0 6pt;
+    text-align: left;
+    font-size: 10pt;
+}
+
+.hb-step-link-line a {
+    color: #0263A3;
+    text-decoration: underline;
+    border-bottom: none;
+    font-weight: 600;
+}
+
 .hb-step-qr {
     display: inline-block;
-    width: 89pt;
-    height: 65pt;
-    margin: 0 auto;
-    object-fit: contain;
+    width: 72pt;
+    height: 72pt;
+    margin: 4pt 0 6pt;
+}
+
+.hb-telegram-link {
+    margin: 2pt 0 6pt;
+    text-align: left;
+}
+
+.hb-telegram-link a {
+    color: #0263A3;
+    text-decoration: underline;
+    font-size: 9pt;
+}
+
+/* Step 7 often lands at a page top; force safe placement below stamped header area. */
+.hb-step.hb-step-7 {
+    page-break-before: always;
+    break-before: page;
+    padding-top: 14pt;
 }
 
 .hb-plain-url {
@@ -1563,4 +1593,4 @@ p {
         image-rendering: auto;
         -webkit-backface-visibility: hidden;
     }
-}
+}

app/templates/partials/blocks/enrollment_steps.html

@@ -1,6 +1,6 @@
 {# Block partial: enrollment_steps — each step visually separated #}
 {% for step in block.data.steps %}
-<div class="hb-step avoid-break">
+<div class="hb-step hb-step-{{ step.number }} avoid-break">
     {% if step.title %}
     <div class="hb-step-title">Step {{ step.number }}: {{ step.title | e }}</div>
     {% endif %}
@@ -10,23 +10,30 @@
     <p class="hb-paragraph">{{ step.body | e }}</p>
     {% endif %}
     {% if step.links %}
-    <ul class="hb-bullet-list">
-        {% for lnk in step.links %}
-        <li><a href="{{ lnk.url | e }}" target="_blank" rel="noopener noreferrer">{{ lnk.label | e }}</a></li>
-        {% endfor %}
-    </ul>
+    {% for lnk in step.links %}
+    <p class="hb-step-link-line"><a href="{{ lnk.url | e }}" target="_blank" rel="noopener noreferrer">{{ lnk.label | e
+            }}</a></p>
+    {% endfor %}
     {% endif %}
     {% if step.plain_links %}
-    <ul class="hb-bullet-list">
-        {% for plain_url in step.plain_links %}
-        <li><a href="{{ plain_url | e }}" target="_blank" rel="noopener noreferrer">{{ plain_url | e }}</a></li>
-        {% endfor %}
-    </ul>
+    {% for plain_url in step.plain_links %}
+    <p class="hb-step-link-line"><a href="{{ plain_url | e }}" target="_blank" rel="noopener noreferrer">{{ plain_url |
+            e
+            }}</a></p>
+    {% endfor %}
+    {% endif %}
+    {% if step.telegram_url %}
+    <div class="hb-telegram-link">
+        <a href="{{ step.telegram_url | e }}" target="_blank" rel="noopener noreferrer">{{ step.telegram_url | e }}</a>
+    </div>
     {% endif %}
     {% if step.qr_url %}
     <div class="hb-step-qr-wrap">
         <img class="hb-step-qr" src="{{ step.qr_url | e }}" alt="QR Code" />
     </div>
     {% endif %}
+    {% if step.telegram_help_text %}
+    <p class="hb-paragraph">{{ step.telegram_help_text | e }}</p>
+    {% endif %}
 </div>
 {% endfor %}