From 5a75a120880e2304fa346424d277a847e4e0d8ee Mon Sep 17 00:00:00 2001
From: Areeb Ahmed <135235925+areebahmeddd@users.noreply.github.com>
Date: Mon, 16 Dec 2024 08:16:17 +0530
Subject: [PATCH 1/4] Update Twitter logo to X logo in the footer

---
 templates/web/common/site_layout.tt.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
index 954a885d12eee..c2061a27d76a3 100644
--- a/templates/web/common/site_layout.tt.html
+++ b/templates/web/common/site_layout.tt.html
@@ -367,9 +367,9 @@ <h3 class="title-5 text-medium">[% lang('footer_join_the_community') %]</h3>
 						<p>[% f_lang('f_join_us_on_slack', { url => "https://slack.openfoodfacts.org" } ) %]</p>
 						<p><a href="https://forum.openfoodfacts.org/">Forum</a></p>
 						<p id="footer_social_icons">[% f_lang('f_footer_follow_us_links', { links => '
-							<a href="https://twitter.com/' _ twitter_account _ '"><img src="/images/icons/dist/twitter.svg" class="footer_social_icon" alt="Twitter"></a>
-							<a href="' _ facebook_page_url _ '"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
-							<a href="https://www.instagram.com/open.food.facts/"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
+							<a href="https://x.com/OpenFoodFacts"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
+							<a href="https://facebook.com/OpenFoodFacts"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
+							<a href="https://instagram.com/open.food.facts"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
 							'
 							})
 							%]

From 3bf3479b8339c3488eaf72b369e2b880ddd22b69 Mon Sep 17 00:00:00 2001
From: Areeb Ahmed <135235925+areebahmeddd@users.noreply.github.com>
Date: Mon, 23 Dec 2024 01:40:18 +0530
Subject: [PATCH 2/4] Added icon and changes suggested

---
 icons/x.svg                              | 1 +
 templates/web/common/site_layout.tt.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 icons/x.svg

diff --git a/icons/x.svg b/icons/x.svg
new file mode 100644
index 0000000000000..98af112267baa
--- /dev/null
+++ b/icons/x.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" width="24px" height="24px" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve"><path d="M14.095479,10.316482L22.286354,1h-1.940718l-7.115352,8.087682L7.551414,1H1l8.589488,12.231093L1,23h1.940717  l7.509372-8.542861L16.448587,23H23L14.095479,10.316482z M11.436522,13.338465l-0.871624-1.218704l-6.924311-9.68815h2.981339  l5.58978,7.82155l0.867949,1.218704l7.26506,10.166271h-2.981339L11.436522,13.338465z"/></svg>
\ No newline at end of file
diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
index c2061a27d76a3..4f98a835e2377 100644
--- a/templates/web/common/site_layout.tt.html
+++ b/templates/web/common/site_layout.tt.html
@@ -367,8 +367,8 @@ <h3 class="title-5 text-medium">[% lang('footer_join_the_community') %]</h3>
 						<p>[% f_lang('f_join_us_on_slack', { url => "https://slack.openfoodfacts.org" } ) %]</p>
 						<p><a href="https://forum.openfoodfacts.org/">Forum</a></p>
 						<p id="footer_social_icons">[% f_lang('f_footer_follow_us_links', { links => '
-							<a href="https://x.com/OpenFoodFacts"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
-							<a href="https://facebook.com/OpenFoodFacts"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
+							<a href="https://x.com/' _ twitter_account _ '"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
+							<a href="' _ facebook_page_url _ '"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
 							<a href="https://instagram.com/open.food.facts"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
 							'
 							})

From 41cf7a7701115c777db4accb70d88bdc8735c25a Mon Sep 17 00:00:00 2001
From: Areeb Ahmed <135235925+areebahmeddd@users.noreply.github.com>
Date: Sat, 4 Jan 2025 01:35:58 +0530
Subject: [PATCH 3/4] Ensure canonical url

---
 templates/web/common/site_layout.tt.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
index 4f98a835e2377..b8f79d69c3682 100644
--- a/templates/web/common/site_layout.tt.html
+++ b/templates/web/common/site_layout.tt.html
@@ -367,9 +367,9 @@ <h3 class="title-5 text-medium">[% lang('footer_join_the_community') %]</h3>
 						<p>[% f_lang('f_join_us_on_slack', { url => "https://slack.openfoodfacts.org" } ) %]</p>
 						<p><a href="https://forum.openfoodfacts.org/">Forum</a></p>
 						<p id="footer_social_icons">[% f_lang('f_footer_follow_us_links', { links => '
-							<a href="https://x.com/' _ twitter_account _ '"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
+							<a href="https://www.x.com/' _ twitter_account _ '"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
 							<a href="' _ facebook_page_url _ '"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
-							<a href="https://instagram.com/open.food.facts"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
+							<a href="https://www.instagram.com/open.food.facts/"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
 							'
 							})
 							%]

From bf973b2d04e2c70782d01393677b33b36b1f5f86 Mon Sep 17 00:00:00 2001
From: Alex Garel <alex@garel.org>
Date: Mon, 6 Jan 2025 10:46:44 +0100
Subject: [PATCH 4/4] refactor: canonical x url

---
 templates/web/common/site_layout.tt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
index b8f79d69c3682..7c49c97883d85 100644
--- a/templates/web/common/site_layout.tt.html
+++ b/templates/web/common/site_layout.tt.html
@@ -367,7 +367,7 @@ <h3 class="title-5 text-medium">[% lang('footer_join_the_community') %]</h3>
 						<p>[% f_lang('f_join_us_on_slack', { url => "https://slack.openfoodfacts.org" } ) %]</p>
 						<p><a href="https://forum.openfoodfacts.org/">Forum</a></p>
 						<p id="footer_social_icons">[% f_lang('f_footer_follow_us_links', { links => '
-							<a href="https://www.x.com/' _ twitter_account _ '"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
+							<a href="https://x.com/' _ twitter_account _ '"><img src="/images/icons/dist/x.svg" class="footer_social_icon" alt="X"></a>
 							<a href="' _ facebook_page_url _ '"><img src="/images/icons/dist/facebook.svg" class="footer_social_icon" alt="Facebook"></a>
 							<a href="https://www.instagram.com/open.food.facts/"><img src="/images/icons/dist/instagram.svg" class="footer_social_icon" alt="Instagram"></a>
 							'