From f5db7d224addfa110bbc3c21ef3d0718e491c4a8 Mon Sep 17 00:00:00 2001
From: thrijith <thrijith13@gmail.com>
Date: Fri, 16 Aug 2024 17:23:07 +0530
Subject: [PATCH 1/4] Update and move two factor option heading out of table
 Align two factor options with title

---
 class-two-factor-core.php | 6 ++----
 user-edit.css             | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index c5864340..8131f5b2 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -1405,7 +1405,7 @@ public static function _login_form_revalidate_2fa( $nonce = '', $provider = '',
 		) );
 
 		do_action( 'two_factor_user_revalidated', $user, $provider );
-		
+
 		// Must be global because that's how login_header() uses it.
 		global $interim_login;
 		$interim_login = isset( $_REQUEST['interim-login'] ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited,WordPress.Security.NonceVerification.Recommended
@@ -1721,12 +1721,10 @@ public static function user_two_factor_options( $user ) {
 
 		wp_nonce_field( 'user_two_factor_options', '_nonce_user_two_factor_options', false );
 		?>
+		<h3><?php esc_html_e( 'Two-Factor Options', 'two-factor' ); ?></h3>
 		<input type="hidden" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php /* Dummy input so $_POST value is passed when no providers are enabled. */ ?>" />
 		<table class="form-table">
 			<tr>
-				<th>
-					<?php esc_html_e( 'Two-Factor Options', 'two-factor' ); ?>
-				</th>
 				<td>
 					<table class="two-factor-methods-table">
 						<thead>
diff --git a/user-edit.css b/user-edit.css
index e5427bb7..921a39de 100644
--- a/user-edit.css
+++ b/user-edit.css
@@ -40,3 +40,7 @@
 	display: block;
 	font-weight: 700;
 }
+
+#two-factor-options table.form-table td {
+	padding: 0;
+}

From 2642ce475d892d1b8eca893899808b536fc4b5a1 Mon Sep 17 00:00:00 2001
From: thrijith <thrijith13@gmail.com>
Date: Tue, 20 Aug 2024 23:30:28 +0530
Subject: [PATCH 2/4] Remove wrapping table, update css for existing table to
 use full width

---
 class-two-factor-core.php | 70 ++++++++++++++++++---------------------
 user-edit.css             |  5 +--
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index 8131f5b2..e2cc117c 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -1723,44 +1723,38 @@ public static function user_two_factor_options( $user ) {
 		?>
 		<h3><?php esc_html_e( 'Two-Factor Options', 'two-factor' ); ?></h3>
 		<input type="hidden" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php /* Dummy input so $_POST value is passed when no providers are enabled. */ ?>" />
-		<table class="form-table">
-			<tr>
-				<td>
-					<table class="two-factor-methods-table">
-						<thead>
-							<tr>
-								<th class="col-enabled" scope="col"><?php esc_html_e( 'Enabled', 'two-factor' ); ?></th>
-								<th class="col-primary" scope="col"><?php esc_html_e( 'Primary', 'two-factor' ); ?></th>
-								<th class="col-name" scope="col"><?php esc_html_e( 'Type', 'two-factor' ); ?></th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ( self::get_providers() as $provider_key => $object ) : ?>
-							<tr>
-								<th scope="row"><input id="enabled-<?php echo esc_attr( $provider_key ); ?>" type="checkbox" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php echo esc_attr( $provider_key ); ?>" <?php checked( in_array( $provider_key, $enabled_providers, true ) ); ?> /></th>
-								<th scope="row"><input type="radio" name="<?php echo esc_attr( self::PROVIDER_USER_META_KEY ); ?>" value="<?php echo esc_attr( $provider_key ); ?>" <?php checked( $provider_key, $primary_provider_key ); ?> /></th>
-								<td>
-									<label class="two-factor-method-label" for="enabled-<?php echo esc_attr( $provider_key ); ?>"><?php echo esc_html( $object->get_label() ); ?></label>
-									<?php
-										/**
-										 * Fires after user options are shown.
-										 *
-										 * Use the {@see 'two_factor_user_options_' . $provider_key } hook instead.
-										 *
-										 * @deprecated 0.7.0
-										 *
-										 * @param WP_User $user The user.
-										 */
-										do_action_deprecated( 'two-factor-user-options-' . $provider_key, array( $user ), '0.7.0', 'two_factor_user_options_' . $provider_key );
-										do_action( 'two_factor_user_options_' . $provider_key, $user );
-									?>
-								</td>
-							</tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-				</td>
-			</tr>
+		<table class="two-factor-methods-table">
+			<thead>
+				<tr>
+					<th class="col-enabled" scope="col"><?php esc_html_e( 'Enabled', 'two-factor' ); ?></th>
+					<th class="col-primary" scope="col"><?php esc_html_e( 'Primary', 'two-factor' ); ?></th>
+					<th class="col-name" scope="col"><?php esc_html_e( 'Type', 'two-factor' ); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php foreach ( self::get_providers() as $provider_key => $object ) : ?>
+				<tr>
+					<th scope="row"><input id="enabled-<?php echo esc_attr( $provider_key ); ?>" type="checkbox" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php echo esc_attr( $provider_key ); ?>" <?php checked( in_array( $provider_key, $enabled_providers, true ) ); ?> /></th>
+					<th scope="row"><input type="radio" name="<?php echo esc_attr( self::PROVIDER_USER_META_KEY ); ?>" value="<?php echo esc_attr( $provider_key ); ?>" <?php checked( $provider_key, $primary_provider_key ); ?> /></th>
+					<td>
+						<label class="two-factor-method-label" for="enabled-<?php echo esc_attr( $provider_key ); ?>"><?php echo esc_html( $object->get_label() ); ?></label>
+						<?php
+						/**
+						 * Fires after user options are shown.
+						 *
+						 * Use the {@see 'two_factor_user_options_' . $provider_key } hook instead.
+						 *
+						 * @deprecated 0.7.0
+						 *
+						 * @param WP_User $user The user.
+						 */
+						do_action_deprecated( 'two-factor-user-options-' . $provider_key, array( $user ), '0.7.0', 'two_factor_user_options_' . $provider_key );
+						do_action( 'two_factor_user_options_' . $provider_key, $user );
+						?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
 		</table>
 		</fieldset>
 		<?php
diff --git a/user-edit.css b/user-edit.css
index 921a39de..df763894 100644
--- a/user-edit.css
+++ b/user-edit.css
@@ -3,6 +3,7 @@
 	background-color: #fff;
 	border: 1px solid #e5e5e5;
 	border-spacing: 0;
+	width: 100%;
 }
 
 .two-factor-methods-table thead,
