extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix multi-day date format in tooltip, place end date on second line

Browse Source
This commit is contained in:
nathan 2023-11-30 13:26:14 -07:00
parent 4367afaf27
commit 2ea9ae3d3d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/et2_widget_event.ts
View File

@ -25,7 +25,7 @@ import {egw_getAppObjectManager, egwActionObject} from '../../api/js/egw_action/
import {egw} from "../../api/js/jsapi/egw_global"; import {egw} from "../../api/js/jsapi/egw_global";
import {et2_container} from "../../api/js/etemplate/et2_core_baseWidget"; import {et2_container} from "../../api/js/etemplate/et2_core_baseWidget";
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog"; import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
import {formatDate, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date"; import {formatDate, formatDateTime, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date";
import {ColorTranslator} from "colortranslator"; import {ColorTranslator} from "colortranslator";
import {StaticOptions as so} from "../../api/js/etemplate/Et2Select/StaticOptions"; import {StaticOptions as so} from "../../api/js/etemplate/Et2Select/StaticOptions";
import {Et2Select} from "../../api/js/etemplate/Et2Select/Et2Select"; import {Et2Select} from "../../api/js/etemplate/Et2Select/Et2Select";
@ -519,8 +519,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
const times = !this.options.value.multiday ? const times = !this.options.value.multiday ?
'<span class="calendar_calEventLabel">' + this.egw().lang('Time') + '</span>: ' + timespan : '<span class="calendar_calEventLabel">' + this.egw().lang('Time') + '</span>: ' + timespan :
'<span class="calendar_calEventLabel">' + this.egw().lang('Start') + '</span>: ' + start + ' ' + '<span class="calendar_calEventLabel">' + this.egw().lang('Start') + '</span>:&nbsp;' + formatDateTime(start).replace(' ', '&nbsp;') + ' ' +
'<span class="calendar_calEventLabel">' + this.egw().lang('End') + '</span>: ' + end; '<span class="calendar_calEventLabel">' + this.egw().lang('End') + '</span>:&nbsp;' + formatDateTime(end).replace(' ', '&nbsp;');
let cat_label : (string | string[]) = ''; let cat_label : (string | string[]) = '';
if(this.options.value.category) if(this.options.value.category)
{ {