feat: use header config file

fix: header config
georchestra · Jan 8, 2025 · c35dc5b · c35dc5b
1 parent a3896f4
commit c35dc5b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/core/src/main/java/org/fao/geonet/util/XslUtil.java b/core/src/main/java/org/fao/geonet/util/XslUtil.java
@@ -280,6 +280,7 @@ public static MultiPolygon toMultiPolygon(Geometry geometry) {
     private static String headerScript;
     private static String logoUrl;
     private static String georchestraStylesheet;
+    private static String headerConfigFile;
 
 
     public static String getGeorchestraHeaderUrl(){
@@ -378,6 +379,22 @@ public static String getGeorchestraHeaderStylesheet(){
         return XslUtil.georchestraStylesheet;
     }
 
+    public static String getGeorchestraHeaderConfigFile(){
+
+        if(XslUtil.headerConfigFile == null) {
+
+            // Set default value
+            XslUtil.headerConfigFile = "";
+
+            // Load value from datadir
+            Properties properties = XslUtil.loadDatadirProperties();
+            if (properties.containsKey("headerConfigFile"))
+                XslUtil.headerConfigFile = properties.getProperty("headerConfigFile");
+        }
+
+        return XslUtil.headerConfigFile;
+    }
+
     private static Properties loadProperties(File path, Properties prop) throws IOException {
         try(FileInputStream fisProp = new FileInputStream(path)) {
             InputStreamReader isrProp = new InputStreamReader(fisProp, "UTF8");

diff --git a/web/src/main/webapp/xslt/base-layout.xsl b/web/src/main/webapp/xslt/base-layout.xsl
@@ -99,7 +99,7 @@
       and a facet search to get main site information.
       -->
       <body data-ng-controller="GnCatController" data-ng-class="[isHeaderFixed ? 'gn-header-fixed' : 'gn-header-relative', isLogoInHeader ? 'gn-logo-in-header' : 'gn-logo-in-navbar', isFooterEnabled ? 'gn-show-footer' : 'gn-hide-footer']">
-        <geor-header active-app="geonetwork" legacy-header="{$useLegacyHeader}" legacy-url="{$headerUrl}" style="width:100%;height:{$headerHeight}px;border:none;" logo-url="{$logoUrl}" stylesheet="{$georchestraStylesheet}"></geor-header>
+        <geor-header active-app="geonetwork" config-file="{$headerConfigFile}" legacy-header="{$useLegacyHeader}" legacy-url="{$headerUrl}" logo-url="{$logoUrl}" stylesheet="{$georchestraStylesheet}"></geor-header>
 
         <div data-gn-alert-manager=""/>
 

diff --git a/web/src/main/webapp/xslt/common/base-variables.xsl b/web/src/main/webapp/xslt/common/base-variables.xsl
@@ -39,7 +39,7 @@
   <xsl:variable name="headerScript" select="util:getGeorchestraHeaderScript()"/>
   <xsl:variable name="logoUrl" select="util:getGeorchestraHeaderLogo()"/>
   <xsl:variable name="georchestraStylesheet" select="util:getGeorchestraHeaderStylesheet()"/>
-
+  <xsl:variable name="headerConfigFile" select="util:getGeorchestraHeaderConfigFile()"/>
   <!--
   -->
   <xsl:variable name="gnUri" select="'http://www.fao.org/geonetwork'"/>