Merge branch 'f-navbar-styling' into 'dev'

F navbar styling

See merge request !100

src/core/xsl/navbar.xsl

@@ -51,7 +51,7 @@
     <nav class="navbar navbar-expand-lg navbar-light bg-light sticky-top mb-2 flex-column" id="caosdb-navbar-full">
       <noscript>Please enable JavaScript!</noscript>
       <div class="container-fluid">
-        <a class="navbar-brand">
+        <a class="navbar-brand d-lg-none d-inline">
           <xsl:attribute name="href">
             <xsl:value-of select="$basepath"/>
           </xsl:attribute>
@@ -69,6 +69,20 @@
           <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="top-navbar">
+          <a class="navbar-brand d-none d-lg-inline">
+            <xsl:attribute name="href">
+              <xsl:value-of select="$basepath"/>
+            </xsl:attribute>
+            <xsl:element name="img">
+              <xsl:if test="'${BUILD_NAVBAR_BRAND_NAME}' != ''">
+                <xsl:attribute name="class">caosdb-logo</xsl:attribute>
+              </xsl:if>
+              <xsl:attribute name="src">
+                  <xsl:value-of select="concat($basepath,'webinterface/${BUILD_NUMBER}/${BUILD_NAVBAR_LOGO}')"/>
+              </xsl:attribute>
+            </xsl:element>
+            ${BUILD_NAVBAR_BRAND_NAME}
+          </a>
           <ul class="navbar-nav caosdb-navbar me-auto">
             <li class="nav-item dropdown" id="caosdb-navbar-entities">
               <a class="nav-link dropdown-toggle" role="button" id="navbarEntitiesMenuLink" data-bs-toggle="dropdown" aria-expanded="false" href="#">