feat: use header config file (#32)

* feat: use header config file cf georchestra/header#25 * update upload-artifact action to fix GHA * README.md: add a section about how to build the debian package * fix method name to fetch the configfile * readd legacy headers, and set the height attribute on the geor-header webcomponent
georchestra · Jan 23, 2025 · 1ed207b · 1ed207b
1 parent 59abfad
commit 1ed207b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: publish the artifact
         if: github.repository == 'georchestra/georchestra-cas-server' && github.ref == 'refs/heads/master'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: cas.war
           path: build/libs/cas.war

diff --git a/README.md b/README.md
@@ -23,6 +23,14 @@ Custom georchestra build
 ./gradlew build
 ```
 
+## Building a debian package
+
+```
+./gradlew deb
+```
+
+The resulting deb is in `build/distributions/`
+
 ## Building a docker image
 
 Creating the exploded webapp with the following:

diff --git a/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java b/src/main/java/org/georchestra/cas/GeorchestraConfiguration.java
@@ -20,10 +20,13 @@ 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}")

diff --git a/src/main/resources/templates/georchestra/fragments/header.html b/src/main/resources/templates/georchestra/fragments/header.html
@@ -12,10 +12,11 @@
 
 <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>
     <script th:src="${@georchestraConfiguration.getHeaderScript()}"></script>