readd legacy headers, and set the height attribute on the geor-header…

… webcomponent
landryb · Jan 22, 2025 · 0b5b71d · 0b5b71d
1 parent a5323fc
commit 0b5b71d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java
@@ -17,15 +17,24 @@
 @Data
 public class GeorchestraConfiguration {
 
+    @Value( "${useLegacyHeader:false}" )
+    boolean useLegacyHeader = false;
+
     @Value( "${headerConfigFile:}" )
     String headerConfigFile;
 
+    @Value( "${headerUrl:/header/}" )
+    String headerUrl;
+
     @Value("${headerHeight:80}")
     String headerHeight;
 
     @Value("${headerScript:https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js}")
     String headerScript;
 
+    @Value("${logoUrl:https://www.georchestra.org/public/georchestra-logo.svg}")
+    String logoUrl;
+
     @Value("${georchestraStylesheet:}")
     String georchestraStylesheet;
 

diff --git a/src/main/resources/templates/georchestra/fragments/header.html b/src/main/resources/templates/georchestra/fragments/header.html
@@ -12,7 +12,10 @@
 
 <body>
 <div th:fragment="header">
-    <geor-header th:style="'width:100%;height:'+ ${@georchestraConfiguration.getHeaderHeight()}+'px;border:none;overflow:hidden;'"
+    <geor-header th:height="${@georchestraConfiguration.getHeaderHeight()}"
+                 th:legacy-url="${@georchestraConfiguration.getHeaderUrl()}"
+                 th:legacy-header="${@georchestraConfiguration.isUseLegacyHeader()}"
+                 th:logo-url="${@georchestraConfiguration.getLogoUrl()}"
                  th:config-file="${@georchestraConfiguration.getHeaderConfigFile()}"
                  th:stylesheet="${@georchestraConfiguration.getGeorchestraStylesheet()}"
     ></geor-header>