extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix vertical resizing on day view todo list

Browse Source
This commit is contained in:
nathangray 2020-07-10 13:43:02 -06:00
parent 31b7c49fd3
commit 29e0514d52
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/app.js
View File

@ -2366,7 +2366,7 @@ var CalendarApp = /** @class */ (function (_super) {
&& egw.user('apps')['infolog'] && egw.preference('cal_show', 'infolog') !== '0') { && egw.user('apps')['infolog'] && egw.preference('cal_show', 'infolog') !== '0') {
// Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list // Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list
jQuery(CalendarApp.views.day.etemplates[0].DOMContainer).css("width", "70%"); jQuery(CalendarApp.views.day.etemplates[0].DOMContainer).css("width", "70%");
jQuery(view.etemplates[1].DOMContainer).css({ "left": "70%", "height": (jQuery(framework.tabsUi.activeTab.contentDiv).height() - 30) + 'px' }); jQuery(view.etemplates[1].DOMContainer).css({ "left": "70%", "height": '100%' });
// TODO: Maybe some caching here // TODO: Maybe some caching here
this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function (data) { this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function (data) {
this.getWidgetById('label').set_value(data.label || ''); this.getWidgetById('label').set_value(data.label || '');

2
calendar/js/app.ts
View File

@ -2714,7 +2714,7 @@ class CalendarApp extends EgwApp
{ {
// Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list // Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list
jQuery((<etemplate2>CalendarApp.views.day.etemplates[0]).DOMContainer).css("width","70%"); jQuery((<etemplate2>CalendarApp.views.day.etemplates[0]).DOMContainer).css("width","70%");
jQuery(view.etemplates[1].DOMContainer).css({"left":"70%", "height":(jQuery(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'}); jQuery(view.etemplates[1].DOMContainer).css({"left":"70%", "height":'100%'});
// TODO: Maybe some caching here // TODO: Maybe some caching here
this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) { this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {
this.getWidgetById('label').set_value(data.label||''); this.getWidgetById('label').set_value(data.label||'');