| @@ -14,9 +14,10 @@ | ||
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | 16 | ?> |
| 17 | 17 | |
| 18 | - <table class="acym_lists"> | |
| 18 | + <div class="acym_lists__group" role="group" aria-label="<?php echo esc_attr(acym_translation('ACYM_NEWSLETTERS')); ?>"> | |
| 19 | + <table class="acym_lists" role="presentation"> | |
| 19 | 20 | <?php foreach ($visibleLists as $myListId) { ?> |
| 20 | 21 | <tr> |
| 21 | 22 | <td> |
| 22 | 23 | <input type="checkbox" |
| @@ -31,8 +32,9 @@ | ||
| 31 | 32 | </td> |
| 32 | 33 | </tr> |
| 33 | 34 | <?php } ?> |
| 34 | 35 | </table> |
| 36 | + </div> | |
| 35 | 37 | <?php |
| 36 | 38 | } |
| 37 | 39 | } |
| 38 | 40 | if ($listPosition === 'before') { |
| @@ -39,9 +41,9 @@ | ||
| 39 | 41 | acymailing_displayWidgetLists($allLists, $visibleLists, $checkedLists, $formName); |
| 40 | 42 | } |
| 41 | 43 | ?> |
| 42 | 44 | |
| 43 | -<table class="acym_form"> | |
| 45 | +<table class="acym_form" role="presentation"> | |
| 44 | 46 | <tr> |
| 45 | 47 | <?php |
| 46 | 48 | foreach ($fields as $field) { |
| 47 | 49 | $field->option = !empty($field->option) ? json_decode($field->option) : new stdClass(); |
| @@ -96,9 +98,10 @@ | ||
| 96 | 98 | } |
| 97 | 99 | |
| 98 | 100 | if (!empty($termslink)) { |
| 99 | 101 | echo '<td class="acyterms" '.($displayOutside && !$displayInline ? 'colspan="2"' : '').'>'; |
| 100 | - echo '<input id="mailingdata_terms_'.esc_attr($formName).'" class="checkbox" type="checkbox" name="terms" title="'.esc_attr( | |
| 102 | + echo '<label for="mailingdata_terms_'.esc_attr($formName).'">'; | |
| 103 | + echo '<input id="mailingdata_terms_'.esc_attr($formName).'" class="checkbox" type="checkbox" name="terms" aria-required="true" title="'.esc_attr( | |
| 101 | 104 | acym_translation('ACYM_TERMS_CONDITIONS') |
| 102 | 105 | ).'"/> '; |
| 103 | 106 | echo wp_kses( |
| 104 | 107 | $termslink, |
| @@ -103,8 +106,9 @@ | ||
| 103 | 106 | echo wp_kses( |
| 104 | 107 | $termslink, |
| 105 | 108 | SecurityHelper::ALLOWED_HTML_TERMS |
| 106 | 109 | ); |
| 110 | + echo '</label>'; | |
| 107 | 111 | echo '</td>'; |
| 108 | 112 | if (!$displayInline) { |
| 109 | 113 | echo '</tr><tr>'; |
| 110 | 114 | } |
| @@ -112,12 +116,14 @@ | ||
| 112 | 116 | |
| 113 | 117 | if (!empty($showTrackingConsent)) { |
| 114 | 118 | $trackingChecked = (int)($identifiedUser->tracking ?? 0) === 1; |
| 115 | 119 | echo '<td class="acytracking" '.($displayOutside && !$displayInline ? 'colspan="2"' : '').'>'; |
| 120 | + echo '<label for="mailingdata_tracking_'.esc_attr($formName).'">'; | |
| 116 | 121 | echo '<input type="hidden" name="user[tracking]" value="0"/>'; |
| 117 | - echo '<input id="mailingdata_tracking_'.esc_attr($formName).'" class="checkbox" type="checkbox" name="user[tracking]" value="1" '.acym_checked($trackingChecked, true, false).'/> '.esc_html( | |
| 122 | + echo '<input id="mailingdata_tracking_'.esc_attr($formName).'" class="checkbox" type="checkbox" name="user[tracking]" value="1" '.checked($trackingChecked, true, false).'/> '.esc_html( | |
| 118 | 123 | acym_translation('ACYM_TRACKING_CONSENT') |
| 119 | 124 | ); |
| 125 | + echo '</label>'; | |
| 120 | 126 | echo '</td>'; |
| 121 | 127 | if (!$displayInline) { |
| 122 | 128 | echo '</tr><tr>'; |
| 123 | 129 | } |