From 34a4216bdf337be16f5f4330af042d9ac6adb4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Tue, 11 Oct 2022 15:54:52 +0200
Subject: [PATCH 1/5] fix: icon font #7480

---
 .../web/pages/product_edit/product_edit_form_display.tt.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/pages/product_edit/product_edit_form_display.tt.html b/templates/web/pages/product_edit/product_edit_form_display.tt.html
index c5bd7350102a9..3d632a14122a4 100644
--- a/templates/web/pages/product_edit/product_edit_form_display.tt.html
+++ b/templates/web/pages/product_edit/product_edit_form_display.tt.html
@@ -1,7 +1,7 @@
 <!-- start templates/[% template.name %] -->
 
 <a href="#upNav" class="back-to-top scrollto button">
-    <span class="material-symbols-outlined size-20 ">
+    <span class="material-icons size-20 ">
         arrow_upward
     </span>
 </a>

From d3d173e25adbcf81cdccd5c2576da579a9425482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Tue, 11 Oct 2022 16:16:18 +0200
Subject: [PATCH 2/5] fix: back button on product edit page #7478

---
 scss/_product-page.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scss/_product-page.scss b/scss/_product-page.scss
index d51ee572c6747..3ccfca7b0e8cb 100644
--- a/scss/_product-page.scss
+++ b/scss/_product-page.scss
@@ -178,6 +178,7 @@ a.active {
         border-top: 1px solid #eee; 
         z-index: 100; 
         padding: 1rem;
+	padding-bottom: 0.5rem;
         pointer-events: none;
         background-color: $primary-color;
         > div {

From c8fb864e066e2c6d83b5bb903145c9fd768adb18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Tue, 11 Oct 2022 16:57:17 +0200
Subject: [PATCH 3/5] fix: creative commons icon #7486

---
 templates/web/pages/product/product_page.tt.html | 2 +-
 templates/web/panels/panel.tt.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/pages/product/product_page.tt.html b/templates/web/pages/product/product_page.tt.html
index a5aaf72dad854..c7aecfd2b342e 100755
--- a/templates/web/pages/product/product_page.tt.html
+++ b/templates/web/pages/product/product_page.tt.html
@@ -104,7 +104,7 @@ <h1 class="title-3" property="food:name" itemprop="name">[% title %]</h1>
                     [% IF front_image %]
                         <div class="row">
                             <div class="medium-4 small-12 columns">
-                                [% INCLUDE web/panels/image.tt.html image = front_image %]
+                                [% INCLUDE web/panels/image.tt.html code = code image = front_image %]
                             </div>
                             <div class="medium-8 small-12 columns">
                     [% END %]   
diff --git a/templates/web/panels/panel.tt.html b/templates/web/panels/panel.tt.html
index 80bb9304adf4d..c22be4e898ac5 100644
--- a/templates/web/panels/panel.tt.html
+++ b/templates/web/panels/panel.tt.html
@@ -114,7 +114,7 @@ <h3 [% IF panel_group_element.panel_group_id.defined %]id="panel_group_[% panel_
                 [% IF panel_group_element.image.defined %]
                         </div>
                         <div class="large-4 small-12 columns">
-                            [% INCLUDE web/panels/image.tt.html image = panel_group_element.image %]
+                            [% INCLUDE web/panels/image.tt.html code = product.code image = panel_group_element.image %]
                         </div>
                     </div>
                 [% END %]                

From 77797eb7920c440ba21c11c614bb5d474d4598ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Tue, 11 Oct 2022 16:58:07 +0200
Subject: [PATCH 4/5] fix: cancel button on product edit form #7478

---
 .../web/pages/product_edit/product_edit_form_display.tt.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/pages/product_edit/product_edit_form_display.tt.html b/templates/web/pages/product_edit/product_edit_form_display.tt.html
index 3d632a14122a4..daab3f8931d7f 100644
--- a/templates/web/pages/product_edit/product_edit_form_display.tt.html
+++ b/templates/web/pages/product_edit/product_edit_form_display.tt.html
@@ -290,7 +290,7 @@ <h1>[% title %]</h1>
             [% IF type == 'edit' %]
 
                 <div class="row">
-                    <div class="small-12 medium-12 large-8 xlarge-8 columns">
+                    <div class="small-12 medium-12 large-8 xlarge-8 columns" style="margin-bottom:0.5rem;">
                         <input id="comment" name="comment" placeholder="[% lang('edit_comment') %]" value="" type="text" class="text" style="margin:0" />
                     </div>
                     <div class="small-6 medium-6 large-2 xlarge-2 columns">
@@ -299,7 +299,7 @@ <h1>[% title %]</h1>
                         </button>
                     </div>
                     <div class="small-6 medium-6 large-2 xlarge-2 columns">
-                        <button type="button" id="cancel" class="button postfix small secondary">
+                        <button type="button" id="back-btn" class="button postfix small secondary">
                             [% display_icon('cancel') %] [% lang('cancel') %]
                         </button>
                     </div>

From 9d507c4ced38ed5b39ded5f6e5fdd24b31f60a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Tue, 11 Oct 2022 16:58:51 +0200
Subject: [PATCH 5/5] fix: product silhouette when missing front image #7485

---
 html/js/product-search.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/html/js/product-search.js b/html/js/product-search.js
index 48bc25c47015e..d29d04f443d56 100644
--- a/html/js/product-search.js
+++ b/html/js/product-search.js
@@ -246,10 +246,12 @@ function display_products(target, product_groups, user_prefs) {
 			product_html += '<div class="list_product_content">';
             product_html += '<div class="list_product_img_div">';
 
-            const img_src =
-                product.image_front_small_url ||
-                "/images/icons/product-silhouette-transparent.svg";
-            product_html += `<img src="${img_src}" class="list_product_img">`;
+			if (product.image_front_small_url) {
+				product_html += `<img src="${product.image_front_small_url}" class="list_product_img">`;
+			}
+			else {
+				product_html += `<img src="/images/icons/dist/packaging.svg" style="filter:invert(.9)" class="list_product_img">`;
+			}
 
             product_html += "</div>";