diff --git a/.eslintrc.js b/.eslintrc.js index 6f55cdb57b4cb601f0b12175aa8bc22d80e96575..143db2401a0f5b17cabd500a8874b22f086d7260 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,6 +10,7 @@ module.exports = { "$": "readonly", "$$": "readonly", "django": "readonly", - "FullCalendar": "readonly" + "FullCalendar": "readonly", + "Datepicker": "readonly" } }; diff --git a/castellum/settings/default.py b/castellum/settings/default.py index 5dc90deaebc183321d7035b8f0e885a6fa0c6caa..9948c97f939763e4b28ec76e593092e5dadc9ba8 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -182,10 +182,10 @@ NPM_FILE_PATTERNS = { 'dist/css/bootstrap.min.css', 'dist/js/bootstrap.min.js' ], - 'bootstrap-datepicker': [ - 'dist/css/bootstrap-datepicker3.min.css', - 'dist/js/bootstrap-datepicker.min.js', - 'dist/locales/bootstrap-datepicker.de.min.js', + 'vanillajs-datepicker': [ + 'dist/css/datepicker.min.css', + 'dist/js/datepicker.min.js', + 'dist/js/locales/de.js', ], 'jdenticon': ['dist/jdenticon.min.js'], 'jquery': ['dist/jquery.min.js'], diff --git a/castellum/static/js/utils.js b/castellum/static/js/utils.js index 919b20d44a459aa235e5546d8e3a96bba4a90b26..f6f504f8e57c9c4255c2e83858a45b7aab505a6c 100644 --- a/castellum/static/js/utils.js +++ b/castellum/static/js/utils.js @@ -45,12 +45,12 @@ document.querySelectorAll('[type="date"]').forEach(function(e) { if (e.type !== 'date') { - $(e).datepicker({ + new Datepicker(e, { format: 'yyyy-mm-dd', language: document.documentElement.lang, autoclose: true, calendarWeeks: true, - daysOfWeekHighlighted: '0,6', + daysOfWeekHighlighted: [0, 6], todayHighlight: true, }); } diff --git a/castellum/templates/base.html b/castellum/templates/base.html index 3c6be178a70e76ceedf3fa32952fc0ec154e65bc..d2a5ae4b6d00d654850983f1616d91a95307de2f 100644 --- a/castellum/templates/base.html +++ b/castellum/templates/base.html @@ -12,7 +12,7 @@ - + {% block extra_styles %}{% endblock %} @@ -127,8 +127,8 @@ - - + + diff --git a/package.json b/package.json index dfdc66964f4c5b72814f449025e2444c0b82bc69..9e17c0de6533fbb82735748ab6b9cbed162e15b6 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,11 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", "bootstrap": "^4.6.0", - "bootstrap-datepicker": "^1.9.0", "fullcalendar-scheduler": "^5.5.1", "jdenticon": "^3.1.0", "jquery": "^3.5.1", - "popper.js": "^1.16.0" + "popper.js": "^1.16.0", + "vanillajs-datepicker": "^1.1.2" }, "devDependencies": { "eslint": "^7.18.0"