navbar integration

open4good · Nov 27, 2023 · 33a5805 · 33a5805
1 parent 56b463f
commit 33a5805
Show file tree

Hide file tree

Showing 14 changed files with 192 additions and 38 deletions.
diff --git a/ui/src/main/resources/i18n/messages_fr.properties b/ui/src/main/resources/i18n/messages_fr.properties
@@ -1,4 +1,15 @@
 
+page.breadcrump.ecoscore = \u00E9co-score
+page.breadcrump.search = recherche
+page.breadcrump.contact = contact
+page.breadcrump.compensation = compensation \u00E9cologique
+page.breadcrump.faq = faq
+page.breadcrump.opendata = opendata
+page.breadcrump.partenaires = partenaires
+
+
+
+
 aria.navigation.primary = Navigation principale
 
 attribute.sourcing.conflict = {1} conflits

diff --git a/ui/src/main/resources/templates/compensation.html b/ui/src/main/resources/templates/compensation.html
@@ -30,7 +30,7 @@
 
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'compensation'" th:insert="~{inc/navbar-page.html}"></th:block>
     <!--/* Loader */-->
     <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/contact.html b/ui/src/main/resources/templates/contact.html
@@ -30,7 +30,7 @@
 <body>
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'contact'" th:insert="~{inc/navbar-page.html}"></th:block>
     <!--/* Loader */-->
     <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/ecoscore.html b/ui/src/main/resources/templates/ecoscore.html
@@ -30,7 +30,7 @@
 
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'ecoscore'" th:insert="~{inc/navbar-page.html}"></th:block>
   <!--/* Loader */-->
   <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/faq.html b/ui/src/main/resources/templates/faq.html
@@ -30,11 +30,11 @@
 
 	<!--/* Navbar */-->
 	<header class="header-global">
-    	<nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-dark navbar-theme-primary">
-			<th:block th:insert="inc/navbar-non-product.html"></th:block>
-		</nav>
-       <!--/* Loader */-->
-       <th:block th:insert="inc/preloader.html"></th:block>
+	<!--/* Navbar */-->
+	<th:block th:with="page = 'faq'" th:insert="~{inc/navbar-page.html}"></th:block>
+
+    <!--/* Loader */-->
+    <th:block th:insert="inc/preloader.html"></th:block>
 	</header>
 
     <main>	

diff --git a/ui/src/main/resources/templates/inc/navbar-home.html b/ui/src/main/resources/templates/inc/navbar-home.html
@@ -1,26 +1,14 @@
 <nav class="navbar navbar-expand-lg navbar-transparent navbar-light navbar-theme-soft">
     <div class="container container-semi-fluid position-relative">
         <a class="navbar-brand me-lg-5" href="/"><img height="35" src="/assets/img/nudger-logo-small.png"></a>
+
         <div class="navbar-collapse collapse me-auto" id="navbar_global">
-            <div class="navbar-collapse-header">
-                <div class="row">
-                    <div class="col-6 collapse-brand">
-                        <a href="/"><img height="35" src="/assets/img/nudger-logo-small.png"></a>
-                    </div>
-                    <div class="col-6 collapse-close">
-                        <a href="#navbar_global" class="fas fa-times" data-bs-toggle="collapse" data-bs-target="#navbar_global" aria-controls="navbar_global" aria-expanded="false" title="close" aria-label="Toggle navigation"></a>
-                    </div>
-                </div>
-            </div>            
-        </div>
+	 		<!--/* Navbar mantras*/-->
+			<th:block th:insert="~{inc/navbar-logo.html}"></th:block>
+		</div>
 
-
  		<!--/* Navbar mantras*/-->
-		<th:block th:insert="~{inc/navbar-mantras.html}"></th:block>
-
-
-		<!--/* Navbar mantras*/-->
-		<th:block th:insert="~{inc/navbar-search.html}"></th:block> 
+		<th:block th:insert="~{inc/navbar-mantras.html}"></th:block>        
 
     </div>
 </nav>
