feat: use header config file

cf georchestra/header#25
landryb · Jan 3, 2025 · 795fba5 · 795fba5
1 parent 59abfad
commit 795fba5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java
@@ -17,21 +17,15 @@
 @Data
 public class GeorchestraConfiguration {
 
-    @Value( "${useLegacyHeader:false}" )
-    boolean useLegacyHeader = false;
+    @Value( "${headerConfigFile:}" )
+    String headerConfigFile;
 
-    @Value( "${headerUrl:/header/}" )
-    String headerUrl;
-
-    @Value("${headerHeight:90}")
+    @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
@@ -13,9 +13,7 @@
 <body>
 <div th:fragment="header">
     <geor-header th:style="'width:100%;height:'+ ${@georchestraConfiguration.getHeaderHeight()}+'px;border:none;overflow:hidden;'"
-                 th:legacy-url="${@georchestraConfiguration.getHeaderUrl()}"
-                 th:legacy-header="${@georchestraConfiguration.isUseLegacyHeader()}"
-                 th:logo-url="${@georchestraConfiguration.getLogoUrl()}"
+                 th:config-file="${@georchestraConfiguration.getConfigFile()}"
                  th:stylesheet="${@georchestraConfiguration.getGeorchestraStylesheet()}"
     ></geor-header>
     <script th:src="${@georchestraConfiguration.getHeaderScript()}"></script>