From 33a580532cc5e5843975e6acf16936a428a36af3 Mon Sep 17 00:00:00 2001 From: "Goulven.Furet" Date: Mon, 27 Nov 2023 02:49:53 +0100 Subject: [PATCH] navbar integration --- .../resources/i18n/messages_fr.properties | 11 ++ .../resources/templates/compensation.html | 2 +- ui/src/main/resources/templates/contact.html | 2 +- ui/src/main/resources/templates/ecoscore.html | 2 +- ui/src/main/resources/templates/faq.html | 10 +- .../resources/templates/inc/navbar-home.html | 22 +--- .../resources/templates/inc/navbar-logo.html | 11 ++ .../templates/inc/navbar-mantras.html | 16 ++- .../resources/templates/inc/navbar-page.html | 24 ++++ .../templates/inc/navbar-product.html | 119 ++++++++++++++++++ ui/src/main/resources/templates/opendata.html | 3 +- .../main/resources/templates/partenaires.html | 3 +- ui/src/main/resources/templates/product.html | 2 +- ui/src/main/resources/templates/search.html | 3 +- 14 files changed, 192 insertions(+), 38 deletions(-) create mode 100644 ui/src/main/resources/templates/inc/navbar-logo.html create mode 100644 ui/src/main/resources/templates/inc/navbar-page.html create mode 100644 ui/src/main/resources/templates/inc/navbar-product.html diff --git a/ui/src/main/resources/i18n/messages_fr.properties b/ui/src/main/resources/i18n/messages_fr.properties index 004ffac1a..08348c2f1 100644 --- 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 index d8ca93a27..6811906e9 100644 --- a/ui/src/main/resources/templates/compensation.html +++ b/ui/src/main/resources/templates/compensation.html @@ -30,7 +30,7 @@ - + diff --git a/ui/src/main/resources/templates/contact.html b/ui/src/main/resources/templates/contact.html index fa2bc4a77..8a7d969b2 100644 --- a/ui/src/main/resources/templates/contact.html +++ b/ui/src/main/resources/templates/contact.html @@ -30,7 +30,7 @@ - + diff --git a/ui/src/main/resources/templates/ecoscore.html b/ui/src/main/resources/templates/ecoscore.html index d6f15f6cf..4bf5ba83f 100644 --- a/ui/src/main/resources/templates/ecoscore.html +++ b/ui/src/main/resources/templates/ecoscore.html @@ -30,7 +30,7 @@ - + diff --git a/ui/src/main/resources/templates/faq.html b/ui/src/main/resources/templates/faq.html index 41a636616..95cef6ef3 100644 --- a/ui/src/main/resources/templates/faq.html +++ b/ui/src/main/resources/templates/faq.html @@ -30,11 +30,11 @@
- - - + + + + +
diff --git a/ui/src/main/resources/templates/inc/navbar-home.html b/ui/src/main/resources/templates/inc/navbar-home.html index 9e536356e..d0f2dd52c 100644 --- a/ui/src/main/resources/templates/inc/navbar-home.html +++ b/ui/src/main/resources/templates/inc/navbar-home.html @@ -1,26 +1,14 @@ \ No newline at end of file diff --git a/ui/src/main/resources/templates/inc/navbar-logo.html b/ui/src/main/resources/templates/inc/navbar-logo.html new file mode 100644 index 000000000..73d92c955 --- /dev/null +++ b/ui/src/main/resources/templates/inc/navbar-logo.html @@ -0,0 +1,11 @@ +
+
+
+ +
+
+ +
+
+
+ diff --git a/ui/src/main/resources/templates/inc/navbar-mantras.html b/ui/src/main/resources/templates/inc/navbar-mantras.html index 3ce4e92b2..2d61cbf80 100644 --- a/ui/src/main/resources/templates/inc/navbar-mantras.html +++ b/ui/src/main/resources/templates/inc/navbar-mantras.html @@ -1,14 +1,12 @@ \ No newline at end of file diff --git a/ui/src/main/resources/templates/inc/navbar-page.html b/ui/src/main/resources/templates/inc/navbar-page.html new file mode 100644 index 000000000..e3679c4c8 --- /dev/null +++ b/ui/src/main/resources/templates/inc/navbar-page.html @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/ui/src/main/resources/templates/inc/navbar-product.html b/ui/src/main/resources/templates/inc/navbar-product.html new file mode 100644 index 000000000..c12e8b7a5 --- /dev/null +++ b/ui/src/main/resources/templates/inc/navbar-product.html @@ -0,0 +1,119 @@ + \ No newline at end of file diff --git a/ui/src/main/resources/templates/opendata.html b/ui/src/main/resources/templates/opendata.html index 700de06b9..30f535973 100644 --- a/ui/src/main/resources/templates/opendata.html +++ b/ui/src/main/resources/templates/opendata.html @@ -29,7 +29,8 @@ - + + diff --git a/ui/src/main/resources/templates/partenaires.html b/ui/src/main/resources/templates/partenaires.html index 8c2cda49b..f583345ee 100644 --- a/ui/src/main/resources/templates/partenaires.html +++ b/ui/src/main/resources/templates/partenaires.html @@ -30,7 +30,8 @@ - + + diff --git a/ui/src/main/resources/templates/product.html b/ui/src/main/resources/templates/product.html index 1e14f89cd..ab0d1f66c 100644 --- a/ui/src/main/resources/templates/product.html +++ b/ui/src/main/resources/templates/product.html @@ -40,7 +40,7 @@ - + diff --git a/ui/src/main/resources/templates/search.html b/ui/src/main/resources/templates/search.html index 11c0c49ec..af3601239 100644 --- a/ui/src/main/resources/templates/search.html +++ b/ui/src/main/resources/templates/search.html @@ -30,7 +30,8 @@ - + +