From 7df6470373ce9ccec1fdc351e4b54982e2a11dcb Mon Sep 17 00:00:00 2001
From: Paul <paul.vangenuchten@geocat.net>
Date: Tue, 23 Mar 2021 12:12:42 +0100
Subject: [PATCH 1/2] replaces #3529, adds a footer to admin pages (can be
 deactivated in settings)

---
 .../src/main/resources/catalog/style/gn.less  |  1 +
 .../resources/catalog/templates/footer.html   | 21 ++++++++++++++++---
 .../views/default/less/gn_admin_default.less  |  3 ++-
 web/src/main/webapp/xslt/base-layout.xsl      |  7 +++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/web-ui/src/main/resources/catalog/style/gn.less b/web-ui/src/main/resources/catalog/style/gn.less
index d9f42ddad28..4693129606e 100644
--- a/web-ui/src/main/resources/catalog/style/gn.less
+++ b/web-ui/src/main/resources/catalog/style/gn.less
@@ -145,6 +145,7 @@ div[gn-transfer-ownership] * .list-group {
   .gn-editor-container, .gn-batch-editor, #gn-directory-container,
   #gn-new-metadata-container, #gn-import-container {
     padding-top: 70px;
+    padding-bottom: 50px;
   }
 }
 
diff --git a/web-ui/src/main/resources/catalog/templates/footer.html b/web-ui/src/main/resources/catalog/templates/footer.html
index 560ee486bff..60aeedb8075 100644
--- a/web-ui/src/main/resources/catalog/templates/footer.html
+++ b/web-ui/src/main/resources/catalog/templates/footer.html
@@ -1,3 +1,18 @@
-<div class="footer">
-  <p data-translate>poweredBy</p>
-</div>
+<ul class="nav navbar-nav">
+    <li class="navbar-text">
+      <span data-translate=""
+            data-translate-values="{platform: '{{info['system/platform/name']}}', version: '{{info['system/platform/version']}}', subversion: '{{info['system/platform/subVersion']}}'}">
+        versionDetails</span>
+    </li>
+    <li><a href="http://geonetwork-opensource.org/">
+      <span data-translate="">about</span></a>
+    </li>
+    <li class="hidden-sm"><a href="https://github.com/geonetwork/core-geonetwork">
+      <i class="fa fa-fw fa-github"></i>
+      <span data-translate="">github</span></a></li>
+    <li>
+      <a href="../../doc/api" title="{{'learnTheApi' | translate}}">API</a>
+    </li>
+    <li gn-static-pages-list-viewer data-section="footer" data-language="{{lang}}" />
+ </ul>
+  
\ No newline at end of file
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
index a9bbab50f57..453a25d693b 100644
--- 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
@@ -199,7 +199,8 @@ ul.gn-resultview li.list-group-item {
     }
     .main {
       margin-left: @gn-sidebar-width;
-      padding: 25px 10px 50px 10px;
+      padding: 25px 10px 10px 10px;
+      margin-bottom: @gn-bottombar-height;
       @media (max-width: @screen-xs-max) {
         margin-left: 0;
       }
diff --git a/web/src/main/webapp/xslt/base-layout.xsl b/web/src/main/webapp/xslt/base-layout.xsl
index bff95ce612f..ad5b2b9d341 100644
--- a/web/src/main/webapp/xslt/base-layout.xsl
+++ b/web/src/main/webapp/xslt/base-layout.xsl
@@ -97,6 +97,13 @@
 
             <xsl:apply-templates mode="content" select="."/>
 
+            <xsl:if test="$angularApp != 'gn_search' and $angularApp != 'gn_viewer' and $angularApp != 'gn_formatter_viewer'">
+              <div class="navbar gn-bottom-bar"
+                   role="navigation"
+                   data-ng-hide="layout.hideTopToolBar"
+                   data-ng-include="'{$uiResourcesPath}templates/footer.html'"></div>
+            </xsl:if>
+
             <xsl:if test="$isJsEnabled">
               <xsl:call-template name="javascript-load"/>
             </xsl:if>

From 7190f4a9584b2e2a019e0cd1354db7f27d90cd7e Mon Sep 17 00:00:00 2001
From: Paul <paul.vangenuchten@geocat.net>
Date: Mon, 10 May 2021 23:12:29 +0200
Subject: [PATCH 2/2] fix suggested by michel

---
 .../resources/catalog/views/default/less/gn_login_default.less   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_login_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_login_default.less
index b3e5c190619..740ae564f44 100644
--- a/web-ui/src/main/resources/catalog/views/default/less/gn_login_default.less
+++ b/web-ui/src/main/resources/catalog/views/default/less/gn_login_default.less
@@ -1,5 +1,6 @@
 @import "../../../style/gn_login";
 @import "gn_view.less";
+@import "gn_footer_default.less";
 // alert messages
 @import "gn_alerts_default.less";
 // variables for manipulating the theme