From e4b8c97e03615a8cd45b2714e44bc7e26739339c Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 18 Aug 2025 00:46:11 +0200 Subject: [PATCH] Solved port-ui keycloak url bug and optimized var names --- roles/web-app-port-ui/config/main.yml | 12 ++++++------ roles/web-app-port-ui/templates/config.yaml.j2 | 16 ++++++++-------- .../templates/menu/applications.yml.j2 | 2 +- .../web-app-port-ui/templates/menu/footer.yml.j2 | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/roles/web-app-port-ui/config/main.yml b/roles/web-app-port-ui/config/main.yml index a2bfd3dc..2a7cbd38 100644 --- a/roles/web-app-port-ui/config/main.yml +++ b/roles/web-app-port-ui/config/main.yml @@ -1,10 +1,10 @@ features: - matomo: true - css: true - desktop: false - simpleicons: true # Activate Brand Icons for your groups - javascript: true # Necessary for URL sync - logout: false # Doesn't have own user data. Just a frame. + matomo: true + css: true + desktop: false + simpleicons: true # Activate Brand Icons for your groups + javascript: true # Necessary for URL sync + logout: false # Doesn't have own user data. Just a frame. server: csp: whitelist: diff --git a/roles/web-app-port-ui/templates/config.yaml.j2 b/roles/web-app-port-ui/templates/config.yaml.j2 index 90dbf630..ec80a88a 100644 --- a/roles/web-app-port-ui/templates/config.yaml.j2 +++ b/roles/web-app-port-ui/templates/config.yaml.j2 @@ -9,20 +9,20 @@ cards: {% include 'menu/support.yml.j2' %} platform: - titel: {{service_provider.platform.titel}} - subtitel: {{service_provider.platform.subtitel}} + titel: {{ service_provider.platform.titel }} + subtitel: {{ service_provider.platform.subtitel }} logo: - source: {{service_provider.platform.logo}} + source: {{ service_provider.platform.logo }} favicon: - source: {{service_provider.platform.favicon}} + source: {{ service_provider.platform.favicon }} company: - titel: {{service_provider.company.titel}} - subtitel: {{service_provider.company.slogan}} + titel: {{ service_provider.company.titel }} + subtitel: {{ service_provider.company.slogan }} logo: - source: {{service_provider.company.logo}} + source: {{ service_provider.company.logo }} address: {{ service_provider.company.address | to_nice_yaml(indent=4) | indent(4, true) }} - imprint_url: {{service_provider.legal.imprint}} + imprint_url: {{ service_provider.legal.imprint }} navigation: {% include 'menu/header.yml.j2' %} diff --git a/roles/web-app-port-ui/templates/menu/applications.yml.j2 b/roles/web-app-port-ui/templates/menu/applications.yml.j2 index 837d73f7..8e957b9b 100644 --- a/roles/web-app-port-ui/templates/menu/applications.yml.j2 +++ b/roles/web-app-port-ui/templates/menu/applications.yml.j2 @@ -25,7 +25,7 @@ applications: url: {{ app.url }} iframe: {{ app.iframe }} {% if app.title == 'Keycloak' %} - {% set keycloak_url = domains | get_url(application_id, WEB_PROTOCOL) %} + {% set keycloak_url = domains | get_url('web-app-keycloak', WEB_PROTOCOL) %} {{ domains | get_url(application_id, WEB_PROTOCOL) }} children: - name: Administration diff --git a/roles/web-app-port-ui/templates/menu/footer.yml.j2 b/roles/web-app-port-ui/templates/menu/footer.yml.j2 index d697e7dc..3d79b593 100644 --- a/roles/web-app-port-ui/templates/menu/footer.yml.j2 +++ b/roles/web-app-port-ui/templates/menu/footer.yml.j2 @@ -44,5 +44,5 @@ description: Check out the imprint information icon: class: fa-solid fa-scale-balanced - url: "{{service_provider.legal.imprint}}" + url: "{{ service_provider.legal.imprint }}" iframe: true