mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-06-25 16:19:19 +02:00
style: unify recap+edit file figure styling — two-column grid dl, vertical spacing, admin-back-btn sizing, standardise file display and delete-to-trash SVG icons
This commit is contained in:
3
TODO.md
3
TODO.md
@@ -22,6 +22,9 @@
|
|||||||
- [x] Decorelate formats from fichiers: no HTMX toggling; Site web/Vidéo/Audio always visible
|
- [x] Decorelate formats from fichiers: no HTMX toggling; Site web/Vidéo/Audio always visible
|
||||||
- [x] Sticky formats fieldset inside parent container
|
- [x] Sticky formats fieldset inside parent container
|
||||||
- [x] Server-side progress: PeerTubeService writes to temp file, client polls progress endpoint
|
- [x] Server-side progress: PeerTubeService writes to temp file, client polls progress endpoint
|
||||||
|
- [x] Fix cover deletion bug: !empty() instead of isset()
|
||||||
|
- [x] Remove old duplicate file list CSS; unified recap+edit file figure styling
|
||||||
|
- [x] Standardise uploaded/preexisting files styling: recap now matches edit (classes, icons, meta row, display_label)
|
||||||
- [x] Refactor licence fieldset: Libre→CC2r+licence, Interne→opt-in licence, Interdit→none
|
- [x] Refactor licence fieldset: Libre→CC2r+licence, Interne→opt-in licence, Interdit→none
|
||||||
|
|
||||||
## HTMX Toast Feedback for Settings Checkboxes (contenus.php)
|
## HTMX Toast Feedback for Settings Checkboxes (contenus.php)
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ if (isset($_GET['id'])) {
|
|||||||
$error = "Aucun identifiant spécifié.";
|
$error = "Aucun identifiant spécifié.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!function_exists('formatFileSize')) {
|
||||||
function formatFileSize($bytes) {
|
function formatFileSize($bytes) {
|
||||||
if ($bytes >= 1073741824) {
|
if ($bytes >= 1073741824) {
|
||||||
return number_format($bytes / 1073741824, 2) . ' GB';
|
return number_format($bytes / 1073741824, 2) . ' GB';
|
||||||
@@ -54,6 +55,7 @@ function formatFileSize($bytes) {
|
|||||||
return $bytes . ' bytes';
|
return $bytes . ' bytes';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$pageTitle = "Récapitulatif TFE";
|
$pageTitle = "Récapitulatif TFE";
|
||||||
$isAdmin = true;
|
$isAdmin = true;
|
||||||
|
|||||||
@@ -87,13 +87,15 @@
|
|||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 32px;
|
width: 40px;
|
||||||
height: 32px;
|
height: 40px;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
color: var(--text-secondary);
|
color: var(--text-secondary);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
transition: background 0.15s, color 0.15s;
|
transition: background 0.15s, color 0.15s;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
vertical-align: middle;
|
||||||
|
margin-right: var(--space-2xs);
|
||||||
}
|
}
|
||||||
|
|
||||||
.admin-back-btn:hover {
|
.admin-back-btn:hover {
|
||||||
@@ -102,8 +104,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.admin-back-btn svg {
|
.admin-back-btn svg {
|
||||||
width: 22px;
|
width: 28px;
|
||||||
height: 22px;
|
height: 28px;
|
||||||
fill: currentColor;
|
fill: currentColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2067,3 +2069,36 @@ th.admin-ap-col {
|
|||||||
.htmx-indicator img {
|
.htmx-indicator img {
|
||||||
transition: opacity 300ms ease-in;
|
transition: opacity 300ms ease-in;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── Récapitulatif sections ───────────────────────────────── */
|
||||||
|
|
||||||
|
.recap-synopsis,
|
||||||
|
.recap-long-text {
|
||||||
|
max-width: 70ch;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Two-column definition lists */
|
||||||
|
.recap-dl {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto 1fr;
|
||||||
|
gap: var(--space-2xs) var(--space-m);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recap-dl dt {
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: var(--step--1);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recap-dl dd {
|
||||||
|
margin: 0 0 var(--space-xs) 0;
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: var(--step--1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.recap-dl dd:last-of-type {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|||||||
@@ -628,171 +628,6 @@
|
|||||||
background-color: var(--bg-primary);
|
background-color: var(--bg-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Existing-files list (edit form) ─────────────────────────────────────── */
|
|
||||||
|
|
||||||
.admin-file-list {
|
|
||||||
list-style: none;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: var(--space-xs);
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-list-item {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-xs);
|
|
||||||
padding: var(--space-3xs) var(--space-xs);
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-icon-col {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
line-height: 1;
|
|
||||||
flex-shrink: 0;
|
|
||||||
width: 1.8rem;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-info {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 2px;
|
|
||||||
flex: 1;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-name {
|
|
||||||
font-size: var(--step--1);
|
|
||||||
font-weight: 500;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
a.admin-file-name {
|
|
||||||
text-decoration: underline;
|
|
||||||
text-underline-offset: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.admin-file-name:hover {
|
|
||||||
color: var(--accent-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-meta-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2xs);
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-type-badge {
|
|
||||||
font-size: var(--step--2);
|
|
||||||
padding: 1px 5px;
|
|
||||||
background: var(--bg-primary);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
color: var(--text-secondary);
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-size {
|
|
||||||
font-size: var(--step--2);
|
|
||||||
color: var(--text-tertiary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-file-delete {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-left: auto;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Recap file list (admin & partage recapitulatif) ────────────────────── */
|
|
||||||
.recap-file-list {
|
|
||||||
list-style: none;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: var(--space-xs);
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-item {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-s);
|
|
||||||
padding: var(--space-xs) var(--space-s);
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-thumb-link {
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-thumb {
|
|
||||||
width: 64px;
|
|
||||||
height: 64px;
|
|
||||||
object-fit: cover;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-icon {
|
|
||||||
font-size: 2rem;
|
|
||||||
line-height: 1;
|
|
||||||
width: 64px;
|
|
||||||
text-align: center;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-meta {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
align-items: baseline;
|
|
||||||
gap: var(--space-2xs) var(--space-s);
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-name {
|
|
||||||
font-size: var(--step--1);
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--text-primary);
|
|
||||||
word-break: break-all;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.recap-file-name {
|
|
||||||
text-decoration: underline;
|
|
||||||
text-underline-offset: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.recap-file-name:hover {
|
|
||||||
color: var(--accent-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-type-badge {
|
|
||||||
font-size: var(--step--2);
|
|
||||||
padding: 1px 6px;
|
|
||||||
background: var(--bg-primary);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
color: var(--text-secondary);
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.recap-file-size,
|
|
||||||
.recap-file-date {
|
|
||||||
font-size: var(--step--2);
|
|
||||||
color: var(--text-tertiary);
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Partage recap page ─────────────────────────────────────────────────── */
|
/* ── Partage recap page ─────────────────────────────────────────────────── */
|
||||||
.partage-recap {
|
.partage-recap {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -16,6 +16,21 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require_once APP_ROOT . '/src/PeerTubeService.php';
|
require_once APP_ROOT . '/src/PeerTubeService.php';
|
||||||
|
|
||||||
|
if (!function_exists('formatFileSize')) {
|
||||||
|
function formatFileSize($bytes) {
|
||||||
|
if ($bytes >= 1073741824) {
|
||||||
|
return number_format($bytes / 1073741824, 2) . ' GB';
|
||||||
|
} elseif ($bytes >= 1048576) {
|
||||||
|
return number_format($bytes / 1048576, 2) . ' MB';
|
||||||
|
} elseif ($bytes >= 1024) {
|
||||||
|
return number_format($bytes / 1024, 2) . ' KB';
|
||||||
|
} else {
|
||||||
|
return $bytes . ' bytes';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} // if (!function_exists('formatFileSize'))
|
||||||
|
|
||||||
$_ptDb = Database::getInstance();
|
$_ptDb = Database::getInstance();
|
||||||
$peerTubeEnabled = PeerTubeService::isEnabled($_ptDb);
|
$peerTubeEnabled = PeerTubeService::isEnabled($_ptDb);
|
||||||
$peerTubeSettings = PeerTubeService::getSettings($_ptDb);
|
$peerTubeSettings = PeerTubeService::getSettings($_ptDb);
|
||||||
@@ -103,16 +118,22 @@ $websiteLabel = htmlspecialchars($_POST['website_label'] ?? '');
|
|||||||
foreach ($_thesisFilesList as $_f):
|
foreach ($_thesisFilesList as $_f):
|
||||||
$_fPath = $_f["file_path"] ?? "";
|
$_fPath = $_f["file_path"] ?? "";
|
||||||
$_fIsPeerTube = str_starts_with($_fPath, "peertube_ids:");
|
$_fIsPeerTube = str_starts_with($_fPath, "peertube_ids:");
|
||||||
|
$_fMime = $_f["mime_type"] ?? "";
|
||||||
$_fExt = strtolower(pathinfo($_fPath, PATHINFO_EXTENSION));
|
$_fExt = strtolower(pathinfo($_fPath, PATHINFO_EXTENSION));
|
||||||
$_fType = $_f["file_type"] ?? "other";
|
$_fType = $_f["file_type"] ?? "other";
|
||||||
|
$_fLabel = $_f["display_label"] ?? "";
|
||||||
|
$_fIsImage = str_starts_with($_fMime, "image/") || in_array($_fExt, ["jpg","jpeg","png","gif","webp"]);
|
||||||
$_fIcon = match (true) {
|
$_fIcon = match (true) {
|
||||||
$_fIsPeerTube && $_fType === "video" => "🎬",
|
$_fIsPeerTube && $_fType === "video" => "🎬",
|
||||||
$_fIsPeerTube && $_fType === "audio" => "🔊",
|
$_fIsPeerTube && $_fType === "audio" => "🔊",
|
||||||
$_fType === "main" || $_fExt === "pdf" => "📄",
|
$_fType === "cover" => "🖼️",
|
||||||
in_array($_fExt, ["jpg","jpeg","png","gif","webp"]) => "🖼️",
|
$_fType === "note_intention" => "📝",
|
||||||
$_fType === "video" || in_array($_fExt, ["mp4","webm","mov","ogv"]) => "🎬",
|
$_fType === "main" || $_fMime === "application/pdf" || $_fExt === "pdf" => "📄",
|
||||||
$_fType === "audio" || in_array($_fExt, ["mp3","ogg","wav","flac","aac","m4a"]) => "🔊",
|
$_fType === "video" || str_starts_with($_fMime, "video/") || in_array($_fExt, ["mp4","webm","mov","ogv"]) => "🎬",
|
||||||
|
$_fType === "audio" || str_starts_with($_fMime, "audio/") || in_array($_fExt, ["mp3","ogg","wav","flac","aac","m4a"]) => "🔊",
|
||||||
|
$_fIsImage => "🖼️",
|
||||||
$_fType === "caption" || $_fExt === "vtt" => "💬",
|
$_fType === "caption" || $_fExt === "vtt" => "💬",
|
||||||
|
$_fType === "annex" => "📎",
|
||||||
$_fType === "website" => "🌐",
|
$_fType === "website" => "🌐",
|
||||||
default => "📎",
|
default => "📎",
|
||||||
};
|
};
|
||||||
@@ -122,7 +143,11 @@ $websiteLabel = htmlspecialchars($_POST['website_label'] ?? '');
|
|||||||
<li class="admin-file-list-item" data-file-id="<?= (int)$_f["id"] ?>">
|
<li class="admin-file-list-item" data-file-id="<?= (int)$_f["id"] ?>">
|
||||||
<input type="hidden" name="file_sort_order[]" value="<?= (int)$_f["id"] ?>">
|
<input type="hidden" name="file_sort_order[]" value="<?= (int)$_f["id"] ?>">
|
||||||
<figure class="admin-file-figure">
|
<figure class="admin-file-figure">
|
||||||
|
<?php if ($_fIsImage && !$_fIsPeerTube): ?>
|
||||||
|
<img src="/media?path=<?= urlencode($_fPath) ?>" alt="<?= htmlspecialchars($_f["file_name"] ?? basename($_f["file_path"])) ?>" class="admin-file-thumb" loading="lazy">
|
||||||
|
<?php else: ?>
|
||||||
<span class="admin-file-icon"><?= $_fIcon ?></span>
|
<span class="admin-file-icon"><?= $_fIcon ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
<figcaption class="admin-file-caption">
|
<figcaption class="admin-file-caption">
|
||||||
<div class="admin-file-name-row">
|
<div class="admin-file-name-row">
|
||||||
<a href="<?= $_fLinkHref ?>" target="_blank" rel="noopener" class="admin-file-name">
|
<a href="<?= $_fLinkHref ?>" target="_blank" rel="noopener" class="admin-file-name">
|
||||||
@@ -132,10 +157,16 @@ $websiteLabel = htmlspecialchars($_POST['website_label'] ?? '');
|
|||||||
<?php if ($_fIsPeerTube): ?>
|
<?php if ($_fIsPeerTube): ?>
|
||||||
<span class="admin-file-peertube-id">ID : <?= htmlspecialchars(substr($_fPath, strlen("peertube_ids:"))) ?></span>
|
<span class="admin-file-peertube-id">ID : <?= htmlspecialchars(substr($_fPath, strlen("peertube_ids:"))) ?></span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
<?php if ($_fLabel): ?>
|
||||||
|
<span class="admin-file-label"><?= htmlspecialchars($_fLabel) ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
<span class="admin-file-meta-row">
|
<span class="admin-file-meta-row">
|
||||||
<span class="admin-file-type-badge"><?= htmlspecialchars($_fType) ?></span>
|
<span class="admin-file-meta"><?= htmlspecialchars($_fType) ?></span>
|
||||||
<?php if (!empty($_f["file_size"]) && $_f["file_size"] > 0): ?>
|
<?php if (!empty($_f["file_size"]) && $_f["file_size"] > 0): ?>
|
||||||
<span class="admin-file-size"><?= number_format($_f["file_size"] / 1024 / 1024, 2) ?> MB</span>
|
<span class="admin-file-meta"><?= formatFileSize($_f["file_size"]) ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
|
<?php if (!empty($_f["uploaded_at"])): ?>
|
||||||
|
<span class="admin-file-meta"><?= date('d/m/Y H:i', strtotime($_f["uploaded_at"])) ?></span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</span>
|
</span>
|
||||||
</figcaption>
|
</figcaption>
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ class ThesisEditController
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Cover image (outside transaction — filesystem op) ─────────────────
|
// ── Cover image (outside transaction — filesystem op) ─────────────────
|
||||||
if (isset($post['remove_cover'])) {
|
if (!empty($post['remove_cover'])) {
|
||||||
foreach ($existingFiles as $f) {
|
foreach ($existingFiles as $f) {
|
||||||
if ($f['file_type'] === 'cover') {
|
if ($f['file_type'] === 'cover') {
|
||||||
$this->db->deleteThesisFile((int)$f['id'], $thesisId);
|
$this->db->deleteThesisFile((int)$f['id'], $thesisId);
|
||||||
|
|||||||
@@ -1104,6 +1104,84 @@
|
|||||||
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
+\\\\\\\ to: ovpvxorx 2aa6ba2c "exhaustive recap: all fields, figures for files, PeerTube ID display, same in edit form" (rebased revision)
|
+\\\\\\\ to: ovpvxorx 2aa6ba2c "exhaustive recap: all fields, figures for files, PeerTube ID display, same in edit form" (rebased revision)
|
||||||
++ $linkName = $link['name'] ?? '';
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: ovpvxorx 2aa6ba2c "exhaustive recap: all fields, figures for files, PeerTube ID display, same in edit form" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: ruoswrzk 8546fff5 "standardize file delete to trash SVG icon; remove label inputs; unify recap+edit file figure styling" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: ruoswrzk e8d54185 "standardize file delete to trash SVG icon; remove label inputs; unify recap+edit file figure styling" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: ruoswrzk e8d54185 "standardize file delete to trash SVG icon; remove label inputs; unify recap+edit file figure styling" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: ssnyrkon fee4c8f7 "bump admin-back-btn to 40px, 28px SVG, align with h1" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: ssnyrkon e2e8388f "bump admin-back-btn to 40px, 28px SVG, align with h1" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: ssnyrkon e2e8388f "bump admin-back-btn to 40px, 28px SVG, align with h1" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: ztyvmwny 33e7b0d6 "style recap with two-column grid definition lists; synopsis max-width" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: ztyvmwny 1ed77ab1 "style recap with two-column grid definition lists; synopsis max-width" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: ztyvmwny 1ed77ab1 "style recap with two-column grid definition lists; synopsis max-width" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: skqpnwtr 51195512 "add vertical spacing between recap dl rows" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: skqpnwtr 8f582535 "add vertical spacing between recap dl rows" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: skqpnwtr 8f582535 "add vertical spacing between recap dl rows" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: nkopozsr 1875c855 "verify recap file styling unified with admin-file-figure" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: nkopozsr 02201e47 "verify recap file styling unified with admin-file-figure" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: nkopozsr 02201e47 "verify recap file styling unified with admin-file-figure" (rebased revision)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
- $linkName = $link['name'] ?? '';
|
||||||
|
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
|
||||||
|
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: pmsuvltv 01296a17 "standardise file display styling between edit and recapitulatif" (rebased revision)
|
||||||
|
$linkName = $link['name'] ?? '';
|
||||||
|
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
|
$linkLockedYear = $link['locked_year'] ?? null;
|
||||||
|
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
|
||||||
|
+\\\\\\\ to: pmsuvltv cfd4af17 "standardise file display styling between edit and recapitulatif" (rebased revision)
|
||||||
|
++ $linkName = $link['name'] ?? '';
|
||||||
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
|
||||||
?>
|
?>
|
||||||
<tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer">
|
<tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer">
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
<!-- ═══════════ Identité ═══════════ -->
|
<!-- ═══════════ Identité ═══════════ -->
|
||||||
<section>
|
<section>
|
||||||
<h2>Identité</h2>
|
<h2>Identité</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<dt>Identifiant</dt><dd><?= htmlspecialchars($thesis['identifier']) ?></dd>
|
<dt>Identifiant</dt><dd><?= htmlspecialchars($thesis['identifier']) ?></dd>
|
||||||
<dt>Titre</dt><dd><?= htmlspecialchars($thesis['title']) ?></dd>
|
<dt>Titre</dt><dd><?= htmlspecialchars($thesis['title']) ?></dd>
|
||||||
<?php if ($thesis['subtitle']): ?>
|
<?php if ($thesis['subtitle']): ?>
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
<!-- ═══════════ Cadre académique ═══════════ -->
|
<!-- ═══════════ Cadre académique ═══════════ -->
|
||||||
<section>
|
<section>
|
||||||
<h2>Cadre académique</h2>
|
<h2>Cadre académique</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<dt>Orientation</dt><dd><?= htmlspecialchars($thesis['orientation'] ?? '–') ?></dd>
|
<dt>Orientation</dt><dd><?= htmlspecialchars($thesis['orientation'] ?? '–') ?></dd>
|
||||||
<dt>Atelier Pratique</dt><dd><?= htmlspecialchars($thesis['ap_program'] ?? '–') ?></dd>
|
<dt>Atelier Pratique</dt><dd><?= htmlspecialchars($thesis['ap_program'] ?? '–') ?></dd>
|
||||||
<dt>Finalité</dt><dd><?= htmlspecialchars($thesis['finality_type'] ?? '–') ?></dd>
|
<dt>Finalité</dt><dd><?= htmlspecialchars($thesis['finality_type'] ?? '–') ?></dd>
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
<?php if ($hasJury): ?>
|
<?php if ($hasJury): ?>
|
||||||
<section>
|
<section>
|
||||||
<h2>Jury</h2>
|
<h2>Jury</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<?php if ($thesis['jury_president']): ?>
|
<?php if ($thesis['jury_president']): ?>
|
||||||
<dt>Président·e</dt><dd><?= htmlspecialchars($thesis['jury_president']) ?></dd>
|
<dt>Président·e</dt><dd><?= htmlspecialchars($thesis['jury_president']) ?></dd>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
@@ -108,7 +108,7 @@
|
|||||||
<!-- ═══════════ Contenu ═══════════ -->
|
<!-- ═══════════ Contenu ═══════════ -->
|
||||||
<section>
|
<section>
|
||||||
<h2>Contenu</h2>
|
<h2>Contenu</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<dt>Synopsis</dt>
|
<dt>Synopsis</dt>
|
||||||
<dd class="recap-synopsis"><?= nl2br(htmlspecialchars($thesis['synopsis'] ?? '–')) ?></dd>
|
<dd class="recap-synopsis"><?= nl2br(htmlspecialchars($thesis['synopsis'] ?? '–')) ?></dd>
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@
|
|||||||
<!-- ═══════════ Accès et licence ═══════════ -->
|
<!-- ═══════════ Accès et licence ═══════════ -->
|
||||||
<section>
|
<section>
|
||||||
<h2>Accès et licence</h2>
|
<h2>Accès et licence</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<dt>Degré d'ouverture</dt><dd><?= htmlspecialchars($thesis['access_type'] ?? '–') ?></dd>
|
<dt>Degré d'ouverture</dt><dd><?= htmlspecialchars($thesis['access_type'] ?? '–') ?></dd>
|
||||||
|
|
||||||
<?php if ($thesis['license_type']): ?>
|
<?php if ($thesis['license_type']): ?>
|
||||||
@@ -159,7 +159,7 @@
|
|||||||
<!-- ═══════════ Dates et publication ═══════════ -->
|
<!-- ═══════════ Dates et publication ═══════════ -->
|
||||||
<section>
|
<section>
|
||||||
<h2>Dates et publication</h2>
|
<h2>Dates et publication</h2>
|
||||||
<dl>
|
<dl class="recap-dl">
|
||||||
<?php if ($thesis['submitted_at']): ?>
|
<?php if ($thesis['submitted_at']): ?>
|
||||||
<dt>Soumis le</dt><dd><?= date('d/m/Y à H:i', strtotime($thesis['submitted_at'])) ?></dd>
|
<dt>Soumis le</dt><dd><?= date('d/m/Y à H:i', strtotime($thesis['submitted_at'])) ?></dd>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
@@ -188,15 +188,16 @@
|
|||||||
<?php if (!empty($files)): ?>
|
<?php if (!empty($files)): ?>
|
||||||
<section>
|
<section>
|
||||||
<h2>Fichiers (<?= count($files) ?>)</h2>
|
<h2>Fichiers (<?= count($files) ?>)</h2>
|
||||||
<ul class="recap-files-list" role="list">
|
<ul class="admin-file-list" role="list">
|
||||||
<?php foreach ($files as $f): ?>
|
<?php foreach ($files as $f): ?>
|
||||||
<?php
|
<?php
|
||||||
$mime = $f['mime_type'] ?? '';
|
$mime = $f['mime_type'] ?? '';
|
||||||
$filePath = $f['file_path'] ?? '';
|
$filePath = $f['file_path'] ?? '';
|
||||||
$fileName = htmlspecialchars($f['file_name'] ?? basename($filePath));
|
$fileName = htmlspecialchars($f['file_name'] ?? basename($filePath));
|
||||||
$fileType = htmlspecialchars($f['file_type']);
|
$fileType = $f['file_type'] ?? 'other';
|
||||||
$displayLabel = $f['display_label'] ?? $f['description'] ?? '';
|
$displayLabel = $f['display_label'] ?? '';
|
||||||
$isImage = str_starts_with($mime, 'image/');
|
$fileExt = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
|
||||||
|
$isImage = str_starts_with($mime, 'image/') || in_array($fileExt, ['jpg','jpeg','png','gif','webp']);
|
||||||
$isPeerTube = str_starts_with($filePath, 'peertube_ids:');
|
$isPeerTube = str_starts_with($filePath, 'peertube_ids:');
|
||||||
$isExternal = str_starts_with($filePath, 'http://') || str_starts_with($filePath, 'https://');
|
$isExternal = str_starts_with($filePath, 'http://') || str_starts_with($filePath, 'https://');
|
||||||
|
|
||||||
@@ -219,17 +220,17 @@
|
|||||||
$isPeerTube && $fileType === 'audio' => '🔊',
|
$isPeerTube && $fileType === 'audio' => '🔊',
|
||||||
$fileType === 'cover' => '🖼️',
|
$fileType === 'cover' => '🖼️',
|
||||||
$fileType === 'note_intention' => '📝',
|
$fileType === 'note_intention' => '📝',
|
||||||
$fileType === 'main' || ($mime === 'application/pdf') => '📄',
|
$fileType === 'main' || ($mime === 'application/pdf') || $fileExt === 'pdf' => '📄',
|
||||||
$fileType === 'video' || str_starts_with($mime, 'video/') => '🎬',
|
$fileType === 'video' || str_starts_with($mime, 'video/') || in_array($fileExt, ['mp4','webm','mov','ogv']) => '🎬',
|
||||||
$fileType === 'audio' || str_starts_with($mime, 'audio/') => '🔊',
|
$fileType === 'audio' || str_starts_with($mime, 'audio/') || in_array($fileExt, ['mp3','ogg','wav','flac','aac','m4a']) => '🔊',
|
||||||
$isImage => '🖼️',
|
$isImage => '🖼️',
|
||||||
$fileType === 'caption' => '💬',
|
$fileType === 'caption' || $fileExt === 'vtt' => '💬',
|
||||||
$fileType === 'annex' => '📎',
|
$fileType === 'annex' => '📎',
|
||||||
$fileType === 'website' => '🌐',
|
$fileType === 'website' => '🌐',
|
||||||
default => '📎',
|
default => '📎',
|
||||||
};
|
};
|
||||||
?>
|
?>
|
||||||
<li class="recap-files-list-item">
|
<li class="admin-file-list-item">
|
||||||
<figure class="admin-file-figure">
|
<figure class="admin-file-figure">
|
||||||
<?php if ($isImage && !$isPeerTube): ?>
|
<?php if ($isImage && !$isPeerTube): ?>
|
||||||
<img src="<?= $mediaUrl ?>" alt="<?= $fileName ?>" class="admin-file-thumb" loading="lazy">
|
<img src="<?= $mediaUrl ?>" alt="<?= $fileName ?>" class="admin-file-thumb" loading="lazy">
|
||||||
@@ -238,11 +239,7 @@
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<figcaption class="admin-file-caption">
|
<figcaption class="admin-file-caption">
|
||||||
<div class="admin-file-name-row">
|
<div class="admin-file-name-row">
|
||||||
<?php if (($isPeerTube && $mediaUrl !== '#') || $isExternal): ?>
|
|
||||||
<a href="<?= $mediaUrl ?>" target="_blank" rel="noopener" class="admin-file-name"><?= $fileName ?></a>
|
<a href="<?= $mediaUrl ?>" target="_blank" rel="noopener" class="admin-file-name"><?= $fileName ?></a>
|
||||||
<?php else: ?>
|
|
||||||
<a href="<?= $mediaUrl ?>" target="_blank" rel="noopener" class="admin-file-name"><?= $fileName ?></a>
|
|
||||||
<?php endif; ?>
|
|
||||||
</div>
|
</div>
|
||||||
<?php if ($isPeerTube): ?>
|
<?php if ($isPeerTube): ?>
|
||||||
<span class="admin-file-peertube-id">ID : <?= htmlspecialchars($_ptUuid) ?></span>
|
<span class="admin-file-peertube-id">ID : <?= htmlspecialchars($_ptUuid) ?></span>
|
||||||
@@ -251,8 +248,13 @@
|
|||||||
<span class="admin-file-label"><?= htmlspecialchars($displayLabel) ?></span>
|
<span class="admin-file-label"><?= htmlspecialchars($displayLabel) ?></span>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<span class="admin-file-meta-row">
|
<span class="admin-file-meta-row">
|
||||||
|
<span class="admin-file-meta"><?= htmlspecialchars($fileType) ?></span>
|
||||||
|
<?php if (!empty($f['file_size']) && $f['file_size'] > 0): ?>
|
||||||
<span class="admin-file-meta"><?= formatFileSize($f['file_size']) ?></span>
|
<span class="admin-file-meta"><?= formatFileSize($f['file_size']) ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
|
<?php if (!empty($f['uploaded_at'])): ?>
|
||||||
<span class="admin-file-meta"><?= date('d/m/Y H:i', strtotime($f['uploaded_at'])) ?></span>
|
<span class="admin-file-meta"><?= date('d/m/Y H:i', strtotime($f['uploaded_at'])) ?></span>
|
||||||
|
<?php endif; ?>
|
||||||
</span>
|
</span>
|
||||||
</figcaption>
|
</figcaption>
|
||||||
</figure>
|
</figure>
|
||||||
|
|||||||
3
justfile
3
justfile
@@ -62,8 +62,9 @@ deploy:
|
|||||||
app/ xamxam:/var/www/xamxam/
|
app/ xamxam:/var/www/xamxam/
|
||||||
# Upload deploy-server.sh for post-deploy permission fix
|
# Upload deploy-server.sh for post-deploy permission fix
|
||||||
rsync -v scripts/deploy-server.sh xamxam:/tmp/deploy-server.sh
|
rsync -v scripts/deploy-server.sh xamxam:/tmp/deploy-server.sh
|
||||||
|
rsync -v nginx/xamxam.conf xamxam:/tmp/xamxam.conf
|
||||||
ssh -t xamxam "sudo bash /tmp/deploy-server.sh"
|
ssh -t xamxam "sudo bash /tmp/deploy-server.sh"
|
||||||
ssh xamxam "rm -f /tmp/deploy-server.sh"
|
ssh xamxam "rm -f /tmp/deploy-server.sh /tmp/xamxam.conf"
|
||||||
ssh xamxam "mkdir -p /var/www/xamxam/var/{cache,logs,tmp}"
|
ssh xamxam "mkdir -p /var/www/xamxam/var/{cache,logs,tmp}"
|
||||||
ssh xamxam "cd /var/www/xamxam && php -r 'if (!file_exists(\"/var/www/xamxam/storage/xamxam.db\")) { \$db = new PDO(\"sqlite:/var/www/xamxam/storage/xamxam.db\"); \$db->exec(file_get_contents(\"/var/www/xamxam/storage/schema.sql\")); echo \"Database created from schema.\\n\"; } else { echo \"Database already exists.\\n\"; }'"
|
ssh xamxam "cd /var/www/xamxam && php -r 'if (!file_exists(\"/var/www/xamxam/storage/xamxam.db\")) { \$db = new PDO(\"sqlite:/var/www/xamxam/storage/xamxam.db\"); \$db->exec(file_get_contents(\"/var/www/xamxam/storage/schema.sql\")); echo \"Database created from schema.\\n\"; } else { echo \"Database already exists.\\n\"; }'"
|
||||||
# Run pending migrations
|
# Run pending migrations
|
||||||
|
|||||||
Reference in New Issue
Block a user