diff --git a/holidays.php b/holidays.php index 131d874..d67f37b 100644 --- a/holidays.php +++ b/holidays.php @@ -44,7 +44,8 @@ if ($tab === 'holiday_detail' && isset($_GET['id'])) { '; +$jsPath = __DIR__ . '/modules/holidays/holidays.js'; +$jsVersion = file_exists($jsPath) ? filemtime($jsPath) : time(); +echo ''; require __DIR__ . '/footer.php'; \ No newline at end of file diff --git a/modules/holidays/holidays.css b/modules/holidays/holidays.css index a5e7d88..ffc7f2e 100644 --- a/modules/holidays/holidays.css +++ b/modules/holidays/holidays.css @@ -584,13 +584,19 @@ body.no-scroll { } /* Modale 100% écran avec scroll natif fluide */ + .pf-modal { + padding: 0 !important; /* Retire le padding global pour faire un vrai plein écran */ + } + .pf-modal-content { padding: 16px; - width: 100%; - height: 100%; - max-height: 100vh; - border-radius: 0; + width: 100% !important; + height: 100dvh !important; /* Utilise la hauteur dynamique (prend en compte la barre d'URL du tel) */ + max-height: 100dvh !important; + margin: 0 !important; + border-radius: 0 !important; overflow-y: auto; + overscroll-behavior-y: contain; /* Empêche le scroll de se propager au body (fond) */ -webkit-overflow-scrolling: touch; } @@ -1176,7 +1182,7 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover { .hol-calendar-zone .hol-drag-item { position: absolute; top: 1px; - left: 45px; + left: 52px; /* Dégage l'espace pour lire l'heure proprement */ right: 5px; height: calc(60px * var(--duration) - 2px); } @@ -1656,7 +1662,7 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover { @media (max-width: 768px) { /* --- MODALE GLOBALE --- */ #planningModal .pf-modal-content { - padding: 8px !important; + padding: 6px !important; height: 98vh !important; max-height: 98vh !important; display: flex !important; @@ -1684,9 +1690,9 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover { /* --- 1. LE CALENDRIER (EN HAUT) --- */ .hol-calendar-zone { width: 100% !important; - flex: 1 1 auto !important; /* Le calendrier prend tout l'espace restant */ + flex: 1 1 auto !important; order: 1 !important; - padding-bottom: 10px !important; + padding-bottom: 35vh !important; margin-top: 0 !important; gap: 6px !important; } @@ -1722,7 +1728,7 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover { /* --- 2. LA ZONE "À PLACER" (BOTTOM SHEET - 30%) --- */ .hol-unmapped-zone { width: 100% !important; - height: 30vh !important; /* 🔼 Prend exactement 30% de l'écran */ + height: 35vh !important; /* 🔼 Prend exactement 30% de l'écran */ min-height: 180px !important; flex: 0 0 auto !important; /* 🛡️ Protection anti-écrasement */ order: 2 !important; @@ -1732,8 +1738,8 @@ input[type="date"]::-webkit-calendar-picker-indicator:hover { border-left: none !important; border-right: none !important; box-shadow: 0 -4px 15px rgba(0, 0, 0, 0.15) !important; - margin: 0 -8px -8px -8px !important; - padding: 12px 10px 15px 10px !important; + margin: 0px !important; + padding: 6px !important; z-index: 100; background: var(--bg-panel) !important; display: flex !important; diff --git a/modules/holidays/holidays.js b/modules/holidays/holidays.js index ece57c5..9076d8a 100644 --- a/modules/holidays/holidays.js +++ b/modules/holidays/holidays.js @@ -1411,12 +1411,14 @@ function buildDragItemHtml(it) { style="--duration: ${dur}; flex-shrink: 0; ${bgStyle} padding: 8px 10px; border-radius: 6px; cursor: grab; box-shadow: 0 2px 4px rgba(0,0,0,0.05); transition: transform 0.2s; z-index: 10;" ondragstart="dragStart(event)" ondragend="dragEnd(event)" onclick="handleItemTap(event, '${htmlId}')"> ${locHintHtml} -
-
${visualName}
-
+
+
${visualName}
+ +
${durControls}
+
diff --git a/modules/holidays/views/detail.php b/modules/holidays/views/detail.php index 4cbee23..8e145e4 100644 --- a/modules/holidays/views/detail.php +++ b/modules/holidays/views/detail.php @@ -596,4 +596,3 @@ $pctSaved = $cost > 0 ? min(100 - $pctPaid, ($saved / $cost) * 100) : 0; - \ No newline at end of file diff --git a/modules/holidays/views/list.php b/modules/holidays/views/list.php index 4500e29..4d81dbf 100644 --- a/modules/holidays/views/list.php +++ b/modules/holidays/views/list.php @@ -125,7 +125,6 @@ window.closeHolidayModal = window.closeHolidayModal || function() { -