fix: minimal datadir & gn header position

georchestra · Dec 1, 2023 · 9d809d2 · 9d809d2
1 parent 611f47e
commit 9d809d2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/harvesters/src/main/resources/config-spring-geonetwork.xml b/harvesters/src/main/resources/config-spring-geonetwork.xml
@@ -57,7 +57,6 @@
   <bean id="wfsfeatures"
         class="org.fao.geonet.kernel.harvest.harvester.wfsfeatures.WfsFeaturesHarvester"
         scope="prototype"/>
-
   <!-- ArcSDE also requires a ArcSDEConnectionFactory beans -->
   <bean id="arcSDEConnectionFactory"
     class="org.fao.geonet.kernel.harvest.harvester.arcsde.ArcSDEConnectionFactory" />

diff --git a/web-ui/src/main/resources/catalog/style/gn.less b/web-ui/src/main/resources/catalog/style/gn.less
@@ -160,13 +160,9 @@ div[gn-transfer-ownership] * .list-group {
 }
 [ng-app="gn_editor"] {
   .gn-top-bar {
-    position: fixed;
     @media (max-width: @screen-xs-max) {
       position: relative;
     }
-    top: 0;
-    left: 0;
-    right: 0;
     z-index: 100;
     height: 52px;
   }

diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_admin_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_admin_default.less
@@ -21,7 +21,6 @@ ul.gn-resultview li.list-group-item {
 
 [ng-app="gn_admin"] {
   body {
-    padding-top: calc(~"@{gn-menubar-height} + 1px");
     background-color: #f7f7f7;
   }
   .container-fluid {
@@ -33,10 +32,9 @@ ul.gn-resultview li.list-group-item {
     max-height: 20px;
   }
   .gn-top-bar {
-    position: fixed;
     width: 100%;
-    height: calc(~"@{gn-menubar-height} + 1px");
-    border-width: 0 0 1px 0;
+    height: calc(~"@{gn-menubar-height} + 2px");
+    border-width: 1px 0 1px 0;
     background-color: #fff;
     top: 0;
     z-index: 1001;

diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_navbar_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_navbar_default.less
@@ -8,10 +8,6 @@
 [ng-app^="gn_search_"] body, [ng-app="gn_login"] body {
   &.gn-header-fixed {
     .gn-top-bar {
-      position: fixed;
-      right: 0;
-      left: 0;
-      top: 0;
       z-index: 1030;
     }
     &.gn-logo-in-header {

diff --git a/web/pom.xml b/web/pom.xml
@@ -1495,8 +1495,7 @@
         <dockerDatadirScmUrl>scm:git:https://github.com/georchestra/datadir.git</dockerDatadirScmUrl>
         <dockerDatadirScmVersion>docker-master</dockerDatadirScmVersion>
         <dockerGnDatadirScmUrl>scm:git:https://github.com/georchestra/geonetwork_minimal_datadir.git</dockerGnDatadirScmUrl>
-        <dockerGnDatadirScmVersion>gn4.2.2</dockerGnDatadirScmVersion>
-
+        <dockerGnDatadirScmVersion>gn4.2.7</dockerGnDatadirScmVersion>
       </properties>
       <build>
         <finalName>geonetwork</finalName>

diff --git a/...icProducer/src/main/java/org/fao/geonet/camelPeriodicProducer/MessageProducerFactory.java b/...icProducer/src/main/java/org/fao/geonet/camelPeriodicProducer/MessageProducerFactory.java
@@ -101,8 +101,8 @@ public void destroy(Long id) throws Exception {
 
     private String buildFrom(Long id) {
         return String.format("quartz2://%s-%s",
-            settingManager.getSiteId(), id);
-
+            settingManager.getSiteId(),
+            id);
     }
 
     public void shutdown() {