kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-07 06:53:30 +00:00
Code Issues Projects Releases Wiki Activity

Fixed FullCalendar height was not calculated dynamically (fixes #549)

Browse Source
This commit is contained in:
Bernd Bestel 2020-02-09 15:24:05 +01:00
parent 3af5bd8e29
commit e9f55de987
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/56_UNRELEASED_2020-xx-xx.md
View File

@ -17,6 +17,7 @@
### Meal plan improvements ### Meal plan improvements
- Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product - Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product
- Fixed that the meal plan not used the full height on mobile devices (also applies/fixes the same for the calendar)
### General & other improvements/fixes ### General & other improvements/fixes
- Optimized the top navbar height and overall spacing to waste less space - Optimized the top navbar height and overall spacing to waste less space

3
public/viewjs/calendar.js
View File

@ -14,7 +14,8 @@ var calendar = $("#calendar").fullCalendar({
"weekNumbers": Grocy.CalendarShowWeekNumbers, "weekNumbers": Grocy.CalendarShowWeekNumbers,
"defaultView": ($(window).width() < 768) ? "agendaDay" : "month", "defaultView": ($(window).width() < 768) ? "agendaDay" : "month",
"firstDay": firstDay, "firstDay": firstDay,
"eventLimit": true, "eventLimit": false,
"height": "auto",
"eventSources": fullcalendarEventSources "eventSources": fullcalendarEventSources
}); });

3
public/viewjs/mealplan.js
View File

@ -18,10 +18,11 @@ var calendar = $("#calendar").fullCalendar({
"right": "prev,today,next" "right": "prev,today,next"
}, },
"weekNumbers": false, "weekNumbers": false,
"eventLimit": true, "eventLimit": false,
"eventSources": fullcalendarEventSources, "eventSources": fullcalendarEventSources,
"defaultView": ($(window).width() < 768) ? "basicDay" : "basicWeek", "defaultView": ($(window).width() < 768) ? "basicDay" : "basicWeek",
"firstDay": firstDay, "firstDay": firstDay,
"height": "auto",
"viewRender": function(view) "viewRender": function(view)
{ {
if (firstRender) if (firstRender)