From 42b11059d29d6445e1e4e3309ad7a9a026b56c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Fri, 22 Aug 2025 12:52:41 +0200 Subject: [PATCH] fix(opendesk-static-files): Serve missing `.png` favicons for Notes and the Nextcloud topbar logo --- docs/migrations.md | 2 +- .../values-opendesk-static-files.yaml.gotmpl | 10 ++++++++-- helmfile/environments/default/charts.yaml.gotmpl | 2 +- helmfile/environments/default/theme.yaml.gotmpl | 3 ++- helmfile/files/theme/portal/stylesheet.css | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/migrations.md b/docs/migrations.md index 31b2a3fe..d755fbe7 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -96,7 +96,7 @@ Manual checks and possible activities are also required by openDesk updates, the We cannot hold back all migrations as some are required e.g. due to a change in a specific component that we want/need to update, we try to bundle others only with major releases. -This section should provide you with an overview of what changes to expect in the next major release (openDesk 2.0) expected in September 2025. +This section provides an overview of potential changes to be part of the next major release (openDesk 2.0). - `functional.portal.link*` (see `functional.yaml.gotmpl` for details) are going to be moved into the `theme.*` tree, we are also going to move the icons used for the links currently found under `theme.imagery.portalEntries` in this step. - We will explicitly set the [database schema configuration](https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Configuration/#HConfigurethenamesofdatabaseschemas) for XWiki to avoid the use of the `public` schema. diff --git a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl index 9eceb524..f1001f25 100644 --- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl +++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl @@ -27,7 +27,7 @@ assets: paths: - path: "/resources/...../login/UCS/img/favicon.ico" data: {{ .Values.theme.imagery.login.faviconIco }} - - path: "/static-files/login/logo.svg" + - path: "/opendesk-static-files/login/logo.svg" data: {{ .Values.theme.imagery.login.logoSvg }} nextcloud: subdomain: {{ .Values.global.hosts.nextcloud }} @@ -36,11 +36,18 @@ assets: data: {{ .Values.theme.imagery.files.faviconPng }} - path: "/core/img/favicon.ico" data: {{ .Values.theme.imagery.files.faviconIco }} + - path: "/apps/integration_swp/logo" + data: {{ .Values.theme.imagery.logoHeaderSvgB64 }} + mimeType: "image/svg+xml" notes: subdomain: {{ .Values.global.hosts.notes }} paths: - path: "/favicon.ico" data: {{ .Values.theme.imagery.notes.faviconIco }} + - path: "/favicon.png" + data: {{ .Values.theme.imagery.notes.faviconPng }} + - path: "/favicon-dark.png" + data: {{ .Values.theme.imagery.notes.faviconPng }} openproject: subdomain: {{ .Values.global.hosts.openproject }} paths: @@ -64,7 +71,6 @@ assets: data: {{ .Values.theme.imagery.portal.waitingSpinnerSvg }} - path: "/static-files/login/background.jpg" data: {{ .Values.theme.imagery.login.backgroundJpg }} - xwiki: subdomain: {{ .Values.global.hosts.xwiki }} paths: diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index 5e12cea2..0e241026 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -351,7 +351,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-static-files" name: "opendesk-static-files" - version: "4.0.1" + version: "4.1.0" verify: true openproject: # providerCategory: "Supplier" diff --git a/helmfile/environments/default/theme.yaml.gotmpl b/helmfile/environments/default/theme.yaml.gotmpl index cbc64453..4c86835b 100644 --- a/helmfile/environments/default/theme.yaml.gotmpl +++ b/helmfile/environments/default/theme.yaml.gotmpl @@ -68,6 +68,7 @@ theme: notes: faviconIco: {{ readFile "./../../files/theme/notes/favicon.ico" | b64enc | quote }} + faviconPng: {{ readFile "./../../files/theme/notes/favicon.png" | b64enc | quote }} portal: faviconIco: {{ readFile "./../../files/theme/portal/favicon/favicon.ico" | b64enc | quote }} @@ -76,9 +77,9 @@ theme: appleTouchIcon: {{ readFile "./../../files/theme/portal/favicon/apple-touch-icon.png" | b64enc | quote }} webManifestIcon192: {{ readFile "./../../files/theme/portal/favicon/web-app-manifest-192x192.png" | b64enc | quote }} webManifestIcon512: {{ readFile "./../../files/theme/portal/favicon/web-app-manifest-512x512.png" | b64enc | quote }} - waitingSpinnerSvg: {{ readFile "./../../files/theme/portal/waiting-spinner.svg" | b64enc | quote }} backgroundSvg: {{ readFile "./../../files/theme/portal/background.svg" | b64enc | quote }} + portalTiles: adminAnnouncement: {{ readFile "./../../files/theme/admin_announcements/favicon.svg" | b64enc | quote }} adminFunctionalmailbox: {{ readFile "./../../files/theme/admin_functionalmailbox/favicon.svg" | b64enc | quote }} diff --git a/helmfile/files/theme/portal/stylesheet.css b/helmfile/files/theme/portal/stylesheet.css index dd7952e4..184d99b2 100644 --- a/helmfile/files/theme/portal/stylesheet.css +++ b/helmfile/files/theme/portal/stylesheet.css @@ -94,7 +94,7 @@ --select-arrow: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAYAAADgKtSgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABkSURBVHgB7Y3BCQAhDAS3BEtICVeCJdi5JVwpGsGHiGLECD4ysL9lBjCMpwk8En6p/kV4XuL9WAeo/sr/gwDHi4JAK47YYBXoxQ6bzALH4lnAa4lHgaQpHgVUxW0g4ILYMC6TAZ0BJA3bxN3RAAAAAElFTkSuQmCC'); --layout-height-header: 63px; /* Keycloak user screens logo */ - --login-logo: url("/static-files/login/logo.svg") no-repeat center; + --login-logo: url("/opendesk-static-files/login/logo.svg") no-repeat center; } button {