diff --git a/ui/src/main/resources/templates/inc/navbar-logo.html b/ui/src/main/resources/templates/inc/navbar-logo.html
@@ -0,0 +1,11 @@
+            <div class="navbar-collapse-header">
+                <div class="row">
+                    <div class="col-6 collapse-brand">
+                        <a href="/"><img height="35" src="/assets/img/nudger-logo-small.png"></a>
+                    </div>
+                    <div class="col-6 collapse-close">
+                        <a href="#navbar_global" class="fas fa-times" data-bs-toggle="collapse" data-bs-target="#navbar_global" aria-controls="navbar_global" aria-expanded="false" title="close" aria-label="Toggle navigation"></a>
+                    </div>
+                </div>
+            </div>       
+
diff --git a/ui/src/main/resources/templates/inc/navbar-mantras.html b/ui/src/main/resources/templates/inc/navbar-mantras.html
@@ -1,14 +1,12 @@
 <ul class="navbar-nav navbar-nav-hover align-items-lg-center">
 			<li class="nav-item dropdown ">
-                  <a href="#" class="nav-link dropdown-toggle" id="dashboardDropdown" aria-expanded="false" data-bs-toggle="dropdown">Nos mantras <span class="fas fa-angle-down nav-link-arrow ms-1"></span></a>
-                  <div class="dropdown-menu dropdown-megamenu-sm px-0 py-2 p-lg-4" aria-labelledby="dashboardDropdown">
-
-                              <ul class="list-style-none mb-4">
-                                  <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/ecoscore">Evaluation écologique : eco-score</a></li>
-                                  <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/compensation-ecologique">Compensation environnementale</a></li>
-                                  <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/data-responsable">Data Responsable</a></li>
-                              </ul>
-
+                  <a href="#" class="nav-link dropdown-toggle" id="mantrasDropdown" aria-expanded="false" data-bs-toggle="dropdown">Nos mantras <span class="fas fa-angle-down nav-link-arrow ms-1"></span></a>
+                  <div class="dropdown-menu dropdown-megamenu-sm px-0 py-2 p-lg-4" aria-labelledby="mantrasDropdown">
+	                      <ul class="list-style-none">
+	                          <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/ecoscore">Evaluation écologique : eco-score</a></li>
+	                          <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/compensation-ecologique">Compensation environnementale</a></li>
+	                          <li class="mb-2 megamenu-item"><a class="megamenu-link" href="/opendata">Numérique Responsable</a></li>
+	                      </ul>                 
                   </div>
               </li>
 </ul>
