diff --git a/changelog/27_1.14.0_2018-07-15.md b/changelog/27_1.14.0_2018-07-15.md
index 56d7707f..3828c6a8 100644
--- a/changelog/27_1.14.0_2018-07-15.md
+++ b/changelog/27_1.14.0_2018-07-15.md
@@ -8,6 +8,6 @@
- Show a calendar on the shopping list page (useful, at least for me)
- Table column ordering and sorting is now remembered
- Sidebar collapse state is now remembered
- - Fixed datetimepicker border
+ - Fixed date time picker border
- Keep the parent sidebar menu item expanded if the active page is a sub menu item
- Custom JS/CSS file names have changed [see README](https://github.com/grocy/grocy#adding-your-own-css-or-js-without-to-have-to-modify-the-application-itself)
diff --git a/changelog/28_1.15.0_2018-07-22.md b/changelog/28_1.15.0_2018-07-22.md
index 37593c80..ab67bc07 100644
--- a/changelog/28_1.15.0_2018-07-22.md
+++ b/changelog/28_1.15.0_2018-07-22.md
@@ -2,7 +2,7 @@
- => https://github.com/grocy/grocy-desktop
- Run Grocy without a webserver just like a normal (Windows) desktop application
- New "embedded mode" for Grocy to help running in "desktop application mode" [see README](https://github.com/grocy/grocy#embedded-mode)
-- New datepicker shorthands and improvements
+- New date time picker shorthands and improvements
- `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
- Changed: `MMDD` will be expanded to the given day next year if > today
- [see README](https://github.com/grocy/grocy#input-shorthands-for-date-fields)
diff --git a/changelog/51_2.4.4_2019-07-07.md b/changelog/51_2.4.4_2019-07-07.md
index 2b91b837..556867c9 100644
--- a/changelog/51_2.4.4_2019-07-07.md
+++ b/changelog/51_2.4.4_2019-07-07.md
@@ -1,6 +1,6 @@
- Fixed that price data (last price & chart) was not taken from inventory correction bookings, only purchases
- Fixed weekly chores were scheduled on the same day after execution
- Fixed that undone chores were also included in "Last tracked"
-- Fixed the date-time-picker width was too narrow sometimes
+- Fixed the date time picker width was too narrow sometimes
- Improved that execution dates of "Track date only" chores will never display the time part
- Improved date display for products that never expire (again, there was a display problem after consuming an item on the stock overview page)
diff --git a/changelog/52_2.5.0_2019-09-22.md b/changelog/52_2.5.0_2019-09-22.md
index 492ddb50..742bbed3 100644
--- a/changelog/52_2.5.0_2019-09-22.md
+++ b/changelog/52_2.5.0_2019-09-22.md
@@ -73,7 +73,7 @@
### General & other improvements/fixes
- Added a new `config.php` setting `CALENDAR_SHOW_WEEK_OF_YEAR` to configure if calendars should show week numbers (defaults to `true`)
-- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
+- Fixed that date time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
- Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
- All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)
diff --git a/changelog/56_2.6.1_2020-03-06.md b/changelog/56_2.6.1_2020-03-06.md
index 62aea9ac..ae56eaea 100644
--- a/changelog/56_2.6.1_2020-03-06.md
+++ b/changelog/56_2.6.1_2020-03-06.md
@@ -43,7 +43,7 @@ If you run Grocy in a subdirectory, you need to set a new `config.php` setting (
- Added a button to enable the device flash light on the camera barcode scanner popup (thanks @radim-ek)
- Optimized the top navbar height and overall spacing to waste less space
- Replaced the scan-mode-switch-button by a native button because it's less disturbing
-- Fixed that the "contextual time ago" of date/time pickers was not displayed
+- Fixed that the "contextual time ago" of date time pickers was not displayed
- New translations: (thanks all the translators)
- Czech (demo available at https://cs.demo.grocy.info)
- Portuguese (Portugal) (demo available at https://pt-pt.demo.grocy.info)
diff --git a/changelog/58_2.7.0_2020-04-16.md b/changelog/58_2.7.0_2020-04-16.md
index e87ef508..5e920dfd 100644
--- a/changelog/58_2.7.0_2020-04-16.md
+++ b/changelog/58_2.7.0_2020-04-16.md
@@ -44,7 +44,7 @@
- Fixed that CORS was broken (there was no response to preflight OPTIONS requests)
### General & other improvements/fixes
-- Optimized that sometimes the corresponding form was not validated when selecting a date from the datetimepicker
+- Optimized that sometimes the corresponding form was not validated when selecting a date from the date time picker
- New `config.php` setting `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD` which activates the number pad for best-before-date fields on (supported) mobile browsers (useful because of [shorthands](https://github.com/grocy/grocy#input-shorthands-for-date-fields)) (defaults to `true`) (thanks @Mik-)
- Enhancements for the camera barcode scanner
- Torch / light improvements (thanks @Mik-)
diff --git a/changelog/82_UNRELEASED_xxxx-xx-xx.md b/changelog/82_UNRELEASED_xxxx-xx-xx.md
new file mode 100644
index 00000000..69beeae6
--- /dev/null
+++ b/changelog/82_UNRELEASED_xxxx-xx-xx.md
@@ -0,0 +1,57 @@
+> ⚠️ xxxBREAKING CHANGESxxx
+
+> ❗ xxxImportant upgrade informationXXX
+
+> 💡 xxxMinor upgrade informationXXX
+
+### New Feature: xxxx
+
+- xxx
+
+### Stock
+
+- xxx
+
+### Shopping list
+
+- xxx
+
+### Recipes
+
+- xxx
+
+### Meal plan
+
+- xxx
+
+### Chores
+
+- xxx
+
+### Calendar
+
+- xxx
+
+### Tasks
+
+- xxx
+
+### Batteries
+
+- xxx
+
+### Equipment
+
+- xxx
+
+### Userfields
+
+- xxx
+
+### General
+
+- Optimized that date time picker shortcuts (e.g. the "Never overdue" checkbox) are now also accessible via keyboard navigation (using `Tab`)
+
+### API
+
+- xxx
diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php
index 12f60bfc..1b1fff17 100644
--- a/views/components/datetimepicker.blade.php
+++ b/views/components/datetimepicker.blade.php
@@ -76,8 +76,7 @@
id="datetimepicker-shortcut"
name="datetimepicker-shortcut"
value="1"
- data-datetimepicker-shortcut-value="{{ $shortcutValue }}"
- tabindex="-1">
+ data-datetimepicker-shortcut-value="{{ $shortcutValue }}">
diff --git a/views/components/datetimepicker2.blade.php b/views/components/datetimepicker2.blade.php
index 9a760316..095a42d2 100644
--- a/views/components/datetimepicker2.blade.php
+++ b/views/components/datetimepicker2.blade.php
@@ -76,8 +76,7 @@
id="datetimepicker2-shortcut"
name="datetimepicker2-shortcut"
value="1"
- data-datetimepicker2-shortcut-value="{{ $shortcutValue }}"
- tabindex="-1">
+ data-datetimepicker2-shortcut-value="{{ $shortcutValue }}">