diff --git a/AKModel/templates/AKModel/load_fullcalendar.html b/AKModel/templates/AKModel/load_fullcalendar.html index e00f5038c07dd61b27c66762bed92c03e43d64d1..08199aaa7266ef6e55c037e1476050142f7530c7 100644 --- a/AKModel/templates/AKModel/load_fullcalendar.html +++ b/AKModel/templates/AKModel/load_fullcalendar.html @@ -1,12 +1,18 @@ +{% load compress %} {% load static %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} -<script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar-6.0.2.js' %}'></script> +{% compress js %} + <script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar-6.0.2.js' %}'></script> + <script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar.bootstrap5-5.0.2.min.js' %}'></script> + + {% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} + {% if LANGUAGE_CODE != "en" %} + {# Locale 'en' is included in main.js and does not exist separately #} + <script src="{% static locale_file %}"></script> + {% endif %} + {% endwith %} +{% endcompress %} + -{% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} - {% if LANGUAGE_CODE != "en" %} - {# Locale 'en' is included in main.js and does not exist separately #} - <script src="{% static locale_file %}"></script> - {% endif %} -{% endwith %} diff --git a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html index 74c34f72a5e06ec7b1bab1d8f1b998981461836e..71344f21edeb75e9d629a2b361a58c6a9c974c2f 100644 --- a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html +++ b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html @@ -1,14 +1,18 @@ +{% load compress %} {% load static %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} -<script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar-6.0.2.js' %}'></script> -<script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script> -<script src="{% static "common/js/availabilities.js" %}"></script> +{% compress js %} + <script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar-6.0.2.js' %}'></script> + <script src='{% static 'common/vendor/fullcalendar-scheduler/fullcalendar.bootstrap5-5.0.2.min.js' %}'></script> + <script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script> + <script src="{% static "common/js/availabilities.js" %}"></script> -{% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} - {% if LANGUAGE_CODE != "en" %} - {# Locale 'en' is included in main.js and does not exist separately #} - <script src="{% static locale_file %}"></script> - {% endif %} -{% endwith %} + {% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} + {% if LANGUAGE_CODE != "en" %} + {# Locale 'en' is included in main.js and does not exist separately #} + <script src="{% static locale_file %}"></script> + {% endif %} + {% endwith %} +{% endcompress %} diff --git a/AKPlan/templates/AKPlan/plan_akslot.html b/AKPlan/templates/AKPlan/plan_akslot.html index f10b87bcf8104319fb10d45b72d99c47736b2507..46b3e8e25219753982054ce3b85d23930fe40504 100644 --- a/AKPlan/templates/AKPlan/plan_akslot.html +++ b/AKPlan/templates/AKPlan/plan_akslot.html @@ -21,6 +21,10 @@ headerToolbar: false, aspectRatio: 2.5, themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, // Only show calendar view for the dates of the connected event visibleRange: { start: '{{ ak.event.start | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}', diff --git a/AKPlan/templates/AKPlan/plan_detail.html b/AKPlan/templates/AKPlan/plan_detail.html index 11d97817dd71294cdc1535fd473e66b1ab7ce0d3..6670f661cfcf7e581e0c4b28c7d698e076f9b497 100644 --- a/AKPlan/templates/AKPlan/plan_detail.html +++ b/AKPlan/templates/AKPlan/plan_detail.html @@ -29,6 +29,10 @@ }, aspectRatio: 2, themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, // Only show calendar view for the dates of the connected event visibleRange: { start: '{{ event.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}', diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html index 633428cfb4b4cdbc6537e13a53e5b8a75e74cd21..ffda1d96d7bb4d37a5cbff1f86fa7fd519ace886 100644 --- a/AKPlan/templates/AKPlan/plan_index.html +++ b/AKPlan/templates/AKPlan/plan_index.html @@ -23,6 +23,10 @@ right: 'resourceTimelineDay,resourceTimelineEvent' }, themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, // Adapt to user selected locale locale: '{{ LANGUAGE_CODE }}', initialView: 'resourceTimelineEvent', diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html index 0e20819d4774baf51689c8b0a8bad4f126ae407a..3e0b36d94395e22fcbbfeb98a6e4570dad77d6a5 100644 --- a/AKPlan/templates/AKPlan/plan_wall.html +++ b/AKPlan/templates/AKPlan/plan_wall.html @@ -39,6 +39,10 @@ timeZone: '{{ event.timezone }}', headerToolbar: false, themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, // Adapt to user selected locale locale: '{{ LANGUAGE_CODE }}', slotDuration: '01:00', diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index b9bbad4c44425726fb63a61fa2e88caef9776d47..62dd21a51653caf790b95c74ab5a68ef8ca1cc47 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html @@ -84,6 +84,10 @@ //aspectRatio: 2, height: '100%', themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, // Adapt to user selected locale locale: '{{ LANGUAGE_CODE }}', initialView: 'resourceTimelineEventVert', @@ -288,7 +292,6 @@ <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title">{% trans "Add slot" %}</h5> - text-decoration: none; </div> <div class="modal-body"> <form> diff --git a/static_common/common/js/availabilities.js b/static_common/common/js/availabilities.js index 54c11501c5f35e2b2ccd310494888090a4fafc5f..28ad46be29651674b27ee6ecd8267ea7f1e2999e 100644 --- a/static_common/common/js/availabilities.js +++ b/static_common/common/js/availabilities.js @@ -53,6 +53,10 @@ function createAvailabilityEditors(timezone, language, startDate, endDate, slotR let plan = new FullCalendar.Calendar(editor[0], { timeZone: timezone, themeSystem: 'bootstrap5', + buttonIcons: { + prev: 'ignore fa-solid fa-angle-left', + next: 'ignore fa-solid fa-angle-right', + }, locale: language, schedulerLicenseKey: 'GPL-My-Project-Is-Open-Source', editable: editable, diff --git a/static_common/common/vendor/fullcalendar-scheduler/fullcalendar.bootstrap5-5.0.2.min.js b/static_common/common/vendor/fullcalendar-scheduler/fullcalendar.bootstrap5-5.0.2.min.js new file mode 100644 index 0000000000000000000000000000000000000000..b6e1d8921e5f86f3d0754c133b347f543cf9ee88 --- /dev/null +++ b/static_common/common/vendor/fullcalendar-scheduler/fullcalendar.bootstrap5-5.0.2.min.js @@ -0,0 +1,6 @@ +/*! +FullCalendar Bootstrap 5 Plugin v6.0.2 +Docs & License: https://fullcalendar.io/docs/bootstrap5 +(c) 2022 Adam Shaw +*/ +FullCalendar.Bootstrap5=function(e,t,o){"use strict";class r extends o.Theme{}r.prototype.classes={root:"fc-theme-bootstrap5",tableCellShaded:"fc-theme-bootstrap5-shaded",buttonGroup:"btn-group",button:"btn btn-primary",buttonActive:"active",popover:"popover",popoverHeader:"popover-header",popoverContent:"popover-body"},r.prototype.baseIconClass="bi",r.prototype.iconClasses={close:"bi-x-lg",prev:"bi-chevron-left",next:"bi-chevron-right",prevYear:"bi-chevron-double-left",nextYear:"bi-chevron-double-right"},r.prototype.rtlIconClasses={prev:"bi-chevron-right",next:"bi-chevron-left",prevYear:"bi-chevron-double-right",nextYear:"bi-chevron-double-left"},r.prototype.iconOverrideOption="buttonIcons",r.prototype.iconOverrideCustomButtonOption="icon",r.prototype.iconOverridePrefix="bi-";o.injectStyles(".fc-theme-bootstrap5 a:not([href]){color:inherit;text-decoration:inherit}.fc-theme-bootstrap5 .fc-list,.fc-theme-bootstrap5 .fc-scrollgrid,.fc-theme-bootstrap5 td,.fc-theme-bootstrap5 th{border:1px solid var(--bs-gray-400)}.fc-theme-bootstrap5 .fc-scrollgrid{border-bottom-width:0;border-right-width:0}.fc-theme-bootstrap5-shaded{background-color:var(--bs-gray-200)}");var a=t.createPlugin({name:"@fullcalendar/bootstrap5",themeClasses:{bootstrap5:r}}),n={__proto__:null,BootstrapTheme:r};return t.globalPlugins.push(a),e.Internal=n,e.default=a,Object.defineProperty(e,"__esModule",{value:!0}),e}({},FullCalendar,FullCalendar.Internal); \ No newline at end of file