diff --git a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html index 2d2186684e981f5b4e7fcae7f6b2253e59b32e7b..287946c940417777da36e5b5a75fc74f931b8380 100644 --- a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html +++ b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html @@ -7,7 +7,7 @@ <script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script> <script src="{% static "common/js/availabilities.js" %}"></script> -{% with 'common/vendor/fullcalendar/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} +{% 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> diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index 50ab859c612dee4605f7ab0cf1566694038476e3..52be9830775009778caa2de07b2343df0e0887cb 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html @@ -198,7 +198,7 @@ table_html += '<tr><td>'; if(response[i].level_display==='{% trans "Violation" %}') - table_html += '{% fa5_icon "exclamation-circle" "fas" %}'; + table_html += '{% fa5_icon "exclamation-triangle" "fas" %}'; else table_html += '{% fa5_icon "info-circle" "fas" %}'; diff --git a/AKScheduling/views.py b/AKScheduling/views.py index 3b40d07cb68c486e73326bccf51eaf06bdc93091..0834c4f719c5e40774d91d3ef20eda0f62494083 100644 --- a/AKScheduling/views.py +++ b/AKScheduling/views.py @@ -30,7 +30,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView): context_object_name = "slots_unscheduled" def get_queryset(self): - return super().get_queryset().filter(start__isnull=True).order_by('ak__track') + return super().get_queryset().filter(start__isnull=True).select_related().order_by('ak__track') def get_context_data(self, *, object_list=None, **kwargs): context = super().get_context_data(object_list=object_list, **kwargs) diff --git a/static_common/common/css/admin-bootstrap.css b/static_common/common/css/admin-bootstrap.css index c0b4714c96ba710b69fd4d410376368811ff1b7b..44e323b3065f05805aedd08413133be4569de761 100644 --- a/static_common/common/css/admin-bootstrap.css +++ b/static_common/common/css/admin-bootstrap.css @@ -4,3 +4,4 @@ */ @import "/static/common/css/bootstrap.css"; @import "../../admin/css/base.css"; +@import "/static/common/css/custom.css";