3 files changed, 41 insertions, 12 deletions
diff --git a/public/css/calendar.css b/public/css/calendar.css
index 5dfb343..b24fe5b 100644
--- a/public/css/calendar.css
+++ b/public/css/calendar.css
@@ -2,13 +2,15 @@
    border: 2px double;
    border-radius: 5px;
    width: max-content;
+    padding: 5px;
 }
 #calendar_zone{
    display: flex;
-    max-width: 1000px;
+    max-width: 1170px;
+    gap: 5px;
 }
 #calendar{
-    width: -moz-available;
+    width: 1165px;
 }
 .event_title_box{
    display: flex;
@@ -46,4 +48,20 @@ td .fc-timegrid-axis{
    color: white;
    background-color: #00679e;
    border-radius: 5px;
-}
-\ No newline at end of file
+}
+@media screen and (max-width: 900px){
+    #calendar_zone{
+        padding: 0;
+    }
+    .fc-toolbar-title{
+        font-size: large !important;
+    }
+}
+@media screen and (max-width: 650px){
+    .fc-toolbar-chunk{
+        font-size: smaller;
+    }
+}
+@media screen and (max-width: 550px){
+}
diff --git a/public/index.php b/public/index.php
index 99220e8..540e8ab 100644
--- a/public/index.php
+++ b/public/index.php
@@ -8,6 +8,7 @@ require '../src/controller/calendar.php';
 <head>
    <meta charset="utf-8" />
    <title>fullcalendar</title>
+    <meta name="viewport" content="width=device-width">
    <link rel="stylesheet" href="css/calendar.css">
    <!-- <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/fullcalendar/main.min.css' /> -->
    <script src='js/fullcalendar/packages/core/index.global.min.js'></script>
@@ -17,7 +18,12 @@ require '../src/controller/calendar.php';
    <script src='js/fullcalendar/packages/interaction/index.global.min.js'></script>
    <script src='js/fullcalendar/packages/core/locales/fr.global.min.js'></script>
 <?php
-echo (isset($_SESSION['admin']) && $_SESSION['admin'] === true) ? '<script src="js/calendar_admin.js"></script>' . "\n" : '<script src="js/calendar.js"></script>' . "\n";
+if($_SESSION['admin'] === true){
+    echo '<script src="js/calendar_admin.js"></script>' . "\n";
+}
+else{
+    echo '<script src="js/calendar.js"></script>' . "\n";
+}
 ?>
 </head>
diff --git a/public/js/calendar.js b/public/js/calendar.js
index 2193272..a092632 100644
--- a/public/js/calendar.js
+++ b/public/js/calendar.js
@@ -62,19 +62,24 @@ document.addEventListener('DOMContentLoaded', function(){
            const start = formatDate(info.event.start);
            const start_date = start.split('T')[0];
            const start_hour = (info.event.allDay ? '' : '<br>à ' + start.split('T')[1]).replace(":", "h");
-            const formated_start = 'le ' + start_date.split('-')[2] + '/' + start_date.split('-')[1] + '/' + start_date.split('-')[0] + start_hour;
+            const formated_start = start_date.split('-')[2] + '/' + start_date.split('-')[1] + '/' + start_date.split('-')[0] + start_hour;
            const end = formatDate(info.event.allDay ? minusOneDay(info.event.end) : info.event.end, info.event.allDay);
            const end_date = end.split('T')[0];
            const end_hour = (info.event.allDay ? '' : '<br>à ' + end.split('T')[1]).replace(":", "h");
-            const formated_end = 'le ' + end_date.split('-')[2] + '/' + end_date.split('-')[1] + '/' + end_date.split('-')[0] + end_hour;
+            const formated_end = end_date.split('-')[2] + '/' + end_date.split('-')[1] + '/' + end_date.split('-')[0] + end_hour;
-            const aside_content = `<div class="event" style="border-color: ` + info.event.backgroundColor +`;">
+            let aside_content = `<div class="event" style="border-color: ` + info.event.backgroundColor +`;">
-                        <h3>` + info.event.title + `</h3>
+                    <h3>` + info.event.title + `</h3>
-                        <p><i>` + info.event.extendedProps.description + `</i></p>
+                    <p><i>` + info.event.extendedProps.description + `</i></p>`;
-                        <p>Journée entière: <br>` + (checked ? 'oui' : 'non') + `</p>
+            if(checked && (formated_start === formated_end)){ // affichage simplifié évènement d'un jour
-                        <p>Début: <br>` + formated_start + `</p>
+                aside_content = aside_content + `<p>le ` + formated_start + `</p>
-                        <p>Fin: <br> ` + formated_end + `</p>
                    </div>`;
+            }
+            else{
+                aside_content = aside_content + `<p>du ` + formated_start + `</p>
+                        <p>au ` + formated_end + `</p>
+                    </div>`;
+            }
            aside.innerHTML = aside_content;
            calendar.updateSize();