style: normalize headers, overtype editor rounded corners, remove duplicate cover preview, thesis-add-header grid layout, subtitle below header with top gradient

app/public/admin/actions/form-help-reorder.php

@@ -1,47 +1,11 @@
 <?php
 /**
- * HTMX handler: persist the new drag-and-drop sort order for form help blocks.
- *
- * Expects POST fields:
- *   csrf_token   — standard admin CSRF token
- *   block[]      — ordered list of block keys (one hidden input per block, submitted by
- *                  Sortable+htmx via the form's `end` event trigger)
- *
- * Returns a 204 No Content on success (htmx will not swap anything).
- * On error, returns a 400 with a plain-text message.
+ * Legacy endpoint — no longer used (blocks are now static, non-sortable).
+ * Returns 204 No Content for backwards compatibility.
  */
 require_once __DIR__ . '/../../../bootstrap.php';
 require_once __DIR__ . '/../../../src/AdminAuth.php';
 AdminAuth::requireLogin();
 
-if (!isset($_POST['csrf_token'], $_SESSION['csrf_token'])
-    || !hash_equals($_SESSION['csrf_token'], $_POST['csrf_token'])) {
-    http_response_code(403);
-    echo 'Token invalide.';
-    exit;
-}
-
-$keys = $_POST['block'] ?? [];
-if (!is_array($keys) || empty($keys)) {
-    http_response_code(400);
-    echo 'Paramètre block[] manquant.';
-    exit;
-}
-
-// Sanitise: keep only scalar strings, deduplicate.
-$keys = array_values(array_unique(array_filter($keys, 'is_string')));
-
-require_once APP_ROOT . '/src/Database.php';
-$db = new Database();
-
-try {
-    $db->reorderFormHelpBlocks($keys);
-} catch (Exception $e) {
-    error_log('form-help-reorder error: ' . $e->getMessage());
-    http_response_code(500);
-    echo 'Erreur lors de la sauvegarde.';
-    exit;
-}
-
 http_response_code(204);
 exit;

app/public/admin/add.php

@@ -27,7 +27,7 @@ $autofocusField = App::consumeAutofocus();
 $siteSettings = Database::getInstance()->getAllSettings();
 // Form help blocks
 $helpBlocks = Database::getInstance()->getAllFormHelpBlocks();