diff --git a/ui/src/main/resources/templates/inc/navbar-page.html b/ui/src/main/resources/templates/inc/navbar-page.html
@@ -0,0 +1,24 @@
+<nav class="navbar navbar-expand-lg navbar-transparent navbar-light navbar-theme-soft">
+    <div class="container container-semi-fluid position-relative">
+        <a class="navbar-brand me-lg-5" href="/"><img height="35" src="/assets/img/nudger-logo-small.png"></a>
+
+        <div class="navbar-collapse collapse me-auto" id="navbar_global">
+	 		<!--/* Navbar mantras*/-->
+			<th:block th:insert="~{inc/navbar-logo.html}"></th:block>
+
+			<span> » </span>
+			<span class="ms-2" > 
+				<a href="${url}" th:text="#{'page.breadcrump.'+${page}}"></a> 
+			</span>
+		</div>
+
+
+ 		<!--/* Navbar mantras*/-->
+		<th:block th:insert="~{inc/navbar-mantras.html}"></th:block>
+
+
+		<!--/* Navbar search*/-->
+		<th:block th:insert="~{inc/navbar-search.html}"></th:block> 
+
+    </div>
+</nav>
diff --git a/ui/src/main/resources/templates/inc/navbar-product.html b/ui/src/main/resources/templates/inc/navbar-product.html
@@ -0,0 +1,119 @@
+<nav class="navbar navbar-expand-lg navbar-transparent navbar-light navbar-theme-soft">
+    <div class="container container-semi-fluid position-relative">
+        <a class="navbar-brand me-lg-5" href="/"><img height="35" src="/assets/img/nudger-logo-small.png"></a>
+
+        <div class="navbar-collapse collapse me-auto" id="navbar_global">
+	 		<!--/* Navbar mantras*/-->
+			<th:block th:insert="~{inc/navbar-logo.html}"></th:block>
+
+			<ul class="navbar-nav navbar-nav-hover align-items-lg-center">
+
+               <li class="nav-item ">
+                	<span> » </span>    
+                </li>
+
+                <li class="nav-item dropdown">
+                    <a href="#" class="nav-link dropdown-toggle" id="productsUniverse" aria-expanded="false" data-bs-toggle="dropdown">téléviseurs <span class="fas fa-angle-down nav-link-arrow ms-1"></span></a>
+                    <div class="dropdown-menu dropdown-megamenu px-0 py-2 p-lg-4" aria-labelledby="productsUniverse">
+                        <div class="row">
+                            <div class="col-6 col-lg-4">
+                                <h6 class="d-block mb-3 text-primary">Le salon</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/about.html">TV's</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/pricing.html">Amplificateurs</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/team.html">Canapés</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/services.html">Services</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/profile.html">Profile</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/contact.html">Contact</a></li>
+                                </ul>
+                                <h6 class="d-block text-primary">L'électroménager</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/legal.html">Legal center</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/terms.html">Terms &amp; agreement</a></li>
+                                </ul>
+                                <h6 class="d-block text-primary">La chambre</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/careers.html">Careers</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/career-single.html">Career Single</a></li>
+                                </ul>
+                            </div>
+                            <div class="col-6 col-lg-4">
+                                <h6 class="d-block mb-3 text-primary">L'informatique</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/landing-app.html">App</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/landing-crypto.html">Crypto</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/landing-freelancer.html">Freelancer</a></li>
+                                </ul>
+                                <h6 class="d-block mb-3 text-primary">Les livres</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/support.html">Support center</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/support-topic.html">Support topic</a></li>
+                                </ul>
+                                <h6 class="d-block mb-3 text-primary">Les meubles</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/blog.html">Blog</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/blog-post.html">Blog post</a></li>
+                                </ul>
+                            </div>
+                            <div class="col-6 col-lg-4">
+                                <h6 class="d-block mb-3 text-primary">User</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/sign-in.html">Sign in</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/sign-up.html">Sign up</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/forgot-password.html">Forgot password</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/reset-password.html">Reset password</a></li>
+                                </ul>
+                                <h6 class="d-block mb-3 text-primary">Special</h6>
+                                <ul class="list-style-none mb-4">
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/404.html">404 Not Found</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/500.html">500 Server Error</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/maintenance.html">Maintenance</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/coming-soon.html">Coming soon</a></li>
+                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/blank.html">Blank page</a></li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li class="nav-item ">
+                	<span> » </span>    
+                </li>
+
+
+
+
+                <li class="nav-item dropdown">
+                    <a href="${url}" th:text="${product.brandAndModel()}" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" id="supportDropdown" aria-expanded="false"> <span class="fas fa-angle-down nav-link-arrow ms-1"></span></a>
+                    <div class="dropdown-menu dropdown-megamenu px-0 py-2 p-lg-4" aria-labelledby="frontPagesDropdown">
+                        <div class="row">
+                            <div class="">
+			                          <ul class="list-style-none mb-4">
+			                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/about.html">Ecoscore et compensation environnementale</a></li>
+			                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/pricing.html">Informations produit</a></li>
+			                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/profile.html">Prix neufs et occasions</a></li>
+			                                    <li class="mb-2 megamenu-item"><a class="megamenu-link" href="./html/pages/contact.html">Caracteristiques techniques</a></li>
+			                          </ul>
+
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+
+
+
+
+            </ul>
+		</div>
+
+
+ 		<!--/* Navbar mantras*/-->
+		<th:block th:insert="~{inc/navbar-mantras.html}"></th:block>
+
+
+		<!--/* Navbar search*/-->
+		<th:block th:insert="~{inc/navbar-search.html}"></th:block> 
+
+    </div>
+</nav>
diff --git a/ui/src/main/resources/templates/opendata.html b/ui/src/main/resources/templates/opendata.html
@@ -29,7 +29,8 @@
 <body>
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'opendata'" th:insert="~{inc/navbar-page.html}"></th:block>
+
     <!--/* Loader */-->
     <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/partenaires.html b/ui/src/main/resources/templates/partenaires.html
@@ -30,7 +30,8 @@
 <body>
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'partenaires'" th:insert="~{inc/navbar-page.html}"></th:block>
+
     <!--/* Loader */-->
     <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/product.html b/ui/src/main/resources/templates/product.html
@@ -40,7 +40,7 @@
 
 
 <!--/* Navbar */-->
-<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+<th:block th:insert="~{inc/navbar-product.html}"></th:block>
 <!--/* Loader */-->
 <th:block th:insert="~{inc/preloader.html}"></th:block>
 

diff --git a/ui/src/main/resources/templates/search.html b/ui/src/main/resources/templates/search.html
@@ -30,7 +30,8 @@
 <body>
 
 	<!--/* Navbar */-->
-	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+	<th:block th:with="page = 'search'" th:insert="~{inc/navbar-page.html}"></th:block>
+
     <!--/* Loader */-->
     <th:block th:insert="~{inc/preloader.html}"></th:block>