diff --git a/AKPlan/templates/AKPlan/load_fullcalendar.html b/AKPlan/templates/AKPlan/load_fullcalendar.html index 30fc76b83ee95d767c23b05e874a5abfd1d61df6..6c2a93c81cf8874d10d2e3360476b4eb14d0fff1 100644 --- a/AKPlan/templates/AKPlan/load_fullcalendar.html +++ b/AKPlan/templates/AKPlan/load_fullcalendar.html @@ -2,8 +2,8 @@ {% load i18n %} {% get_current_language as LANGUAGE_CODE %} -<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script> <link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/> +<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script> {% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %} {% if LANGUAGE_CODE != "en" %} diff --git a/AKScheduling/api.py b/AKScheduling/api.py index 687704a8e91a48ddd39383d391373d0d1a929648..27b4252e94adc1ffa44e4d2481bc94987d7087f1 100644 --- a/AKScheduling/api.py +++ b/AKScheduling/api.py @@ -72,7 +72,6 @@ class RoomAvailabilitiesView(LoginRequiredMixin, EventSlugMixin, ListView): "resourceId": a.room.id, "start": timezone.localtime(a.start, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"), "end": timezone.localtime(a.end, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"), - "backgroundColor": "#28B62C", "display": 'background', "groupId": 'roomAvailable', } for a in context["availabilities"]], diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index 75dc0c3c23071023c21beb3c5a4d4eed42f453ce..7dcac83846a91c987869fe2384d9599c04e72f3c 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html @@ -127,7 +127,6 @@ eventChange: updateEvent, eventReceive: updateEvent, editable: true, - dropable: true, drop: function (info) { info.draggedEl.parentNode.removeChild(info.draggedEl); }, @@ -135,6 +134,7 @@ nowIndicator: true, eventTextColor: '#fff', eventColor: '#127ba3', + eventBackgroundColor: '#28B62C', datesAboveResources: true, resourceAreaHeaderContent: '{% trans "Room" %}', resources: '{% url "model:scheduling-resources-list" event_slug=event.slug %}',