From b05fa8f0f685485438f3c18cc400f6e2eeead88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Thu, 12 Jan 2023 15:40:04 +0100
Subject: [PATCH 1/2] Improved a11y for ps-emailsubscription templates

---
 .../views/templates/hook/ps_emailsubscription-column.tpl        | 1 +
 .../views/templates/hook/ps_emailsubscription.tpl               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
index d2a9b854b..678132609 100644
--- a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
+++ b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
@@ -20,6 +20,7 @@
           value="{$value}"
           placeholder="{l s='Your email address' d='Shop.Forms.Labels'}"
           aria-labelledby="block-newsletter-label"
+          required
         >
       </div>
       <input type="hidden" name="blockHookName" value="{$hookName}" />
diff --git a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
index 11561f371..c9d3f25b7 100644
--- a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
+++ b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
@@ -9,7 +9,7 @@
   <div class="container px-1">
     <div class="{$componentName}__content row">
       <div class="{$componentName}__content__left col-md-5">
-        <p class="{$componentName}__label">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
+        <p id="block-newsletter-label" class="{$componentName}__label">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
       </div>
 
       <div class="{$componentName}__content__right col-md-7">

From 1d3fe4905a2c09ff47e8361044e05c4a3c8fa310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Fri, 17 Feb 2023 14:05:35 +0100
Subject: [PATCH 2/2] Added hookname to have uniq id

---
 .../views/templates/hook/ps_emailsubscription-column.tpl      | 4 ++--
 .../views/templates/hook/ps_emailsubscription.tpl             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
index 678132609..e29235d7d 100644
--- a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
+++ b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
@@ -5,7 +5,7 @@
 
 <div class="block_newsletter" id="blockEmailSubscription_{$hookName}">
   <form action="{$urls.current_url}#blockEmailSubscription_{$hookName}" method="post">
-    <p id="block-newsletter-label">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
+    <p id="block-newsletter-label-{$hookName}">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
     <div class="mb-1">
       <input
         class="btn btn-primary float-end"
@@ -19,7 +19,7 @@
           type="email"
           value="{$value}"
           placeholder="{l s='Your email address' d='Shop.Forms.Labels'}"
-          aria-labelledby="block-newsletter-label"
+          aria-labelledby="block-newsletter-label-{$hookName}"
           required
         >
       </div>
diff --git a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
index c9d3f25b7..2f23b2f29 100644
--- a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
+++ b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl
@@ -9,7 +9,7 @@
   <div class="container px-1">
     <div class="{$componentName}__content row">
       <div class="{$componentName}__content__left col-md-5">
-        <p id="block-newsletter-label" class="{$componentName}__label">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
+        <p id="block-newsletter-label-{$hookName}" class="{$componentName}__label">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
       </div>
 
       <div class="{$componentName}__content__right col-md-7">
@@ -21,7 +21,7 @@
               class="form-control"
               value="{$value}"
               placeholder="{l s='Your email address' d='Shop.Forms.Labels'}"
-              aria-labelledby="block-newsletter-label"
+              aria-labelledby="block-newsletter-label-{$hookName}"
               required
            >