From 3b4d0d510a5834ce0cbb5a8ee5596e8691d6608f Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Wed, 8 Jan 2025 16:25:35 +0100
Subject: [PATCH 1/2] feat: use header config file

---
 src/gwc/pom.xml                                              | 2 +-
 src/web/core/pom.xml                                         | 2 +-
 src/web/core/src/main/java/applicationContext.xml            | 3 +++
 .../java/org/georchestra/GeorchestraHeaderWebComponent.java  | 5 ++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gwc/pom.xml b/src/gwc/pom.xml
index 6478cd06671..e27b24d01e7 100644
--- a/src/gwc/pom.xml
+++ b/src/gwc/pom.xml
@@ -15,9 +15,9 @@
 
   <groupId>org.geoserver</groupId>
   <artifactId>gs-gwc</artifactId>
+  <version>2.25.2-georchestra</version>
   <packaging>jar</packaging>
   <name>GeoWebCache (GWC) Module</name>
-  <version>2.25.2-georchestra</version>
 
   <dependencies>
     <dependency>
diff --git a/src/web/core/pom.xml b/src/web/core/pom.xml
index 5a7db80046a..383ef77998d 100644
--- a/src/web/core/pom.xml
+++ b/src/web/core/pom.xml
@@ -16,8 +16,8 @@
 
   <groupId>org.geoserver.web</groupId>
   <artifactId>gs-web-core</artifactId>
-  <packaging>jar</packaging>
   <version>2.25.2-georchestra</version>
+  <packaging>jar</packaging>
   <name>Core UI Module</name>
 
   <dependencies>
diff --git a/src/web/core/src/main/java/applicationContext.xml b/src/web/core/src/main/java/applicationContext.xml
index 6c4226fbf77..aa8a3fc4f98 100644
--- a/src/web/core/src/main/java/applicationContext.xml
+++ b/src/web/core/src/main/java/applicationContext.xml
@@ -503,4 +503,7 @@
   <bean id="georchestraStylesheet" class="java.lang.String" factory-method="valueOf">
     <constructor-arg value="${georchestra.georchestraStylesheet:}" />
   </bean>
+  <bean id="georchestraHeaderConfigFile" class="java.lang.String" factory-method="valueOf">
+    <constructor-arg value="${georchestra.headerConfigFile:}" />
+  </bean>
 </beans>
diff --git a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
index f9f66bc0623..a336a2e9931 100644
--- a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
+++ b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
@@ -13,6 +13,7 @@ public class GeorchestraHeaderWebComponent extends WebComponent {
     private String legacyHeader;
     private String logoUrl;
     private String georchestraStylesheet;
+    private String headerConfigFile;
 
     private static Logger LOGGER = Logging.getLogger(GeorchestraHeaderWebComponent.class);
 
@@ -23,6 +24,8 @@ private void init() {
         logoUrl = getGeoServerApplication().getBean("georchestraLogoUrl").toString();
         georchestraStylesheet =
                 getGeoServerApplication().getBean("georchestraStylesheet").toString();
+        headerConfigFile =
+                getGeoServerApplication().getBean("georchestraHeaderConfigFile").toString();
     }
 
     protected GeoServerApplication getGeoServerApplication() {
@@ -36,11 +39,11 @@ public GeorchestraHeaderWebComponent(String id) {
 
     @Override
     protected void onComponentTag(ComponentTag tag) {
-        tag.put("style", "width:100%;height:" + this.headerHeight + "px;border:none;");
         tag.put("active-app", "geoserver");
         tag.put("legacy-url", this.headerUrl);
         tag.put("legacy-header", this.legacyHeader);
         tag.put("logo-url", this.logoUrl);
+        tag.put("config-file", this.headerConfigFile);
         tag.put("stylesheet", this.georchestraStylesheet);
         super.onComponentTag(tag);
     }

From ab3f806fa01e5419c12acc9d5dee163514ca738c Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Wed, 22 Jan 2025 16:46:56 +0100
Subject: [PATCH 2/2] feat: add header height

---
 .../main/java/org/georchestra/GeorchestraHeaderWebComponent.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
index a336a2e9931..50e85e8e1dc 100644
--- a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
+++ b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java
@@ -45,6 +45,7 @@ protected void onComponentTag(ComponentTag tag) {
         tag.put("logo-url", this.logoUrl);
         tag.put("config-file", this.headerConfigFile);
         tag.put("stylesheet", this.georchestraStylesheet);
+        tag.put("height", this.headerHeight);
         super.onComponentTag(tag);
     }
 }