diff options
| -rw-r--r-- | public/css/calendar.css | 10 | ||||
| -rw-r--r-- | public/js/calendar.js | 2 | ||||
| -rw-r--r-- | public/js/calendar_admin.js | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/public/css/calendar.css b/public/css/calendar.css index 47efcbb..97a23a8 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | /* !important est nécessaire pour écraser le CSS inséré par le javascript de fullcalendar */ | 1 | /* !important est nécessaire pour écraser le CSS inséré par le javascript de fullcalendar */ |
| 2 | 2 | #event, #form_event{ | |
| 3 | .event{ | 3 | padding: 5px; |
| 4 | border: 2px double; | 4 | border: 2px double; |
| 5 | border-radius: 5px; | 5 | border-radius: 5px; |
| 6 | width: max-content; | ||
| 7 | max-width: 250px; | 6 | max-width: 250px; |
| 8 | padding: 5px; | ||
| 9 | } | 7 | } |
| 10 | #calendar_zone{ | 8 | #calendar_zone{ |
| 11 | display: flex; | 9 | display: flex; |
| @@ -61,7 +59,7 @@ td .fc-timegrid-axis{ | |||
| 61 | #calendar_zone{ | 59 | #calendar_zone{ |
| 62 | padding: 0; | 60 | padding: 0; |
| 63 | } | 61 | } |
| 64 | #calendar_zone p, .event > button{ | 62 | #calendar_zone p, #event > button{ |
| 65 | font-size: smaller; | 63 | font-size: smaller; |
| 66 | } | 64 | } |
| 67 | .fc-toolbar-title{ | 65 | .fc-toolbar-title{ |
| @@ -82,7 +80,7 @@ td .fc-timegrid-axis{ | |||
| 82 | background-color: #e3f3ff; | 80 | background-color: #e3f3ff; |
| 83 | box-shadow: 1px 1px 3px black; | 81 | box-shadow: 1px 1px 3px black; |
| 84 | } | 82 | } |
| 85 | .event{ | 83 | #event, #form_event{ |
| 86 | width: 250px; | 84 | width: 250px; |
| 87 | } | 85 | } |
| 88 | } | 86 | } |
diff --git a/public/js/calendar.js b/public/js/calendar.js index 844d411..8809246 100644 --- a/public/js/calendar.js +++ b/public/js/calendar.js | |||
| @@ -80,7 +80,7 @@ document.addEventListener('DOMContentLoaded', function(){ | |||
| 80 | const end_hour = (info.event.allDay ? '' : '<br>à ' + end.split('T')[1]).replace(":", "h"); | 80 | const end_hour = (info.event.allDay ? '' : '<br>à ' + end.split('T')[1]).replace(":", "h"); |
| 81 | const formated_end = end_date.split('-')[2] + '/' + end_date.split('-')[1] + '/' + end_date.split('-')[0] + end_hour; | 81 | const formated_end = end_date.split('-')[2] + '/' + end_date.split('-')[1] + '/' + end_date.split('-')[0] + end_hour; |
| 82 | 82 | ||
| 83 | let aside_content = `<div class="event" style="border-color: ` + info.event.backgroundColor +`;"> | 83 | let aside_content = `<div id="event" style="border-color: ` + info.event.backgroundColor +`;"> |
| 84 | <h3>` + info.event.title + `</h3> | 84 | <h3>` + info.event.title + `</h3> |
| 85 | <p><i>` + info.event.extendedProps.description + `</i></p>`; | 85 | <p><i>` + info.event.extendedProps.description + `</i></p>`; |
| 86 | if(checked && (formated_start === formated_end)){ // affichage simplifié évènement d'un jour | 86 | if(checked && (formated_start === formated_end)){ // affichage simplifié évènement d'un jour |
diff --git a/public/js/calendar_admin.js b/public/js/calendar_admin.js index a2fb1ac..17ae0c2 100644 --- a/public/js/calendar_admin.js +++ b/public/js/calendar_admin.js | |||
| @@ -81,7 +81,7 @@ document.addEventListener('DOMContentLoaded', function(){ | |||
| 81 | } | 81 | } |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | const aside_content = `<div class="form_event"> | 84 | const aside_content = `<div id="form_event"> |
| 85 | <div class="event_title_box"> | 85 | <div class="event_title_box"> |
| 86 | <h2>Nouvel évènement</h2> | 86 | <h2>Nouvel évènement</h2> |
| 87 | </div> | 87 | </div> |
| @@ -155,7 +155,7 @@ document.addEventListener('DOMContentLoaded', function(){ | |||
| 155 | const formated_start = formatDate(info.event.start); | 155 | const formated_start = formatDate(info.event.start); |
| 156 | const formated_end = formatDate(info.event.allDay ? minusOneDay(info.event.end) : info.event.end, info.event.allDay); | 156 | const formated_end = formatDate(info.event.allDay ? minusOneDay(info.event.end) : info.event.end, info.event.allDay); |
| 157 | 157 | ||
| 158 | const aside_content = `<div class="form_event"> | 158 | const aside_content = `<div id="form_event" style="border-color: ` + info.event.backgroundColor +`;"> |
| 159 | <div class="event_title_box"> | 159 | <div class="event_title_box"> |
| 160 | <h2>Modifier un évènement</h2> | 160 | <h2>Modifier un évènement</h2> |
| 161 | </div> | 161 | </div> |