-$helpFn = fn(string $key) => $helpBlocks[$key]['content'] ?? '';
+$helpFn = fn(string $key) => empty($helpBlocks[$key]['enabled']) ? '' : ($helpBlocks[$key]['content'] ?? '');
 
 function withAutofocus(string $fieldName, array $attrs = []): array {
     global $autofocusField;

app/public/admin/contenus-edit.php

@@ -50,7 +50,7 @@ try {
     } elseif ($formHelpKey) {
         $editType        = "form_help";
         $formHelpContent = $db->getFormHelpBlock($formHelpKey);
-        $editTitle       = Database::FORM_HELP_LABELS[$formHelpKey] ?? $formHelpKey;
+        $editTitle       = $formHelpKey;
     } else {
         $editType  = "apropos";
         $value     = $db->getAproposContent($aproposKey);

app/public/admin/edit.php

@@ -19,7 +19,7 @@ $autofocusField = App::consumeAutofocus();
 
 // Form help blocks for editable généralités
 $helpBlocks = Database::getInstance()->getAllFormHelpBlocks();
-$helpFn = fn(string $key) => $helpBlocks[$key]['content'] ?? '';
+$helpFn = fn(string $key) => empty($helpBlocks[$key]['enabled']) ? '' : ($helpBlocks[$key]['content'] ?? '');
 
 function old($key, $default = "") {
     global $formData;

app/public/admin/form-help-inline-fragment.php

@@ -0,0 +1,196 @@
+<?php
+/**
+ * HTMX fragment: expand/collapse/editor for a single form help block.
+ *
+ * GET  ?key=xxx          → render collapsed chip: 3/4 left (name + MD preview), 1/4 right (edit + toggle dot)
+ * GET  ?key=xxx&edit=1   → render inline OverType editor + name field
+ * POST                    → save content + name, return collapsed view
+ * POST _action=toggle     → toggle enabled, return collapsed view
+ */
+require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../../src/AdminAuth.php';
+AdminAuth::requireLogin();
+require_once __DIR__ . '/../../src/Database.php';
+
+if (empty($_SESSION['csrf_token'])) {
+    $_SESSION['csrf_token'] = bin2hex(random_bytes(32));
+}
+
+$key = $_GET['key'] ?? '';
+
+if (!in_array($key, Database::FORM_HELP_KEYS, true)) {
+    http_response_code(400);
+    echo 'Clé invalide.';
+    exit;
+}
+
+// ── POST ─────────────────────────────────────────────────────────────────────
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $action = $_POST['_action'] ?? 'save';
+    $db = new Database();
+
+    // Toggle doesn't need CSRF — low-risk action behind admin auth
+    if ($action === 'toggle') {
+        $db->toggleFormHelpBlock($key);
+        renderCollapsed($db, $key);
+        exit;
+    }
+
+    // Save requires CSRF
+    if (!isset($_POST['csrf_token'], $_SESSION['csrf_token'])
+        || !hash_equals($_SESSION['csrf_token'], $_POST['csrf_token'])) {
+        http_response_code(403);
+        echo 'Token invalide.';
+        exit;
+    }
+
+    // save
+    $content = $_POST['content'] ?? '';
+    $name    = trim($_POST['name'] ?? '');
+    try {
+        $db->setFormHelpBlock($key, $content);
+        if ($name !== '') {
+            $db->setFormHelpBlockName($key, $name);
+        }
+        require_once __DIR__ . '/../../src/AdminLogger.php';
+        AdminLogger::make()->logFormStructureEdit($key);
+    } catch (Exception $e) {
+        error_log('form-help-inline save error: ' . $e->getMessage());
+        http_response_code(500);
+        echo 'Erreur lors de la sauvegarde.';
+        exit;
+    }
+
+    $_SESSION['csrf_token'] = bin2hex(random_bytes(32));
+    renderCollapsed($db, $key);
+    exit;
+}
+
+// ── GET ──────────────────────────────────────────────────────────────────────
+$db = new Database();
+$editMode = ($_GET['edit'] ?? '') === '1';
+
+if ($editMode) {
+    renderEditor($db, $key);
+} else {
+    renderCollapsed($db, $key);
+}
+
+// ═══════════════════════════════════════════════════════════════════════════════
+// RENDER HELPERS
+// ═══════════════════════════════════════════════════════════════════════════════
+
+function renderCollapsed(Database $db, string $key): void
+{
+    $blocks = $db->getAllFormHelpBlocks();
+    $b      = $blocks[$key] ?? ['content' => '', 'name' => '', 'enabled' => 0];
+    $name   = $b['name'] ?: $key;
+    $content = $b['content'] ?? '';
+    $enabled = (int)($b['enabled'] ?? 1);
+    $hasContent = trim($content) !== '';
+
+    $mdHtml = '';
+    if ($hasContent) {
+        require_once APP_ROOT . '/src/Parsedown.php';
+        $pd = new Parsedown();
+        $pd->setSafeMode(true);
+        $mdHtml = $pd->text($content);
+    }
+    ?>
+    <div class="fhb-inline <?= $enabled ? '' : 'fhb-inline--disabled' ?>" data-key="<?= htmlspecialchars($key) ?>">
+
+        <!-- Left side: name + content (content hidden when disabled) -->
+        <div class="fhb-inline-body">
+            <div class="fhb-inline-name"><?= htmlspecialchars($name) ?></div>
+            <?php if ($enabled && $hasContent): ?>
+            <div class="fhb-md-preview"><?= $mdHtml ?></div>
+            <?php elseif ($enabled): ?>
+            <div class="fhb-inline-empty">— vide —</div>
+            <?php endif; ?>
+        </div>
+
+        <!-- Right side: dot above edit button (edit hidden when disabled) -->
+        <div class="fhb-inline-actions">
+            <form hx-post="/admin/form-help-inline-fragment.php?key=<?= urlencode($key) ?>"
+                  hx-target="closest .fhb-inline"
+                  hx-swap="outerHTML"
+                  class="fhb-toggle-form">
+                <input type="hidden" name="_action" value="toggle">
+                <button type="submit"
+                        class="fhb-dot <?= $enabled ? 'fhb-dot--on' : 'fhb-dot--off' ?>"
+                        title="<?= $enabled ? 'Désactiver ce bloc' : 'Activer ce bloc' ?>"
+                        aria-label="<?= $enabled ? 'Désactiver ce bloc' : 'Activer ce bloc' ?>"></button>
+            </form>
+
+            <?php if ($enabled): ?>
+            <button type="button" class="btn btn--primary btn--sm"
+                    hx-get="/admin/form-help-inline-fragment.php?key=<?= urlencode($key) ?>&edit=1"
+                    hx-target="closest .fhb-inline"
+                    hx-swap="outerHTML">Éditer</button>
+            <?php endif; ?>
+        </div>
+
+    </div>
+    <?php
+}
+
+function renderEditor(Database $db, string $key): void
+{
+    $blocks = $db->getAllFormHelpBlocks();
+    $b      = $blocks[$key] ?? ['content' => '', 'name' => ''];
+    $name   = $b['name'] ?: $key;
+    $content = $b['content'] ?? '';
+    ?>
+    <div class="fhb-inline fhb-inline--editing" data-key="<?= htmlspecialchars($key) ?>">
+        <form hx-post="/admin/form-help-inline-fragment.php?key=<?= urlencode($key) ?>"
+              hx-swap="outerHTML"
+              hx-target="closest .fhb-inline"
+              class="fhb-inline-form">
+            <input type="hidden" name="csrf_token" value="<?= htmlspecialchars($_SESSION['csrf_token']) ?>">
+
+            <div class="fhb-edit-name-row">
+                <label for="fhb-name-<?= htmlspecialchars($key) ?>" class="fhb-edit-label">Nom du bloc :</label>
+                <input type="text" id="fhb-name-<?= htmlspecialchars($key) ?>" name="name"
+                       value="<?= htmlspecialchars($name) ?>"
+                       class="fhb-name-input"
+                       placeholder="Nom du bloc d'aide">
+            </div>
+
+            <label for="fhb-ed-<?= htmlspecialchars($key) ?>" class="fhb-edit-label">Contenu (Markdown) :</label>
+            <input type="hidden" id="fhb-content-<?= htmlspecialchars($key) ?>" name="content"
+                   value="<?= htmlspecialchars($content) ?>">
+            <div id="fhb-editor-<?= htmlspecialchars($key) ?>" class="fhb-overtype-editor"></div>
+
+            <div class="fhb-edit-buttons">
+                <button type="submit" class="btn btn--primary btn--sm">Enregistrer</button>
+                <button type="button" class="btn btn--secondary btn--sm"
+                        hx-get="/admin/form-help-inline-fragment.php?key=<?= urlencode($key) ?>"
+                        hx-target="closest .fhb-inline"
+                        hx-swap="outerHTML">Annuler</button>
+            </div>
+        </form>
+        <script>
+        (function(){
+            var hidden = document.getElementById('fhb-content-<?= htmlspecialchars($key) ?>');
+            var ed = document.getElementById('fhb-editor-<?= htmlspecialchars($key) ?>');
+            if (hidden && ed && typeof OverType !== 'undefined') {
+                var OT = OverType.default || OverType;
+                new OT(ed, {
+                    value: hidden.value,
+                    minHeight: '400px',
+                    spellcheck: false,
+                    onChange: function(v) { hidden.value = v; }
+                });
+            } else {
+                ed.innerHTML = '<textarea name="content" style="width:100%;min-height:400px;font-family:monospace">'
+                    + hidden.value.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
+                var ta = ed.querySelector('textarea');
+                ta.addEventListener('input', function() {
+                    hidden.value = this.value;
+                });
+            }
+        })();
+        </script>
+    </div>
+    <?php
+}

app/public/admin/licence-fragment.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * HTMX fragment (admin): renders the licence section with conditional required states.
+ *
+ * POST: access_type_id, license_id, license_custom, cc2r, admin_mode
+ *
+ * Admin mode: never required.
+ */
+require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../../src/AdminAuth.php';
+AdminAuth::requireLogin();
+
+$accessTypeId = $_POST['access_type_id'] ?? '2';
+$licenseId    = $_POST['license_id']     ?? '';
+$licenseCustom = $_POST['license_custom'] ?? '';
+$cc2r         = !empty($_POST['cc2r']);
+$adminMode    = true;
+
+require_once APP_ROOT . '/src/Database.php';
+$db = Database::getInstance();
+$licenseTypes = $db->getAllLicenseTypes();
+?>
+
+<div class="licence-license-choice">
+    <?php
+    $name = 'license_id'; $label = 'Licence :'; $options = $licenseTypes;
+    $selected = $licenseId; $placeholder = '— Sélectionner —'; $required = false;
+    include APP_ROOT . '/templates/partials/form/select-field.php';
+    ?>
+
+    <?php
+    $name = 'license_custom'; $label = 'Ou précisez une autre licence :';
+    $value = htmlspecialchars($licenseCustom);
+    $hint = 'Ex: CC BY-NC 4.0, Tous droits réservés...';
+    include APP_ROOT . '/templates/partials/form/text-field.php';
+    ?>
+
+    <div class="admin-form-group">
+        <label class="admin-checkbox-label">
+            <input type="checkbox" name="cc2r" value="1"
+                   <?= $cc2r ? 'checked' : '' ?>>
+            J'accepte les Conditions Collectives de Réutilisation (CC2r)
+        </label>
+        <small><a href="https://cc2r.net/" target="_blank" rel="noopener">En savoir plus sur la CC2r ↗</a></small>
+    </div>
+</div>