@@ -40,7 +41,3 @@
 	display: block;
 	font-weight: 700;
 }
-
-#two-factor-options table.form-table td {
-	padding: 0;
-}

From defa6b70bec557bc6fc69bff58a7cbe435740c04 Mon Sep 17 00:00:00 2001
From: Dion Hulse <contact@dd32.id.au>
Date: Thu, 22 Aug 2024 14:00:23 +1000
Subject: [PATCH 3/4] Duplicate the table header to the table footer, to match
 other wp-admin tables used on profiles and elsewhere.

---
 class-two-factor-core.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index e2cc117c..ea3dc5d0 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -1755,6 +1755,13 @@ public static function user_two_factor_options( $user ) {
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
+			<tfoot>
+				<tr>
+					<th class="col-enabled" scope="col"><?php esc_html_e( 'Enabled', 'two-factor' ); ?></th>
+					<th class="col-primary" scope="col"><?php esc_html_e( 'Primary', 'two-factor' ); ?></th>
+					<th class="col-name" scope="col"><?php esc_html_e( 'Type', 'two-factor' ); ?></th>
+				</tr>
+			</tfoot>
 		</table>
 		</fieldset>
 		<?php

From 891972ab1c6ec8599f933ad1c0f15ebeb085a8e8 Mon Sep 17 00:00:00 2001
From: Dion Hulse <contact@dd32.id.au>
Date: Thu, 22 Aug 2024 14:18:07 +1000
Subject: [PATCH 4/4] Use wp-admin classnames and inherit core CSS.

---
 class-two-factor-core.php |  2 +-
 user-edit.css             | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index ea3dc5d0..62e4019f 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -1723,7 +1723,7 @@ public static function user_two_factor_options( $user ) {
 		?>
 		<h3><?php esc_html_e( 'Two-Factor Options', 'two-factor' ); ?></h3>
 		<input type="hidden" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php /* Dummy input so $_POST value is passed when no providers are enabled. */ ?>" />
-		<table class="two-factor-methods-table">
+		<table class="wp-list-table widefat fixed striped table-view-list two-factor-methods-table">
 			<thead>
 				<tr>
 					<th class="col-enabled" scope="col"><?php esc_html_e( 'Enabled', 'two-factor' ); ?></th>
diff --git a/user-edit.css b/user-edit.css
index df763894..a630f0e1 100644
--- a/user-edit.css
+++ b/user-edit.css
@@ -1,20 +1,3 @@
-
-.two-factor-methods-table {
-	background-color: #fff;
-	border: 1px solid #e5e5e5;
-	border-spacing: 0;
-	width: 100%;
-}
-
-.two-factor-methods-table thead,
-.two-factor-methods-table tfoot {
-	background: #fff;
-}
-
-.two-factor-methods-table thead th {
-	padding: 0.5em;
-}
-
 .two-factor-methods-table .col-primary,
 .two-factor-methods-table .col-enabled {
 	width: 5%;
@@ -33,10 +16,6 @@
 	vertical-align: top;
 }
 
-.two-factor-methods-table tbody tr:nth-child(odd) {
-	background-color: #f9f9f9;
-}
-
 .two-factor-methods-table .two-factor-method-label {
 	display: block;
 	font-weight: 700;