diff --git a/AKModel/forms.py b/AKModel/forms.py index f547566817eb55969906c63644119c7294848c80..24074ecde62e9bbc31bdeccdc23aa5424399208d 100644 --- a/AKModel/forms.py +++ b/AKModel/forms.py @@ -5,7 +5,6 @@ Central and admin forms import csv import io -from bootstrap_datepicker_plus.widgets import DateTimePickerInput from django import forms from django.forms.utils import ErrorList from django.utils.translation import gettext_lazy as _ @@ -14,6 +13,10 @@ from AKModel.availability.forms import AvailabilitiesFormMixin from AKModel.models import Event, AKCategory, AKRequirement, Room +class DateTimeInput(forms.DateInput): + input_type = 'datetime-local' + + class NewEventWizardStartForm(forms.ModelForm): """ Initial view of new event wizard @@ -47,14 +50,17 @@ class NewEventWizardSettingsForm(forms.ModelForm): class Meta: model = Event fields = "__all__" + exclude = ['plan_published_at'] widgets = { 'name': forms.HiddenInput(), 'slug': forms.HiddenInput(), 'timezone': forms.HiddenInput(), 'active': forms.HiddenInput(), - 'start': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), - 'end': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), - 'reso_deadline': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), + 'start': DateTimeInput(), + 'end': DateTimeInput(), + 'interest_start': DateTimeInput(), + 'interest_end': DateTimeInput(), + 'reso_deadline': DateTimeInput(), 'plan_hidden': forms.HiddenInput(), } diff --git a/AKModel/templates/admin/AKModel/event_wizard/activate.html b/AKModel/templates/admin/AKModel/event_wizard/activate.html index 44c08a316df054d2e3e226c9d2aeee39adfd9918..9a2bd7d34f00669ca3f6416a6cb3bc5afb972fd2 100644 --- a/AKModel/templates/admin/AKModel/event_wizard/activate.html +++ b/AKModel/templates/admin/AKModel/event_wizard/activate.html @@ -8,6 +8,11 @@ {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} +{% block extrahead %} + {{ block.super }} + {{ form.media }} +{% endblock %} + {% block content %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %} @@ -17,8 +22,6 @@ <h5 class="mb-3">{% trans "Successfully imported.<br><br>Do you want to activate your event now?" %}</h5> - {{ form.media }} - <form method="post">{% csrf_token %} {% bootstrap_form form %} diff --git a/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html b/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html index 75e9365319fb18d6560ef106e74c84addb219f32..81dee9afa7e6346b0823654f1b9f447f9f31df2f 100644 --- a/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html +++ b/AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html @@ -8,6 +8,11 @@ {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} +{% block extrahead %} + {{ block.super }} + {{ form.media }} +{% endblock %} + {% block content %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %} @@ -29,8 +34,6 @@ <h5 class="mb-3">{% trans "Your event was created and can now be further configured." %}</h5> - {{ form.media }} - <form method="post">{% csrf_token %} {% bootstrap_form form %} diff --git a/AKModel/templates/admin/AKModel/event_wizard/import.html b/AKModel/templates/admin/AKModel/event_wizard/import.html index c99ca2b22cf0172e63cc6ef0730bba2ab15831e9..56d708edb704929341a0435ce6c3374610a5ec00 100644 --- a/AKModel/templates/admin/AKModel/event_wizard/import.html +++ b/AKModel/templates/admin/AKModel/event_wizard/import.html @@ -8,11 +8,14 @@ {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} +{% block extrahead %} + {{ block.super }} + {{ form.media }} +{% endblock %} + {% block content %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %} - {{ form.media }} - <form method="post">{% csrf_token %} {% bootstrap_form form %} diff --git a/AKModel/templates/admin/AKModel/event_wizard/settings.html b/AKModel/templates/admin/AKModel/event_wizard/settings.html index df5f9cae2f1ccde35901f7f494149f26c9dedf50..1eab47470f9dbfdf18a4293753292378f7e69acd 100644 --- a/AKModel/templates/admin/AKModel/event_wizard/settings.html +++ b/AKModel/templates/admin/AKModel/event_wizard/settings.html @@ -8,11 +8,14 @@ {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} +{% block extrahead %} + {{ block.super }} + {{ form.media }} +{% endblock %} + {% block content %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %} - {{ form.media }} - {% timezone timezone %} <form method="post">{% csrf_token %} diff --git a/AKModel/templates/admin/AKModel/event_wizard/start.html b/AKModel/templates/admin/AKModel/event_wizard/start.html index 6389a2ee7c25ebbab25bbf645871d6617e56b9a4..db9eca6e925adc5566f2842f15cdbd59e1bc659c 100644 --- a/AKModel/templates/admin/AKModel/event_wizard/start.html +++ b/AKModel/templates/admin/AKModel/event_wizard/start.html @@ -7,6 +7,11 @@ {% block title %}{% trans "New event wizard" %}: {{ wizard_step_text }}{% endblock %} +{% block extrahead %} + {{ block.super }} + {{ form.media }} +{% endblock %} + {% block content %} {% include "admin/AKModel/event_wizard/wizard_steps.html" %} diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py index 3dc46aa57266a36bcdef18393ef3fd6571d3727b..4cb4bb301adca7fd146f681b3c1727e4b8c7676a 100644 --- a/AKPlanning/settings.py +++ b/AKPlanning/settings.py @@ -52,7 +52,6 @@ INSTALLED_APPS = [ 'rest_framework', 'simple_history', 'registration', - 'bootstrap_datepicker_plus', 'django_tex', 'compressor', 'docs',