From 7a33f0df6274ee054a83954049a7151463104518 Mon Sep 17 00:00:00 2001
From: Erik Bruchez <ebruchez@orbeon.com>
Date: Tue, 27 Sep 2022 18:31:05 -0700
Subject: [PATCH] For #1670: configurable navbar

---
 .../apps/fr/style/form-runner-bootstrap5-override.less       | 5 +++++
 .../src/main/assets/apps/fr/style/form-runner-landing.less   | 4 ----
 .../jvm/src/main/resources/apps/fr/components/view.xsl       | 4 ++--
 .../jvm/src/main/resources/apps/fr/landing/landing.xhtml     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-bootstrap5-override.less b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-bootstrap5-override.less
index 2baf357e3c..c31a730530 100644
--- a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-bootstrap5-override.less
+++ b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-bootstrap5-override.less
@@ -97,6 +97,11 @@
 }
 
 .orbeon {
+
+  body& {
+    padding-top: 52px;
+  }
+
   // Use `.btn-link` instead of `.xforms-trigger` to catch cases where used directly in an `<xf:button>`
   .btn-link .fa {
     color: @textColor;
diff --git a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-landing.less b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-landing.less
index dc1056b401..d19e9af5c9 100644
--- a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-landing.less
+++ b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-landing.less
@@ -16,10 +16,6 @@ html {
     font-size: 13px; // Bootstrap 5 keeps the 16px browser default
 }
 
-body.orbeon {
-    padding-top: 52px;
-}
-
 .orbeon {
     .card-footer .xforms-label {
         margin-right: .2rem;
diff --git a/form-runner/jvm/src/main/resources/apps/fr/components/view.xsl b/form-runner/jvm/src/main/resources/apps/fr/components/view.xsl
index 24acc10283..4ec1390f8f 100644
--- a/form-runner/jvm/src/main/resources/apps/fr/components/view.xsl
+++ b/form-runner/jvm/src/main/resources/apps/fr/components/view.xsl
@@ -463,7 +463,7 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="fr:navbar" name="fr-navbar">
+    <xsl:template match="fr:navbar[not($bs5)]" name="fr-navbar">
         <xf:group
                 xxf:element="div"
                 model="fr-form-model"
@@ -491,7 +491,7 @@
         </xf:group>
     </xsl:template>
 
-    <xsl:template match="fr:navbar5" name="fr-navbar5">
+    <xsl:template match="fr:navbar[$bs5]" name="fr-navbar5">
         <xf:group
             xxf:element="nav"
             model="fr-form-model"
diff --git a/form-runner/jvm/src/main/resources/apps/fr/landing/landing.xhtml b/form-runner/jvm/src/main/resources/apps/fr/landing/landing.xhtml
index d013bb0bd9..4dde8bf0ff 100644
--- a/form-runner/jvm/src/main/resources/apps/fr/landing/landing.xhtml
+++ b/form-runner/jvm/src/main/resources/apps/fr/landing/landing.xhtml
@@ -116,7 +116,7 @@
     </xh:head>
     <xh:body>
         <fr:view fluid="true">
-            <fr:navbar5/>
+            <fr:navbar/>
             <xh:div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xxl-4 gx-2 gy-2">
 
                 <xh:div class="p-2 {'xforms-hidden'[not($cards-tokens = 'quick-links')]}">