Add header config file (#164)

* feat: add header config file * update header height
georchestra · Jan 23, 2025 · 94bb76b · 94bb76b
1 parent 3bb5bec
commit 94bb76b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gateway/src/main/java/org/georchestra/gateway/app/GeorchestraGatewayApplication.java b/gateway/src/main/java/org/georchestra/gateway/app/GeorchestraGatewayApplication.java
@@ -78,7 +78,8 @@ public class GeorchestraGatewayApplication {
     private @Value("${georchestraStylesheet:}") String georchestraStylesheet;
     private @Value("${useLegacyHeader:false}") boolean useLegacyHeader;
     private @Value("${headerUrl:/header/}") String headerUrl;
-    private @Value("${headerHeight:90}") int headerHeight;
+    private @Value("${headerConfigFile:}") String headerConfigFile;
+    private @Value("${headerHeight:80}") int headerHeight;
     private @Value("${logoUrl:}") String logoUrl;
     private @Value("${headerScript:https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js}") String headerScript;
     private @Value("${spring.messages.basename:}") String messagesBasename;
@@ -206,6 +207,7 @@ private void setHeaderAttributes(Model mdl) {
         mdl.addAttribute("headerUrl", headerUrl);
         mdl.addAttribute("headerHeight", headerHeight);
         mdl.addAttribute("logoUrl", logoUrl);
+        mdl.addAttribute("headerConfigFile", headerConfigFile);
         mdl.addAttribute("headerEnabled", headerEnabled);
         mdl.addAttribute("headerScript", headerScript);
     }

diff --git a/gateway/src/main/resources/templates/login.html b/gateway/src/main/resources/templates/login.html
@@ -13,9 +13,8 @@
 </head>
 <body class="d-flex flex-column" id="georchestra-login-page">
 <header th:if="${headerEnabled}">
-    <geor-header th:stylesheet="${georchestraStylesheet}" th:legacy-header="${useLegacyHeader}"
-                 th:style="'height:' + ${headerHeight} + 'px'" th:logo-url="${logoUrl}"
-                 th:legacy-url="${headerUrl}"></geor-header>
+    <geor-header th:stylesheet="${georchestraStylesheet}" th:legacy-header="${useLegacyHeader}" th:legacy-url="${headerUrl}" th:logo-url="${logoUrl}"
+                 th:height="${headerHeight}" th:config-file="${configFile}"></geor-header>
 </header>
 <div class="container h-100 py-4 px-3">
     <div class="d-flex justify-content-center align-items-center rounded-5 h-100">