Skip to content

Commit 65e2a75

Browse files
committed
Merge branch 'release/2.1.4'
2 parents 0a1c379 + 52e1aba commit 65e2a75

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

class-bjgk-genesis-enews-extended.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Genesis eNews Extended
44
*
55
* @package BJGK\Genesis_enews_extended
6-
* @version 2.1.3
6+
* @version 2.1.4
77
* @author Brandon Kraft <[email protected]>
88
* @link https://kraft.blog/genesis-enews-extended/
99
* @copyright Copyright (c) 2012-2018, Brandon Kraft
@@ -143,11 +143,11 @@ public function widget( $args, $instance ) {
143143
on="<?php echo esc_attr( sprintf( 'submit-success:AMP.navigateTo( url=%s, target=_blank )', wp_json_encode( 'https://feedburner.google.com/fb/a/mailverify?uri=' . $instance['id'], JSON_UNESCAPED_SLASHES ) ) ); ?>"
144144
<?php endif; ?>
145145
xmlns="http://www.w3.org/1999/html">
146-
<label class="screen-reader-text"><?php echo esc_attr( $instance['input_text'] ); ?><input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="email"
146+
<<input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" aria-label="<?php echo esc_attr( $instance['input_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="email"
147147
<?php
148148
if ( current_theme_supports( 'html5' ) ) :
149149
?>
150-
required="required"<?php endif; ?> /></label>
150+
required="required"<?php endif; ?> />
151151
<input type="hidden" name="uri" value="<?php echo esc_attr( $instance['id'] ); ?>" />
152152
<input type="hidden" name="loc" value="<?php echo esc_attr( get_locale() ); ?>" />
153153
<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />
@@ -170,16 +170,16 @@ public function widget( $args, $instance ) {
170170
<?php
171171
if ( ! empty( $instance['fname-field'] ) ) :
172172
?>
173-
<label class="screen-reader-text"><?php echo esc_attr( $instance['fname_text'] ); ?><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="<?php echo esc_attr( $instance['fname-field'] ); ?>" /></label><?php endif ?>
173+
<input type="text" id="subbox1" class="enews-subbox" value="" aria-label="<?php echo esc_attr( $instance['fname_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="<?php echo esc_attr( $instance['fname-field'] ); ?>" /><?php endif ?>
174174
<?php
175175
if ( ! empty( $instance['lname-field'] ) ) :
176176
?>
177-
<label class="screen-reader-text"><?php echo esc_attr( $instance['lname_text'] ); ?><input type="text" id="subbox2" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="<?php echo esc_attr( $instance['lname-field'] ); ?>" /></label><?php endif ?>
178-
<label class="screen-reader-text"><?php echo esc_attr( $instance['input_text'] ); ?><input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="<?php echo esc_js( $instance['email-field'] ); ?>"
177+
<input type="text" id="subbox2" class="enews-subbox" value="" aria-label="<?php echo esc_attr( $instance['lname_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="<?php echo esc_attr( $instance['lname-field'] ); ?>" /><?php endif ?>
178+
<input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" aria-label="<?php echo esc_attr( $instance['input_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="<?php echo esc_js( $instance['email-field'] ); ?>"
179179
<?php
180180
if ( current_theme_supports( 'html5' ) ) :
181181
?>
182-
required="required"<?php endif; ?> /></label>
182+
required="required"<?php endif; ?> />
183183
<?php echo $instance['hidden_fields']; // phpcs:ignore ?>
184184
<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />
185185
</form>
@@ -198,16 +198,16 @@ public function widget( $args, $instance ) {
198198
<?php
199199
if ( isset( $instance['mailpoet-show-fname'] ) ) :
200200
?>
201-
<label class="screen-reader-text"><?php echo esc_attr( $instance['fname_text'] ); ?><input type="text" id="subbox1" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="mailpoet-firstname" /></label><?php endif ?>
201+
<input type="text" id="subbox1" class="enews-subbox" value="" aria-label="<?php echo esc_attr( $instance['fname_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['fname_text'] ); ?>" name="mailpoet-firstname" /><?php endif ?>
202202
<?php
203203
if ( isset( $instance['mailpoet-show-lname'] ) ) :
204204
?>
205-
<label class="screen-reader-text"><?php echo esc_attr( $instance['lname_text'] ); ?><input type="text" id="subbox2" class="enews-subbox" value="" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="mailpoet-lastname" /></label><?php endif ?>
206-
<label class="screen-reader-text"><?php echo esc_attr( $instance['input_text'] ); ?><input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="mailpoet-email"
205+
<input type="text" id="subbox2" class="enews-subbox" value="" aria-label="<?php echo esc_attr( $instance['lname_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['lname_text'] ); ?>" name="mailpoet-lastname" /><?php endif ?>
206+
<input type="<?php echo current_theme_supports( 'html5' ) ? 'email' : 'text'; ?>" value="" id="subbox" aria-label="<?php echo esc_attr( $instance['input_text'] ); ?>" placeholder="<?php echo esc_attr( $instance['input_text'] ); ?>" name="mailpoet-email"
207207
<?php
208208
if ( current_theme_supports( 'html5' ) ) :
209209
?>
210-
required="required"<?php endif; ?> /></label>
210+
required="required"<?php endif; ?> />
211211
<?php echo $instance['hidden_fields']; // phpcs:ignore ?>
212212
<input type="hidden" name="submission-type" value="mailpoet" />
213213
<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />

plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Genesis eNews Extended
44
*
55
* @package BJGK\Genesis_enews_extended
6-
* @version 2.1.3
6+
* @version 2.1.4
77
* @author Brandon Kraft <[email protected]>
88
* @copyright Copyright (c) 2012-2020, Brandon Kraft
99
* @link https://kraft.blog/genesis-enews-extended/
@@ -13,7 +13,7 @@
1313
* Plugin Name: Genesis eNews Extended
1414
* Plugin URI: https://kraft.blog/genesis-enews-extended/
1515
* Description: Replaces the Genesis eNews Widget to allow easier use of additional mailing services.
16-
* Version: 2.1.3
16+
* Version: 2.1.4
1717
* Author: Brandon Kraft
1818
* Author URI: https://kraft.blog/
1919
* License: GPL-2.0+

readme.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Requires at least: 4.9.6
66
Requires PHP: 5.4.0
77
Tested up to: 5.6.0
88
Text Domain: genesis-enews-extended
9-
Stable tag: 2.1.3
9+
Stable tag: 2.1.2
1010

1111
Creates a new widget to easily add mailing lists integration to a Genesis website. Works with FeedBurner, MailChimp, AWeber, FeedBlitz, ConvertKit and more.
1212

@@ -51,8 +51,8 @@ Questions can be asked at the [WordPress.org Support Forum](https://wordpress.or
5151
2. Widget setting screen.
5252

5353
== Changelog ==
54-
= 2.1.3 =
55-
* Fix: Use Core's screen reader CSS instead of the old custom one. Props Sallie Goetsch.
54+
= 2.1.4 =
55+
* Accessibility: Use aria-label instead of <label> to prevent CSS being either over-agressive or not enough.
5656

5757
= 2.1.2 =
5858
* Accessibility: Updates <label> to be implicit to eliminate duplication when multiple instances are used on a page.

0 commit comments

Comments
 (0)