From 16c727b84ae9f6124a847844c9d3e03789c50fc1 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Tue, 11 Jun 2024 11:58:04 -0600
Subject: [PATCH] Framework WIP: - Get calendar sort of running

---
 calendar/js/app.ts                     | 10 +++++-----
 calendar/templates/default/sidebox.xet |  2 +-
 calendar/templates/default/todo.xet    |  2 +-
 calendar/templates/default/toolbar.xet |  2 +-
 calendar/templates/kdots/app.less      | 21 +++++++++++++++++++++
 kdots/js/EgwFrameworkApp.ts            |  2 +-
 6 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 calendar/templates/kdots/app.less

diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index ece5510b9a..e610277886 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -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)
 
 				}
diff --git a/calendar/templates/default/sidebox.xet b/calendar/templates/default/sidebox.xet
index f7a40644ed..629f03a632 100644
--- a/calendar/templates/default/sidebox.xet
+++ b/calendar/templates/default/sidebox.xet
@@ -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>
diff --git a/calendar/templates/default/todo.xet b/calendar/templates/default/todo.xet
index a60b1f889f..8fbc3a3f5b 100644
--- a/calendar/templates/default/todo.xet
+++ b/calendar/templates/default/todo.xet
@@ -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>
diff --git a/calendar/templates/default/toolbar.xet b/calendar/templates/default/toolbar.xet
index 8eedd40693..3217ac1695 100644
--- a/calendar/templates/default/toolbar.xet
+++ b/calendar/templates/default/toolbar.xet
@@ -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"/>
diff --git a/calendar/templates/kdots/app.less b/calendar/templates/kdots/app.less
new file mode 100644
index 0000000000..9f7715fc37
--- /dev/null
+++ b/calendar/templates/kdots/app.less
@@ -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)
+}
\ No newline at end of file
diff --git a/kdots/js/EgwFrameworkApp.ts b/kdots/js/EgwFrameworkApp.ts
index bc0b8dd7f1..c409ba5be9 100644
--- a/kdots/js/EgwFrameworkApp.ts
+++ b/kdots/js/EgwFrameworkApp.ts
@@ -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)