extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Framework WIP:

Browse Source 
- Get calendar sort of running
This commit is contained in:
nathan 2024-06-11 11:58:04 -06:00
parent 7516e2d1b8
commit 16c727b84a
6 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/app.ts
View File

@ -1263,7 +1263,7 @@ export class CalendarApp extends EgwApp
}
);
*/
if(typeof framework !== 'undefined' && framework.applications.calendar && framework.applications.calendar.tab)
if(typeof framework !== 'undefined' && framework.applications?.calendar && framework.applications.calendar.tab)
{
let swipe = new tapAndSwipe(framework.applications.calendar.tab.contentDiv, {
//Generic swipe handler for all directions
@ -2429,7 +2429,7 @@ export class CalendarApp extends EgwApp
{
// This activates calendar app if you call setState from a different app
// such as home. If we change state while not active, sizing is wrong.
if(typeof framework !== 'undefined' && framework.applications.calendar && framework.applications.calendar.hasSideboxMenuContent)
if(typeof framework !== 'undefined' && framework.applications?.calendar && framework.applications.calendar.hasSideboxMenuContent)
{
framework.setActiveApp(framework.applications.calendar);
}
@ -2658,7 +2658,7 @@ export class CalendarApp extends EgwApp
// Show loading div to hide redrawing
egw.loading_prompt(
this.appname,true,egw.lang('please wait...'),
typeof framework !== 'undefined' ? framework.applications.calendar.tab.contentDiv : false,
typeof framework !== 'undefined' ? framework.applications?.calendar?.tab?.contentDiv : false,
egwIsMobile()?'horizontal':'spinner'
);
@ -3483,7 +3483,7 @@ export class CalendarApp extends EgwApp
// Show ajax loader
if(typeof framework !== 'undefined')
{
framework.applications.calendar.sidemenuEntry.showAjaxLoader();
framework.applications?.calendar?.sidemenuEntry?.showAjaxLoader();
}
if(state.view === 'planner' && state.sortby === 'user')
@ -3580,7 +3580,7 @@ export class CalendarApp extends EgwApp
// Hide AJAX loader
else if(typeof framework !== 'undefined')
{
framework.applications.calendar.sidemenuEntry.hideAjaxLoader();
framework.applications?.calendar?.sidemenuEntry.hideAjaxLoader();
egw.loading_prompt('calendar', false)
}

2
calendar/templates/default/sidebox.xet
View File

@ -12,7 +12,7 @@ Egroupware
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
<overlay>
<template id="calendar.sidebox">
<template id="calendar.sidebox" slot="left">
<et2-vbox parentId="calendar-et2_target">
<calendar-date id="date"></calendar-date>
<et2-textbox type="hidden" id="first"></et2-textbox>

2
calendar/templates/default/todo.xet
View File

@ -12,7 +12,7 @@ Egroupware
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
<overlay>
<template id="calendar.todo" width="30%">
<template id="calendar.todo" width="30%" slot="right">
<et2-box class="calendar_calDayTodos">
<et2-box class="calendar_calDayTodosHeader" width="100%">
<et2-button align="left" statustext="Add" id="add" image="add" onclick="egw.open('','infolog','add',{action: 'new',type:'task'});"></et2-button>

2
calendar/templates/default/toolbar.xet
View File

@ -12,7 +12,7 @@ Egroupware
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
<overlay>
<template id="calendar.toolbar">
<template id="calendar.toolbar" slot="main-header">
<et2-button id="add" image="add" class="imageOnly" statustext="add new event" onclick="app.calendar.toolbar_action(widget);" noSubmit="true"></et2-button>
<et2-searchbox id="keywords" overlay="false" onchange="app.calendar.update_state({view: 'listview',search: widget.getValue()});return false;" placeholder="Search"></et2-searchbox>
<toolbar id="toolbar" width="100%" flat_list="false"/>

21
calendar/templates/kdots/app.less Normal file
View File

@ -0,0 +1,21 @@
@import (less) "../default/app.css";
#calendar-view, #calendar-todo, #calendar-planner, #calendar-list {
position: relative;
width: 100% !important;
}
#calendar-sidebox {
width: 100%;
display: block !important;
}
#calendar-todo {
width: 100%;
height: calc(100% - 10px);
left: initial !important;
}
.calendar_calEvent:not([class*=" cat_"]) {
background-color: var(--primary-background-color)
}

2
kdots/js/EgwFrameworkApp.ts
View File

@ -442,7 +442,7 @@ export class EgwFrameworkApp extends LitElement
this[`${event.target.panelInfo.side}Collapsed`] = newPosition == event.target.panelInfo.hiddenWidth;
let preferenceName = event.target.panelInfo.preference;
if(newPosition != event.target.panelInfo.preferenceWidth)
if(newPosition != event.target.panelInfo.preferenceWidth && !isNaN(newPosition))
{
event.target.panelInfo.preferenceWidth = newPosition;
if(this.resizeTimeout)