fix: additives table + clean HTML to remove some validation errors (#…

…11093) - fixes #11060 (missing declaration of extra column for additives) - removes an extra </ul> in pagination - removes some HTML errors - moves Matomo script in the body instead of the head as it contains a noscript tag with an image for users that don't have JS
openfoodfacts · Dec 9, 2024 · 474f68d · 474f68d
1 parent 82726d5
commit 474f68d
Show file tree

Hide file tree

Showing 58 changed files with 519 additions and 447 deletions.
diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -2596,6 +2596,11 @@ HTML
 			$extra_column_searchable .= ', {"searchable": false}';
 		}
 
+		# additive table has an extra column for risks
+		if ($tagtype eq 'additives') {
+			$extra_column_searchable .= ', {"searchable": false}';
+		}
+
 		$request_ref->{initjs} .= <<JS
 let oTable = \$('#tagstable').DataTable({
 	language: {
@@ -5875,7 +5880,6 @@ facets.
 
 sub display_pagination ($request_ref, $count, $limit, $page) {
 
-	my $html = '';
 	my $html_pages = '';
 
 	$log->debug("PAGINATION: START\n", {count => $count, limit => $limit, page => $page}) if $log->is_debug();
@@ -5982,29 +5986,7 @@ sub display_pagination ($request_ref, $count, $limit, $page) {
 			. "</ul>\n";
 	}
 
-	# Close the list
-
-	if (defined single_param("jqm")) {
-		if (defined $next_page_url) {
-			my $loadmore = lang("loadmore");
-			$html .= <<HTML
-<li id="loadmore" style="text-align:center"><a href="${formatted_subdomain}/${next_page_url}&jqm_loadmore=1" id="loadmorelink">$loadmore</a></li>
-HTML
-				;
-		}
-		else {
-			$html .= '<br><br>';
-		}
-	}
-
-	if (not defined $request_ref->{jqm_loadmore}) {
-		$html .= "</ul>\n";
-	}
-
-	if (not defined single_param("jqm")) {
-		$html .= $html_pages;
-	}
-	return $html;
+	return $html_pages;
 }
 
 sub search_and_export_products ($request_ref, $query_ref, $sort_by) {

diff --git a/templates/web/common/includes/donate_banner.tt.html b/templates/web/common/includes/donate_banner.tt.html
@@ -13,8 +13,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="https://world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -117,8 +117,8 @@ <h3 class="donation-banner__main-title">[% lang("donation_title_2024") %]</h3>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="https://world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
@@ -26,9 +26,11 @@
         [% lang("css") %]
         [% styles %]
     </style>
-    [% analytics %]
 </head>
 <body[% bodyabout %] class="[% page_type %]_page">
+
+	[% analytics %]
+
 	<div class="skip"><a href="#content" tabindex="0">[% lang('skip_to_content') %]</a></div>
 
 	<div id="page">

diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html
@@ -35,7 +35,10 @@
 
 
     </style>
-    <!-- Matomo -->
+</head>
+<body class="error_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -58,8 +61,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body class="error_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Skip to Content</a></div>
 
 	<div id="page">
@@ -252,8 +254,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -404,8 +406,8 @@ <h1 class="if-empty-dnone">Error</h1>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/...ation/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html b/...ation/expected_test_results/api_v2_product_write/post-product-auth-bad-user-password.html
@@ -35,7 +35,10 @@
 
 
     </style>
-    <!-- Matomo -->
+</head>
+<body class="error_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -58,8 +61,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body class="error_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Aller au contenu</a></div>
 
 	<div id="page">
@@ -252,8 +254,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -404,8 +406,8 @@ <h1 class="if-empty-dnone">Erreur</h1>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/tests/integration/expected_test_results/page_crawler/crawler-access-category-facet-page.html b/tests/integration/expected_test_results/page_crawler/crawler-access-category-facet-page.html
@@ -37,7 +37,10 @@
 .show-when-logged-in {display:none}
 
     </style>
-    <!-- Matomo -->
+</head>
+<body class="products_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -60,8 +63,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body class="products_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Skip to Content</a></div>
 
 	<div id="page">
@@ -254,8 +256,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -492,8 +494,7 @@ <h1 itemprop="name">Hazelnut spreads</h1>
   </div>
 
 
-	</ul>
-
+
   </div>
 </div>
 
@@ -557,8 +558,8 @@ <h1 itemprop="name">Hazelnut spreads</h1>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html b/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
@@ -48,7 +48,10 @@
 .show-when-logged-in {display:none}
 
     </style>
-    <!-- Matomo -->
+</head>
+<body about="/product/0200000000235/only-product-nutella" typeof="food:foodProduct" class="product_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -71,8 +74,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body about="/product/0200000000235/only-product-nutella" typeof="food:foodProduct" class="product_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Skip to Content</a></div>
 
 	<div id="page">
@@ -265,8 +267,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -3665,8 +3667,8 @@ <h2 id="data_sources" class="text-medium">Data sources</h2>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/...ation/expected_test_results/page_crawler/crawler-does-not-get-facet-knowledge-panels.html b/...ation/expected_test_results/page_crawler/crawler-does-not-get-facet-knowledge-panels.html
@@ -37,7 +37,10 @@
 .show-when-logged-in {display:none}
 
     </style>
-    <!-- Matomo -->
+</head>
+<body class="products_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -60,8 +63,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body class="products_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Skip to Content</a></div>
 
 	<div id="page">
@@ -254,8 +256,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -556,8 +558,7 @@ <h1 itemprop="name">Cakes</h1>
   </div>
 
 
-	</ul>
-
+
   </div>
 </div>
 
@@ -621,8 +622,8 @@ <h1 itemprop="name">Cakes</h1>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />

diff --git a/...ntegration/expected_test_results/page_crawler/normal-user-access-category-facet-page.html b/...ntegration/expected_test_results/page_crawler/normal-user-access-category-facet-page.html
@@ -37,7 +37,10 @@
 .show-when-logged-in {display:none}
 
     </style>
-    <!-- Matomo -->
+</head>
+<body class="products_page">
+
+	<!-- Matomo -->
 <script>
   var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -60,8 +63,7 @@
 <!-- End Matomo Code -->
 
 
-</head>
-<body class="products_page">
+
 	<div class="skip"><a href="#content" tabindex="0">Skip to Content</a></div>
 
 	<div id="page">
@@ -254,8 +256,8 @@
     <div class="donation-banner__aside">
       <div class="donation-banner__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />
@@ -533,8 +535,7 @@ <h2 id="facet_panels_title"></h2>
   </div>
 
 
-	</ul>
-
+
   </div>
 </div>
 
@@ -598,8 +599,8 @@ <h2 id="facet_panels_title"></h2>
     <div>
       <div class="donation-banner-footer__main-section">
         <img
-          width="50px"
-          height="50px"
+          width="50"
+          height="50"
           src="//world.openfoodfacts.org/images/logos/logo-variants/CMJN-ICON_WHITE_BG_OFF.svg"
           alt="open food facts logo"
         />