From 27be0fe11574c094f19d214dfd0c7f810b123603 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Fri, 23 Oct 2020 21:16:07 -0500
Subject: [PATCH 1/2] Revert "Use Core's class. props Sallie Goetsch"

This reverts commit 28dc6bceed0c952991ce30287ed868f0f0522ed0.
---
 class-bjgk-genesis-enews-extended.php | 16 ++++++++--------
 plugin.php                            | 21 +++++++++++++++++++--
 readme.txt                            |  5 +----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index 29b2986..56493e0 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package   BJGK\Genesis_enews_extended
- * @version   2.1.3
+ * @version   2.1.0
  * @author    Brandon Kraft <public@brandonkraft.com>
  * @link      https://kraft.blog/genesis-enews-extended/
  * @copyright Copyright (c) 2012-2018, Brandon Kraft
@@ -143,7 +143,7 @@ public function widget( $args, $instance ) {
 					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 ) ) ); ?>"
 				<?php endif; ?>
 					xmlns="http://www.w3.org/1999/html">
-				<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"
+				<label class="screenread"><?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"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
@@ -170,12 +170,12 @@ public function widget( $args, $instance ) {
 				<?php
 				if ( ! empty( $instance['fname-field'] ) ) :
 					?>
-					<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 ?>
+					<label class="screenread"><?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 ?>
 				<?php
 				if ( ! empty( $instance['lname-field'] ) ) :
 					?>
-					<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 ?>
-				<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'] ); ?>"
+					<label class="screenread"><?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 ?>
+				<label class="screenread"><?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'] ); ?>"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
@@ -198,12 +198,12 @@ public function widget( $args, $instance ) {
 				<?php
 				if ( isset( $instance['mailpoet-show-fname'] ) ) :
 					?>
-					<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 ?>
+					<label class="screenread"><?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 ?>
 				<?php
 				if ( isset( $instance['mailpoet-show-lname'] ) ) :
 					?>
-					<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 ?>
-				<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"
+					<label class="screenread"><?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 ?>
+				<label class="screenread"><?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"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
diff --git a/plugin.php b/plugin.php
index 9bf028f..e264941 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package     BJGK\Genesis_enews_extended
- * @version     2.1.3
+ * @version     2.1.2
  * @author      Brandon Kraft <public@brandonkraft.com>
  * @copyright   Copyright (c) 2012-2020, Brandon Kraft
  * @link        https://kraft.blog/genesis-enews-extended/
@@ -13,7 +13,7 @@
  * Plugin Name: Genesis eNews Extended
  * Plugin URI:  https://kraft.blog/genesis-enews-extended/
  * Description: Replaces the Genesis eNews Widget to allow easier use of additional mailing services.
- * Version:     2.1.3
+ * Version:     2.1.2
  * Author:      Brandon Kraft
  * Author URI:  https://kraft.blog/
  * License:     GPL-2.0+
@@ -57,3 +57,20 @@ function bjgk_genesis_enews_load_translations() {
 function bjgk_genesis_enews_load_widgets() {
 	register_widget( 'BJGK_Genesis_ENews_Extended' );
 }
+
+/**
+ * Adds CSS for screenreaders.
+ *
+ * @since 0.1.0
+ */
+function bjgk_genesis_enews_css() {
+	echo '<style type="text/css"> .enews .screenread :not( input, textarea ){
+	height: 1px;
+    left: -1000em;
+    overflow: hidden;
+    position: absolute;
+    top: -1000em;
+    width: 1px; } </style>';
+}
+
+add_action( 'wp_head', 'bjgk_genesis_enews_css' );
diff --git a/readme.txt b/readme.txt
index aaefe98..fe469db 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Requires at least: 4.9.6
 Requires PHP: 5.4.0
 Tested up to: 5.6.0
 Text Domain: genesis-enews-extended
-Stable tag: 2.1.3
+Stable tag: 2.1.2
 
 Creates a new widget to easily add mailing lists integration to a Genesis website. Works with FeedBurner, MailChimp, AWeber, FeedBlitz, ConvertKit and more.
 
@@ -51,9 +51,6 @@ Questions can be asked at the [WordPress.org Support Forum](https://wordpress.or
 2. Widget setting screen.
 
 == Changelog ==
-= 2.1.3 =
-* Fix: Use Core's screen reader CSS instead of the old custom one. Props Sallie Goetsch.
-
 = 2.1.2 =
 * Accessibility: Updates <label> to be implicit to eliminate duplication when multiple instances are used on a page.
 * Coding Standards: Implement WPCS.

From 52e1aba954e63bb429d1db37de54e78e790e96e8 Mon Sep 17 00:00:00 2001
From: Brandon Kraft <public@brandonkraft.com>
Date: Fri, 23 Oct 2020 21:31:24 -0500
Subject: [PATCH 2/2] Use aria-label

---
 class-bjgk-genesis-enews-extended.php | 22 +++++++++++-----------
 plugin.php                            | 21 ++-------------------
 readme.txt                            |  3 +++
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/class-bjgk-genesis-enews-extended.php b/class-bjgk-genesis-enews-extended.php
index 56493e0..433f344 100644
--- a/class-bjgk-genesis-enews-extended.php
+++ b/class-bjgk-genesis-enews-extended.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package   BJGK\Genesis_enews_extended
- * @version   2.1.0
+ * @version   2.1.4
  * @author    Brandon Kraft <public@brandonkraft.com>
  * @link      https://kraft.blog/genesis-enews-extended/
  * @copyright Copyright (c) 2012-2018, Brandon Kraft
@@ -143,11 +143,11 @@ public function widget( $args, $instance ) {
 					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 ) ) ); ?>"
 				<?php endif; ?>
 					xmlns="http://www.w3.org/1999/html">
-				<label class="screenread"><?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"
+				<<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"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
-																		required="required"<?php endif; ?> /></label>
+																		required="required"<?php endif; ?> />
 				<input type="hidden" name="uri" value="<?php echo esc_attr( $instance['id'] ); ?>" />
 				<input type="hidden" name="loc" value="<?php echo esc_attr( get_locale() ); ?>" />
 				<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />
@@ -170,16 +170,16 @@ public function widget( $args, $instance ) {
 				<?php
 				if ( ! empty( $instance['fname-field'] ) ) :
 					?>
-					<label class="screenread"><?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 ?>
+					<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 ?>
 				<?php
 				if ( ! empty( $instance['lname-field'] ) ) :
 					?>
-					<label class="screenread"><?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 ?>
-				<label class="screenread"><?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'] ); ?>"
+					<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 ?>
+				<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'] ); ?>"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
-																		required="required"<?php endif; ?> /></label>
+																		required="required"<?php endif; ?> />
 				<?php echo $instance['hidden_fields']; // phpcs:ignore ?>
 				<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />
 			</form>
@@ -198,16 +198,16 @@ public function widget( $args, $instance ) {
 				<?php
 				if ( isset( $instance['mailpoet-show-fname'] ) ) :
 					?>
-					<label class="screenread"><?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 ?>
+					<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 ?>
 				<?php
 				if ( isset( $instance['mailpoet-show-lname'] ) ) :
 					?>
-					<label class="screenread"><?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 ?>
-				<label class="screenread"><?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"
+					<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 ?>
+				<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"
 																	<?php
 																	if ( current_theme_supports( 'html5' ) ) :
 																		?>
-																		required="required"<?php endif; ?> /></label>
+																		required="required"<?php endif; ?> />
 				<?php echo $instance['hidden_fields']; // phpcs:ignore ?>
 				<input type="hidden" name="submission-type" value="mailpoet" />
 				<input type="submit" value="<?php echo esc_attr( $instance['button_text'] ); ?>" id="subbutton" />
diff --git a/plugin.php b/plugin.php
index e264941..70b669b 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Genesis eNews Extended
  *
  * @package     BJGK\Genesis_enews_extended
- * @version     2.1.2
+ * @version     2.1.4
  * @author      Brandon Kraft <public@brandonkraft.com>
  * @copyright   Copyright (c) 2012-2020, Brandon Kraft
  * @link        https://kraft.blog/genesis-enews-extended/
@@ -13,7 +13,7 @@
  * Plugin Name: Genesis eNews Extended
  * Plugin URI:  https://kraft.blog/genesis-enews-extended/
  * Description: Replaces the Genesis eNews Widget to allow easier use of additional mailing services.
- * Version:     2.1.2
+ * Version:     2.1.4
  * Author:      Brandon Kraft
  * Author URI:  https://kraft.blog/
  * License:     GPL-2.0+
@@ -57,20 +57,3 @@ function bjgk_genesis_enews_load_translations() {
 function bjgk_genesis_enews_load_widgets() {
 	register_widget( 'BJGK_Genesis_ENews_Extended' );
 }
-
-/**
- * Adds CSS for screenreaders.
- *
- * @since 0.1.0
- */
-function bjgk_genesis_enews_css() {
-	echo '<style type="text/css"> .enews .screenread :not( input, textarea ){
-	height: 1px;
-    left: -1000em;
-    overflow: hidden;
-    position: absolute;
-    top: -1000em;
-    width: 1px; } </style>';
-}
-
-add_action( 'wp_head', 'bjgk_genesis_enews_css' );
diff --git a/readme.txt b/readme.txt
index fe469db..f734bdf 100644
--- a/readme.txt
+++ b/readme.txt
@@ -51,6 +51,9 @@ Questions can be asked at the [WordPress.org Support Forum](https://wordpress.or
 2. Widget setting screen.
 
 == Changelog ==
+= 2.1.4 =
+* Accessibility: Use aria-label instead of <label> to prevent CSS being either over-agressive or not enough.
+
 = 2.1.2 =
 * Accessibility: Updates <label> to be implicit to eliminate duplication when multiple instances are used on a page.
 * Coding Standards: Implement WPCS.