From 5b94507de66fae01fd44873d97c3855e7a934d41 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 27 May 2024 14:28:10 -0600 Subject: [PATCH] Framework WIP - Status select shows up - Status shows up - Timer working --- kdots/assets/styles/framework.less | 4 ++++ kdots/head.tpl | 5 +---- kdots/inc/class.kdots_framework.inc.php | 2 +- kdots/js/EgwFramework.ts | 21 +++++++++++++++++++-- kdots/js/EgwFrameworkApp.styles.ts | 2 +- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/kdots/assets/styles/framework.less b/kdots/assets/styles/framework.less index 682d46f70f..f6812ce726 100644 --- a/kdots/assets/styles/framework.less +++ b/kdots/assets/styles/framework.less @@ -60,6 +60,10 @@ egw-framework#egw_fw_basecontainer { div#egw_fw_sidebar_r { position: initial; top: initial; + + et2-avatar, et2-lavatar { + --size: 26px; + } } .egw_fw_ui_sidemenu_entry_header { diff --git a/kdots/head.tpl b/kdots/head.tpl index 17086968d6..28b45cfa82 100644 --- a/kdots/head.tpl +++ b/kdots/head.tpl @@ -41,12 +41,9 @@
{topmenu_info_items}
-
- Placeholders -
-
+
diff --git a/kdots/inc/class.kdots_framework.inc.php b/kdots/inc/class.kdots_framework.inc.php index 0ca4c1b2b8..8ea34d3ca0 100644 --- a/kdots/inc/class.kdots_framework.inc.php +++ b/kdots/inc/class.kdots_framework.inc.php @@ -67,7 +67,7 @@ class kdots_framework extends Api\Framework\Ajax parent::topmenu($vars, $apps); - $vars['topmenu_items'] = "" . implode("\n", $this->topmenu_items) . ""; + $vars['topmenu_items'] = "" . implode("\n", $this->topmenu_items) . ""; $vars['topmenu_info_items'] = ''; foreach($this->topmenu_info_items as $id => $item) { diff --git a/kdots/js/EgwFramework.ts b/kdots/js/EgwFramework.ts index 5d704a0bcb..d717c04a34 100644 --- a/kdots/js/EgwFramework.ts +++ b/kdots/js/EgwFramework.ts @@ -1,4 +1,4 @@ -import {css, html, LitElement, nothing} from "lit"; +import {css, html, LitElement, nothing, PropertyValues} from "lit"; import {customElement} from "lit/decorators/custom-element.js"; import {property} from "lit/decorators/property.js"; import {classMap} from "lit/directives/class-map.js"; @@ -118,6 +118,23 @@ export class EgwFramework extends LitElement } } + protected firstUpdated(_changedProperties : PropertyValues) + { + super.firstUpdated(_changedProperties); + + // Load hidden apps like status + this.applicationList.forEach((app) => + { + if(app.status == "5" && app.url) + { + this.loadApp(app.name); + } + }); + + // Init timer + this.egw.add_timer('topmenu_info_timer'); + } + get egw() : typeof egw { return window.egw ?? { @@ -503,7 +520,7 @@ export class EgwFramework extends LitElement @sl-close=${this.handleApplicationTabClose} > ${repeat(this.applicationList - .filter(app => typeof app.opened !== "undefined") + .filter(app => typeof app.opened !== "undefined" && app.status !== "5") .sort((a, b) => a.opened - b.opened), (app) => this._applicationTabTemplate(app))} header diff --git a/kdots/js/EgwFrameworkApp.styles.ts b/kdots/js/EgwFrameworkApp.styles.ts index e8f662f556..dbebcc458d 100644 --- a/kdots/js/EgwFrameworkApp.styles.ts +++ b/kdots/js/EgwFrameworkApp.styles.ts @@ -144,7 +144,7 @@ export default css` overflow-y: hidden; } - .egw_fw_app__aside_content { + .egw_fw_app__aside_content, egw_fw_app__main_content { overflow-x: hidden; overflow-y: auto; }