insideout10 / wordlift-plugin

src/admin/partials/admin-setup/step-5.php

Indentation +16 added lines, -16 removed lines

@@ -10,27 +10,27 @@
 
 	<?php
 
-	// Get the language locale part.
-	$parts    = explode( '_', get_locale() );
-	$language = isset( $parts[0] ) ? $parts[0] : '';
-	$country  = isset( $parts[1] ) ? strtolower( $parts[1] ) : '';
-	?>
+    // Get the language locale part.
+    $parts    = explode( '_', get_locale() );
+    $language = isset( $parts[0] ) ? $parts[0] : '';
+    $country  = isset( $parts[1] ) ? strtolower( $parts[1] ) : '';
+    ?>
 
 	<br>
 
 	<?php
-	// Render country select element.
+    // Render country select element.
     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-	$country_select->render(
-		array(
-			'id'     => 'wl-country-code',
-			'name'   => 'wl-country-code',
-			'lang'   => $language,
-			'value'  => $country,
-			'notice' => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
-		)
-	);
-	?>
+    $country_select->render(
+        array(
+            'id'     => 'wl-country-code',
+            'name'   => 'wl-country-code',
+            'lang'   => $language,
+            'value'  => $country,
+            'notice' => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
+        )
+    );
+    ?>
 
 	<div class="btn-wrapper">
 		<input

Spacing +7 added lines, -7 removed lines

@@ -1,19 +1,19 @@ 
 <!-- Pane 5 content -->
 <script type="text/html" id="page-4">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Country', 'wordlift' ); ?>
+		<?php esc_html_e('Country', 'wordlift'); ?>
 	</h2>
 
 	<p class="page-txt">
-		<?php esc_html_e( 'Each WordLift key can be used only in one language.', 'wordlift' ); ?>
+		<?php esc_html_e('Each WordLift key can be used only in one language.', 'wordlift'); ?>
 	</p>
 
 	<?php
 
 	// Get the language locale part.
-	$parts    = explode( '_', get_locale() );
-	$language = isset( $parts[0] ) ? $parts[0] : '';
-	$country  = isset( $parts[1] ) ? strtolower( $parts[1] ) : '';
+	$parts    = explode('_', get_locale());
+	$language = isset($parts[0]) ? $parts[0] : '';
+	$country  = isset($parts[1]) ? strtolower($parts[1]) : '';
 	?>
 
 	<br>
@@ -27,7 +27,7 @@ 
 			'name'   => 'wl-country-code',
 			'lang'   => $language,
 			'value'  => $country,
-			'notice' => __( 'The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift' ),
+			'notice' => __('The selected language is not supported in this country.</br>Please choose another country or language.', 'wordlift'),
 		)
 	);
 	?>
@@ -37,7 +37,7 @@ 
 				type="button"
 				data-wl-next="wl-next"
 				class="wl-default-action"
-				value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+				value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-4.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <!-- Pane 4 content -->
 <script type="text/html" id="page-3">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Vocabulary', 'wordlift' ); ?>
+		<?php esc_html_e('Vocabulary', 'wordlift'); ?>
 	</h2>
 
 	<p class="page-txt">
-		<?php esc_html_e( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift' ); ?>
+		<?php esc_html_e('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift'); ?>
 	</p>
 
 	<input
@@ -19,8 +19,8 @@ 
 	>
 
 	<p class="page-det">
-		<?php esc_html_e( 'Leave it empty to place your entities in the root folder of your website', 'wordlift' ); ?>
-		<?php esc_html_e( ' (requires the permalink settings to be set to Post name)', 'wordlift' ); ?>
+		<?php esc_html_e('Leave it empty to place your entities in the root folder of your website', 'wordlift'); ?>
+		<?php esc_html_e(' (requires the permalink settings to be set to Post name)', 'wordlift'); ?>
 	</p>
 
 	<div class="btn-wrapper">
@@ -28,7 +28,7 @@ 
 				type="button"
 				data-wl-next="wl-next"
 				class="wl-default-action"
-				value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+				value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-2.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' );
-		?>
+            esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' );
+        ?>
 	</p>
 	<input
 		type="checkbox"

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@ 
 <!-- Pane 2 content -->
 <script type="text/html" id="page-1">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Diagnostic', 'wordlift' ); ?>
+		<?php esc_html_e('Diagnostic', 'wordlift'); ?>
 	</h2>
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' );
+			esc_html_e('Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift');
 		?>
 	</p>
 	<input
@@ -17,12 +17,12 @@ 
 		checked
 	>
 	<label for="share-diagnostic">
-		<?php esc_html_e( 'Share diagnostic data', 'wordlift' ); ?>
+		<?php esc_html_e('Share diagnostic data', 'wordlift'); ?>
 	</label>
 	
 	<p class="privacy-policy-details">
 		<a href="https://wordlift.io/privacy-policy/" target="_blank">
-			<?php esc_html_e( 'About our privacy policy...', 'wordlift' ); ?>	
+			<?php esc_html_e('About our privacy policy...', 'wordlift'); ?>	
 		</a>
 	</p>
 
@@ -31,7 +31,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/wordlift-admin-download-your-data.php

Indentation +10 added lines, -10 removed lines

@@ -39,16 +39,16 @@
 
 	<!-- Show the 'JSON-LD' button only if the constant is defined and set to true. -->
 	<?php
-	if (
-		defined( 'WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA' ) &&
-		WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA
-	) :
-		$class_name = 'button wl-add-input wl-button';
-
-		if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure() ) {
-			$class_name .= ' wl-button-disabled';
-		}
-		?>
+    if (
+        defined( 'WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA' ) &&
+        WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA
+    ) :
+        $class_name = 'button wl-add-input wl-button';
+
+        if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure() ) {
+            $class_name .= ' wl-button-disabled';
+        }
+        ?>
 		<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_google_analytics_export' ) ); ?>"
 		   class="<?php echo esc_attr( $class_name ); ?>">
 				<?php esc_html_e( 'Google Analytics', 'wordlift' ); ?>

Spacing +16 added lines, -16 removed lines

@@ -14,46 +14,46 @@
 <!-- This file should primarily consist of HTML with a little bit of PHP. -->
 
 <div class="wrap">
-	<h2><?php echo esc_html_x( 'Download Your Data', 'Page title', 'wordlift' ); ?></h2>
-	<p><?php esc_html_e( 'Choose the format to download your data:', 'wordlift' ); ?></p>
+	<h2><?php echo esc_html_x('Download Your Data', 'Page title', 'wordlift'); ?></h2>
+	<p><?php esc_html_e('Choose the format to download your data:', 'wordlift'); ?></p>
 
-	<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_download_your_data&out=json' ) ); ?>"
+	<a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_download_your_data&out=json')); ?>"
 	   class="button wl-add-input wl-button">
-			<?php esc_html_e( 'JSON-LD', 'wordlift' ); ?>
+			<?php esc_html_e('JSON-LD', 'wordlift'); ?>
 	</a>
 
-	<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_download_your_data&out=rdf' ) ); ?>"
+	<a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_download_your_data&out=rdf')); ?>"
 	   class="button wl-add-input wl-button">
-			<?php esc_html_e( 'RDF/XML', 'wordlift' ); ?>
+			<?php esc_html_e('RDF/XML', 'wordlift'); ?>
 	</a>
 
-	<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_download_your_data&out=ttl' ) ); ?>"
+	<a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_download_your_data&out=ttl')); ?>"
 	   class="button wl-add-input wl-button">
-			<?php echo esc_html_x( 'Turtle', 'File format, not the animal', 'wordlift' ); ?>
+			<?php echo esc_html_x('Turtle', 'File format, not the animal', 'wordlift'); ?>
 	</a>
 
-	<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_download_your_data&out=n3' ) ); ?>"
+	<a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_download_your_data&out=n3')); ?>"
 	   class="button wl-add-input wl-button">
-			<?php esc_html_e( 'N3', 'wordlift' ); ?>
+			<?php esc_html_e('N3', 'wordlift'); ?>
 	</a>
 
 	<!-- Show the 'JSON-LD' button only if the constant is defined and set to true. -->
 	<?php
 	if (
-		defined( 'WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA' ) &&
+		defined('WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA') &&
 		WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA
 	) :
 		$class_name = 'button wl-add-input wl-button';
 
-		if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure() ) {
+		if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure()) {
 			$class_name .= ' wl-button-disabled';
 		}
 		?>
-		<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=wl_google_analytics_export' ) ); ?>"
-		   class="<?php echo esc_attr( $class_name ); ?>">
-				<?php esc_html_e( 'Google Analytics', 'wordlift' ); ?>
+		<a href="<?php echo esc_url(admin_url('admin-ajax.php?action=wl_google_analytics_export')); ?>"
+		   class="<?php echo esc_attr($class_name); ?>">
+				<?php esc_html_e('Google Analytics', 'wordlift'); ?>
 
-				<?php if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure() ) : ?>
+				<?php if ( ! Wordlift_Google_Analytics_Export_Service::is_postname_permalink_structure()) : ?>
 					<span class="wl-tooltip">To download your data, please change <br /> the site permalink structure to "Post name"</span>
 				<?php endif ?>
 		</a>

src/admin/partials/wordlift-admin-mappings-page.php

Indentation +44 added lines, -44 removed lines

@@ -17,51 +17,51 @@ 
 
 	<?php
 
-	$mappings = array_reduce(
-	// The list of valid post types.
-		Wordlift_Entity_Service::valid_entity_post_types(),
-		function ( $carry, $post_type ) use ( $mapping_service ) {
-			$entity_types = array_filter(
-				Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
-				function ( $item ) {
-					return 'http://schema.org/Article' !== $item;
-				}
-			);
-
-			if ( empty( $entity_types ) ) {
-				return $carry;
-			}
-
-			return $carry + array(
-				$post_type => array(
-					'entity_types' => $entity_types,
-					'count'        => $mapping_service->count( $post_type, $entity_types ),
-				),
-			);
-		},
-		array()
-	);
-
-	$mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
-
-	$json = wp_json_encode( $mappings );
-	echo wp_kses( "<script type='application/javascript'>var wlMappings = $json;</script>", array( 'script' => array( 'type' => array() ) ) );
-
-	?>
+    $mappings = array_reduce(
+    // The list of valid post types.
+        Wordlift_Entity_Service::valid_entity_post_types(),
+        function ( $carry, $post_type ) use ( $mapping_service ) {
+            $entity_types = array_filter(
+                Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
+                function ( $item ) {
+                    return 'http://schema.org/Article' !== $item;
+                }
+            );
+
+            if ( empty( $entity_types ) ) {
+                return $carry;
+            }
+
+            return $carry + array(
+                $post_type => array(
+                    'entity_types' => $entity_types,
+                    'count'        => $mapping_service->count( $post_type, $entity_types ),
+                ),
+            );
+        },
+        array()
+    );
+
+    $mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+
+    $json = wp_json_encode( $mappings );
+    echo wp_kses( "<script type='application/javascript'>var wlMappings = $json;</script>", array( 'script' => array( 'type' => array() ) ) );
+
+    ?>
 
 	<?php
 
-	foreach ( $mappings as $key => $value ) {
-		// Continue if this is the nonce.
-		if ( '_nonce' === $key ) {
-			continue;
-		}
-
-		// Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
-		if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
-			continue;
-		}
-		?>
+    foreach ( $mappings as $key => $value ) {
+        // Continue if this is the nonce.
+        if ( '_nonce' === $key ) {
+            continue;
+        }
+
+        // Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
+        if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
+            continue;
+        }
+        ?>
 		<div class="post-type-to-entity-types">
 			<button data-post-type="<?php echo esc_attr( $key ); ?>"
 					data-entity-types="<?php echo esc_attr( wp_json_encode( $value['entity_types'] ) ); ?>"
@@ -69,9 +69,9 @@ 
 			<div><?php echo esc_html( $value['count'] ); ?></div>
 		</div>
 		<?php
-	}
+    }
 
-	?>
+    ?>
 
 	<div id="schemaorg-sync">
 		<button>Sync Schema.org classes</button>

Spacing +18 added lines, -18 removed lines

@@ -6,13 +6,13 @@ 
  * @package Wordlift
  * @subpackage Wordlift/admin/partials
  */
-wp_enqueue_script( 'wp-util' );
+wp_enqueue_script('wp-util');
 
 $mapping_service = Wordlift_Mapping_Service::get_instance();
 ?>
 <div id="wpbody-content" aria-label="Main content" tabindex="0">
 	<div class="wrap">
-		<h1><?php echo esc_html__( 'Mappings', 'wordlift' ); ?></h1>
+		<h1><?php echo esc_html__('Mappings', 'wordlift'); ?></h1>
 	</div>
 
 	<?php
@@ -20,53 +20,53 @@ 
 	$mappings = array_reduce(
 	// The list of valid post types.
 		Wordlift_Entity_Service::valid_entity_post_types(),
-		function ( $carry, $post_type ) use ( $mapping_service ) {
+		function($carry, $post_type) use ($mapping_service) {
 			$entity_types = array_filter(
-				Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
-				function ( $item ) {
+				Wordlift_Entity_Type_Adapter::get_entity_types($post_type),
+				function($item) {
 					return 'http://schema.org/Article' !== $item;
 				}
 			);
 
-			if ( empty( $entity_types ) ) {
+			if (empty($entity_types)) {
 				return $carry;
 			}
 
 			return $carry + array(
 				$post_type => array(
 					'entity_types' => $entity_types,
-					'count'        => $mapping_service->count( $post_type, $entity_types ),
+					'count'        => $mapping_service->count($post_type, $entity_types),
 				),
 			);
 		},
 		array()
 	);
 
-	$mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+	$mappings['_nonce'] = wp_create_nonce('update_post_type_entity_types');
 
-	$json = wp_json_encode( $mappings );
-	echo wp_kses( "<script type='application/javascript'>var wlMappings = $json;</script>", array( 'script' => array( 'type' => array() ) ) );
+	$json = wp_json_encode($mappings);
+	echo wp_kses("<script type='application/javascript'>var wlMappings = $json;</script>", array('script' => array('type' => array())));
 
 	?>
 
 	<?php
 
-	foreach ( $mappings as $key => $value ) {
+	foreach ($mappings as $key => $value) {
 		// Continue if this is the nonce.
-		if ( '_nonce' === $key ) {
+		if ('_nonce' === $key) {
 			continue;
 		}
 
 		// Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
-		if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
+		if ( ! isset($value['count']) || 0 === $value['count']) {
 			continue;
 		}
 		?>
 		<div class="post-type-to-entity-types">
-			<button data-post-type="<?php echo esc_attr( $key ); ?>"
-					data-entity-types="<?php echo esc_attr( wp_json_encode( $value['entity_types'] ) ); ?>"
-			><?php echo esc_html( $key ); ?></button>
-			<div><?php echo esc_html( $value['count'] ); ?></div>
+			<button data-post-type="<?php echo esc_attr($key); ?>"
+					data-entity-types="<?php echo esc_attr(wp_json_encode($value['entity_types'])); ?>"
+			><?php echo esc_html($key); ?></button>
+			<div><?php echo esc_html($value['count']); ?></div>
 		</div>
 		<?php
 	}
@@ -75,7 +75,7 @@ 
 
 	<div id="schemaorg-sync">
 		<button>Sync Schema.org classes</button>
-		<div class="count"><?php echo esc_html( Wordlift_Schemaorg_Sync_Batch_Operation::get_instance()->count() ); ?></div>
+		<div class="count"><?php echo esc_html(Wordlift_Schemaorg_Sync_Batch_Operation::get_instance()->count()); ?></div>
 	</div>
 
 	<div class="clear"></div>

src/admin/partials/wordlift-admin-settings-match-terms-page.php

Indentation +7 added lines, -7 removed lines

@@ -3,15 +3,15 @@
 use Wordlift\Scripts\Scripts_Helper;
 
 Scripts_Helper::enqueue_based_on_wordpress_version(
-	'wl-vocabulary-match-terms-settings',
-	plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page',
-	array( 'react', 'react-dom', 'wp-polyfill' )
+    'wl-vocabulary-match-terms-settings',
+    plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page',
+    array( 'react', 'react-dom', 'wp-polyfill' )
 );
 
 wp_enqueue_style(
-	'wl-vocabulary-match-terms-settings',
-	plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page.full.css',
-	array(),
-	WORDLIFT_VERSION
+    'wl-vocabulary-match-terms-settings',
+    plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page.full.css',
+    array(),
+    WORDLIFT_VERSION
 );
 echo "<br/><div id='wl_vocabulary_analysis_progress_bar'></div>";

Spacing +3 added lines, -3 removed lines

@@ -4,13 +4,13 @@
 
 Scripts_Helper::enqueue_based_on_wordpress_version(
 	'wl-vocabulary-match-terms-settings',
-	plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page',
-	array( 'react', 'react-dom', 'wp-polyfill' )
+	plugin_dir_url(dirname(__DIR__)).'js/dist/vocabulary-settings-page',
+	array('react', 'react-dom', 'wp-polyfill')
 );
 
 wp_enqueue_style(
 	'wl-vocabulary-match-terms-settings',
-	plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/vocabulary-settings-page.full.css',
+	plugin_dir_url(dirname(__DIR__)).'js/dist/vocabulary-settings-page.full.css',
 	array(),
 	WORDLIFT_VERSION
 );

src/admin/partials/wordlift-admin-settings-general-page.php

Indentation +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 ?>
 
@@ -15,8 +15,8 @@ 
 
 <form action="options.php" method="post">
 	<?php
-	settings_fields( 'wl_general_settings' );
-	do_settings_sections( 'wl_general_settings' );
-	submit_button();
-	?>
+    settings_fields( 'wl_general_settings' );
+    do_settings_sections( 'wl_general_settings' );
+    submit_button();
+    ?>
 </form>

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
  * @package Wordlift/admin
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 ?>
@@ -15,8 +15,8 @@ 
 
 <form action="options.php" method="post">
 	<?php
-	settings_fields( 'wl_general_settings' );
-	do_settings_sections( 'wl_general_settings' );
+	settings_fields('wl_general_settings');
+	do_settings_sections('wl_general_settings');
 	submit_button();
 	?>
 </form>

src/admin/partials/wordlift-admin-dashboard-v2.php

Indentation +23 added lines, -23 removed lines

@@ -223,7 +223,7 @@ 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 $top_entities = $this->get_top_entities();
 if ( ! empty( $top_entities ) ) {
-	?>
+    ?>
 	<div class="wl-dashboard__block wl-dashboard__block--top-entities">
 		<header>
 			<span class="dashicons dashicons-editor-help"></span>
@@ -233,26 +233,26 @@ 
 		</header>
 		<div class="wl-dashboard__block__body">
 			<?php
-			$max         = $top_entities[0]->total;
-			$unit        = intval( '1' . str_repeat( '0', strlen( $max ) - 1 ) );
-			$max_value   = ceil( (float) $max / $unit ) * $unit;
-			$chunk_value = $max_value / 4;
-			?>
+            $max         = $top_entities[0]->total;
+            $unit        = intval( '1' . str_repeat( '0', strlen( $max ) - 1 ) );
+            $max_value   = ceil( (float) $max / $unit ) * $unit;
+            $chunk_value = $max_value / 4;
+            ?>
 			<div></div>
 			<div class="wl-dashboard__block__body__table-header">
 				<?php for ( $i = 0; $i <= $max_value; $i += $chunk_value ) { ?>
 					<span><?php echo esc_html( $i ); ?></span><?php } ?>
 			</div>
 			<?php
-			$i = 0;
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			foreach ( $this->get_top_entities() as $top_entity ) {
-				$permalink    = get_permalink( $top_entity->ID );
-				$post_title   = $top_entity->post_title;
-				$entities_100 = 100 * $top_entity->entities / $max_value;
-				$posts_100    = 100 * $top_entity->posts / $max_value;
-
-				?>
+            $i = 0;
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            foreach ( $this->get_top_entities() as $top_entity ) {
+                $permalink    = get_permalink( $top_entity->ID );
+                $post_title   = $top_entity->post_title;
+                $entities_100 = 100 * $top_entity->entities / $max_value;
+                $posts_100    = 100 * $top_entity->posts / $max_value;
+
+                ?>
 				<div><a href="<?php echo esc_attr( $permalink ); ?>"><?php echo esc_html( $post_title ); ?></a></div>
 				<div>
 					<div class="wl-dashboard__bar wl-dashboard__bar--posts"
@@ -263,8 +263,8 @@ 
 					</div>
 				</div>
 				<?php
-				if ( 4 === $i ++ ) {
-					?>
+                if ( 4 === $i ++ ) {
+                    ?>
 					<input id="wl-dashboard__show-more" type="checkbox">
 					<label for="wl-dashboard__show-more">
 						<span>
@@ -275,9 +275,9 @@ 
 						</span>
 					</label>
 					<?php
-				}
-			}
-			?>
+                }
+            }
+            ?>
 		</div>
 	</div>
 	<?php
@@ -307,9 +307,9 @@ 
 		<div class="wl-dashboard__block__body">
 			<a href="<?php echo esc_url( $vocabulary_url ); ?>">
 								<?php
-				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-								echo esc_html( $this->entity_service->count() );
-								?>
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                                echo esc_html( $this->entity_service->count() );
+                                ?>
 				</a>
 			<a href="<?php echo esc_url( $vocabulary_url ); ?>"><?php echo esc_html( _x( 'Vocabulary', 'Dashboard', 'wordlift' ) ); ?></a>
 		</div>

Spacing +32 added lines, -32 removed lines

@@ -119,11 +119,11 @@ 
 			white-space: nowrap;
 		}
 
-		<?php $blu_dot_url = plugin_dir_url( dirname( __DIR__ ) ) . 'images/blu-dot.gif'; ?>
+		<?php $blu_dot_url = plugin_dir_url(dirname(__DIR__)).'images/blu-dot.gif'; ?>
 		#wl-dashboard-v2 .wl-dashboard__block--top-entities .wl-dashboard__block__body > div:nth-child(even) {
 			flex: calc(100% - 120px);
 			background-color: #ebf6ff;
-			background-image: url('<?php echo esc_url( $blu_dot_url ); ?>'), url('<?php echo esc_url( $blu_dot_url ); ?>'), url('<?php echo esc_url( $blu_dot_url ); ?>');
+			background-image: url('<?php echo esc_url($blu_dot_url); ?>'), url('<?php echo esc_url($blu_dot_url); ?>'), url('<?php echo esc_url($blu_dot_url); ?>');
 			background-position: 25% center, 50%, 75%;
 			background-size: 1px 4px;
 			background-repeat: repeat-y;
@@ -222,56 +222,56 @@ 
 
 // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 $top_entities = $this->get_top_entities();
-if ( ! empty( $top_entities ) ) {
+if ( ! empty($top_entities)) {
 	?>
 	<div class="wl-dashboard__block wl-dashboard__block--top-entities">
 		<header>
 			<span class="dashicons dashicons-editor-help"></span>
-			<h3><?php esc_html_e( 'Top entities', 'wordlift' ); ?></h3>
-			<span class="wl-dashboard__legend wl-dashboard__legend--entities"><?php echo esc_html( _x( 'Links with entities', 'Dashboard', 'wordlift' ) ); ?></span>
-			<span class="wl-dashboard__legend wl-dashboard__legend--posts"><?php echo esc_html( _x( 'Post with entities', 'Dashboard', 'wordlift' ) ); ?></span>
+			<h3><?php esc_html_e('Top entities', 'wordlift'); ?></h3>
+			<span class="wl-dashboard__legend wl-dashboard__legend--entities"><?php echo esc_html(_x('Links with entities', 'Dashboard', 'wordlift')); ?></span>
+			<span class="wl-dashboard__legend wl-dashboard__legend--posts"><?php echo esc_html(_x('Post with entities', 'Dashboard', 'wordlift')); ?></span>
 		</header>
 		<div class="wl-dashboard__block__body">
 			<?php
 			$max         = $top_entities[0]->total;
-			$unit        = intval( '1' . str_repeat( '0', strlen( $max ) - 1 ) );
-			$max_value   = ceil( (float) $max / $unit ) * $unit;
+			$unit        = intval('1'.str_repeat('0', strlen($max) - 1));
+			$max_value   = ceil((float) $max / $unit) * $unit;
 			$chunk_value = $max_value / 4;
 			?>
 			<div></div>
 			<div class="wl-dashboard__block__body__table-header">
-				<?php for ( $i = 0; $i <= $max_value; $i += $chunk_value ) { ?>
-					<span><?php echo esc_html( $i ); ?></span><?php } ?>
+				<?php for ($i = 0; $i <= $max_value; $i += $chunk_value) { ?>
+					<span><?php echo esc_html($i); ?></span><?php } ?>
 			</div>
 			<?php
 			$i = 0;
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			foreach ( $this->get_top_entities() as $top_entity ) {
-				$permalink    = get_permalink( $top_entity->ID );
+			foreach ($this->get_top_entities() as $top_entity) {
+				$permalink    = get_permalink($top_entity->ID);
 				$post_title   = $top_entity->post_title;
 				$entities_100 = 100 * $top_entity->entities / $max_value;
 				$posts_100    = 100 * $top_entity->posts / $max_value;
 
 				?>
-				<div><a href="<?php echo esc_attr( $permalink ); ?>"><?php echo esc_html( $post_title ); ?></a></div>
+				<div><a href="<?php echo esc_attr($permalink); ?>"><?php echo esc_html($post_title); ?></a></div>
 				<div>
 					<div class="wl-dashboard__bar wl-dashboard__bar--posts"
-						 style="width: <?php echo esc_attr( $posts_100 ); ?>%;">
+						 style="width: <?php echo esc_attr($posts_100); ?>%;">
 					</div>
 					<div class="wl-dashboard__bar wl-dashboard__bar--entities"
-						 style="width: <?php echo esc_attr( $entities_100 ); ?>%;">
+						 style="width: <?php echo esc_attr($entities_100); ?>%;">
 					</div>
 				</div>
 				<?php
-				if ( 4 === $i ++ ) {
+				if (4 === $i++) {
 					?>
 					<input id="wl-dashboard__show-more" type="checkbox">
 					<label for="wl-dashboard__show-more">
 						<span>
-							<?php echo esc_html( __( 'Show more', 'wordlift' ) ); ?>
+							<?php echo esc_html(__('Show more', 'wordlift')); ?>
 						</span>
 						<span>
-							<?php echo esc_html( __( 'Hide', 'wordlift' ) ); ?>
+							<?php echo esc_html(__('Hide', 'wordlift')); ?>
 						</span>
 					</label>
 					<?php
@@ -283,46 +283,46 @@ 
 	<?php
 }
 
-$not_enriched_url  = admin_url( 'edit.php?post_type=post&wl_enriched=no' );
+$not_enriched_url  = admin_url('edit.php?post_type=post&wl_enriched=no');
 $dashboard_service = Wordlift_Dashboard_Service::get_instance();
 ?>
 	<div class="wl-dashboard__block wl-dashboard__block--enriched-posts">
 		<header>
 			<span class="dashicons dashicons-editor-help"></span>
-			<h3><?php echo esc_html__( 'Enriched posts', 'wordlift' ); ?></h3>
+			<h3><?php echo esc_html__('Enriched posts', 'wordlift'); ?></h3>
 		</header>
 		<div class="wl-dashboard__block__body">
-			<a href="<?php echo esc_url( $not_enriched_url ); ?>"><?php echo esc_html( $dashboard_service->count_annotated_posts() ); ?></a>
-			/ <?php echo esc_html( $dashboard_service->count_posts() ); ?>
-			<a href="<?php echo esc_url( $not_enriched_url ); ?>"><?php echo esc_html( _x( 'Enrich', 'Dashboard', 'wordlift' ) ); ?></a>
+			<a href="<?php echo esc_url($not_enriched_url); ?>"><?php echo esc_html($dashboard_service->count_annotated_posts()); ?></a>
+			/ <?php echo esc_html($dashboard_service->count_posts()); ?>
+			<a href="<?php echo esc_url($not_enriched_url); ?>"><?php echo esc_html(_x('Enrich', 'Dashboard', 'wordlift')); ?></a>
 		</div>
 	</div>
 
-<?php $vocabulary_url = admin_url( 'edit.php?post_type=entity' ); ?>
+<?php $vocabulary_url = admin_url('edit.php?post_type=entity'); ?>
 	<div class="wl-dashboard__block wl-dashboard__block--created-entities">
 		<header>
 			<span class="dashicons dashicons-editor-help"></span>
-			<h3><?php esc_html_e( 'Created entities', 'wordlift' ); ?></h3>
+			<h3><?php esc_html_e('Created entities', 'wordlift'); ?></h3>
 		</header>
 		<div class="wl-dashboard__block__body">
-			<a href="<?php echo esc_url( $vocabulary_url ); ?>">
+			<a href="<?php echo esc_url($vocabulary_url); ?>">
 								<?php
 				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-								echo esc_html( $this->entity_service->count() );
+								echo esc_html($this->entity_service->count());
 								?>
 				</a>
-			<a href="<?php echo esc_url( $vocabulary_url ); ?>"><?php echo esc_html( _x( 'Vocabulary', 'Dashboard', 'wordlift' ) ); ?></a>
+			<a href="<?php echo esc_url($vocabulary_url); ?>"><?php echo esc_html(_x('Vocabulary', 'Dashboard', 'wordlift')); ?></a>
 		</div>
 	</div>
 
 	<div class="wl-dashboard__block wl-dashboard__block--average-entity-rating">
 		<header>
 			<span class="dashicons dashicons-editor-help"></span>
-			<h3><?php echo esc_html__( 'Average entity rating', 'wordlift' ); ?></h3>
+			<h3><?php echo esc_html__('Average entity rating', 'wordlift'); ?></h3>
 		</header>
 		<div class="wl-dashboard__block__body">
-			<?php echo esc_html( $dashboard_service->average_entities_rating() ); ?>
-			<?php echo esc_html( _x( 'Boost', 'Dashboard', 'wordlift' ) ); ?>
+			<?php echo esc_html($dashboard_service->average_entities_rating()); ?>
+			<?php echo esc_html(_x('Boost', 'Dashboard', 'wordlift')); ?>
 		</div>
 	</div>
 <?php
@@ -333,4 +333,4 @@ 
  * @author Naveen Muthusamy <naveen@wordlift.io>
  * Action name : wl_admin_dashboard_widgets
  */
-do_action( 'wl_admin_dashboard_widgets' );
+do_action('wl_admin_dashboard_widgets');

src/admin/partials/wordlift-admin-settings-analytics-page.php

Indentation +99 added lines, -99 removed lines

@@ -11,10 +11,10 @@ 
 	<?php settings_errors(); ?>
 	<form action="options.php" method="post">
 		<?php
-		settings_fields( 'wl_analytics_settings' );
-		do_settings_sections( 'wl_analytics_settings' );
-		submit_button();
-		?>
+        settings_fields( 'wl_analytics_settings' );
+        do_settings_sections( 'wl_analytics_settings' );
+        submit_button();
+        ?>
 	</form>
 	<div class="info">
 		<b><?php esc_html_e( 'For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift' ); ?></b>
@@ -22,13 +22,13 @@ 
 			<li><?php esc_html_e( 'You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift' ); ?></li>
 			<li>
 				<?php
-				printf(
-						/* translators: 1: Variables, 2: Data Layer Variable. */
-					esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
-					'<b>Variables</b>',
-					'<i>Data Layer Variable</i>'
-				);
-				?>
+                printf(
+                        /* translators: 1: Variables, 2: Data Layer Variable. */
+                    esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
+                    '<b>Variables</b>',
+                    '<i>Data Layer Variable</i>'
+                );
+                ?>
 				<ol>
 					<li><i>event</i></li>
 					<li><i>wl_event_action</i></li>
@@ -44,56 +44,56 @@ 
 			</li>
 			<li>
 				<?php
-				printf(
-				/* translators: 1: Google Analytics Settings. */
-					esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
-					'<i>Google Analytics Settings</i>'
-				);
-				?>
+                printf(
+                /* translators: 1: Google Analytics Settings. */
+                    esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
+                    '<i>Google Analytics Settings</i>'
+                );
+                ?>
 				<ol>
 					<li><?php esc_html_e( 'Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift' ); ?></li>
 					<li>
 						<?php
-						printf(
-						/* translators: 1: wl_index_uri, 2: wl_index_type. */
-							esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
-							'<i>wl_index_uri</i> - <i>wl_event_uri</i>',
-							'<i>wl_index_type</i> - <i>wl_event_type</i>'
-						);
-						?>
+                        printf(
+                        /* translators: 1: wl_index_uri, 2: wl_index_type. */
+                            esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
+                            '<i>wl_index_uri</i> - <i>wl_event_uri</i>',
+                            '<i>wl_index_type</i> - <i>wl_event_type</i>'
+                        );
+                        ?>
 					</li>
 				</ol>
 			</li>
 			<li>
 				<?php
-				printf(
-				/* translators: 1: Triggers, 2: Custom Events. */
-					esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
-					'<b>Triggers</b>',
-					'<i>Custom Event</i>'
-				);
-				?>
+                printf(
+                /* translators: 1: Triggers, 2: Custom Events. */
+                    esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
+                    '<b>Triggers</b>',
+                    '<i>Custom Event</i>'
+                );
+                ?>
 				<ol>
 					<li>
 
 						<?php
-						printf(
-						/* translators: 1: Event name, 2: Mentions. */
-							esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
-							'<i>Event name</i>',
-							'<i>Mentions</i>'
-						);
-						?>
+                        printf(
+                        /* translators: 1: Event name, 2: Mentions. */
+                            esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
+                            '<i>Event name</i>',
+                            '<i>Mentions</i>'
+                        );
+                        ?>
 					</li>
 					<li>
 
 						<?php
-						printf(
-						/* translators: 1: Some Custom Events. */
-							esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
-							'<i>Some Custom Events</i>'
-						);
-						?>
+                        printf(
+                        /* translators: 1: Some Custom Events. */
+                            esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
+                            '<i>Some Custom Events</i>'
+                        );
+                        ?>
 						<ol>
 							<li><i>event_action</i> - <i>equals</i> - <i>Mentions</i>.</li>
 						</ol>
@@ -102,86 +102,86 @@ 
 			</li>
 			<li>
 				<?php
-				printf(
-				/* translators: 1: Tags. */
-					esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
-					'<b>Tags</b>'
-				);
-				?>
+                printf(
+                /* translators: 1: Tags. */
+                    esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
+                    '<b>Tags</b>'
+                );
+                ?>
 				<ol>
 					<li>
 
 						<?php
-						printf(
-						/* translators: 1: Google Analytics. */
-							esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
-							'<i>Google Analytics - Universal Analytics</i>'
-						);
-						?>
+                        printf(
+                        /* translators: 1: Google Analytics. */
+                            esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
+                            '<i>Google Analytics - Universal Analytics</i>'
+                        );
+                        ?>
 						<ol>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: Track Type, 2: Event. */
-									esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
-									'Track Type',
-									'<i>Event</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: Track Type, 2: Event. */
+                                    esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
+                                    'Track Type',
+                                    '<i>Event</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: wl_event_category. */
-									esc_html__( 'Set Category to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_category}}</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: wl_event_category. */
+                                    esc_html__( 'Set Category to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_category}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: wl_event_action. */
-									esc_html__( 'Set Action to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_action}}</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: wl_event_action. */
+                                    esc_html__( 'Set Action to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_action}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: wl_event_label. */
-									esc_html__( 'Set Label to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_label}}</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: wl_event_label. */
+                                    esc_html__( 'Set Label to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_label}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: wl_event_value. */
-									esc_html__( 'Set Value to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_value}}</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: wl_event_value. */
+                                    esc_html__( 'Set Value to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_value}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: True. */
-									esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
-									'<i>True</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: True. */
+                                    esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
+                                    '<i>True</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-								/* translators: 1: Google Analytics Settings. */
-									esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
-									'<i>Google Analytics Settings</i>'
-								);
-								?>
+                                printf(
+                                /* translators: 1: Google Analytics Settings. */
+                                    esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
+                                    '<i>Google Analytics Settings</i>'
+                                );
+                                ?>
 							</li>
 						</ol>
 					</li>

Spacing +25 added lines, -25 removed lines

@@ -11,20 +11,20 @@ 
 	<?php settings_errors(); ?>
 	<form action="options.php" method="post">
 		<?php
-		settings_fields( 'wl_analytics_settings' );
-		do_settings_sections( 'wl_analytics_settings' );
+		settings_fields('wl_analytics_settings');
+		do_settings_sections('wl_analytics_settings');
 		submit_button();
 		?>
 	</form>
 	<div class="info">
-		<b><?php esc_html_e( 'For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift' ); ?></b>
+		<b><?php esc_html_e('For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift'); ?></b>
 		<ol>
-			<li><?php esc_html_e( 'You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift' ); ?></li>
+			<li><?php esc_html_e('You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift'); ?></li>
 			<li>
 				<?php
 				printf(
 						/* translators: 1: Variables, 2: Data Layer Variable. */
-					esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
+					esc_html__('Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift'),
 					'<b>Variables</b>',
 					'<i>Data Layer Variable</i>'
 				);
@@ -35,10 +35,10 @@ 
 					<li><i>wl_event_category</i></li>
 					<li><i>wl_event_label</i></li>
 					<li><i>wl_event_value</i></li>
-					<li><i>wl_event_uri</i> <?php esc_html_e( '(which is the first custom dimension number the plugin offers)', 'wordlift' ); ?></li>
-					<li><i>wl_index_uri</i> <?php esc_html_e( '(this is the index number sent to use as the custom dimention for uri)', 'wordlift' ); ?></li>
-					<li><i>wl_event_type</i> <?php esc_html_e( '(which is the second custom dimension number the plugin offers)', 'wordlift' ); ?></li>
-					<li><i>wl_index_type</i> <?php esc_html_e( '(this is the index number sent to use as the custom dimention for type)', 'wordlift' ); ?></li>
+					<li><i>wl_event_uri</i> <?php esc_html_e('(which is the first custom dimension number the plugin offers)', 'wordlift'); ?></li>
+					<li><i>wl_index_uri</i> <?php esc_html_e('(this is the index number sent to use as the custom dimention for uri)', 'wordlift'); ?></li>
+					<li><i>wl_event_type</i> <?php esc_html_e('(which is the second custom dimension number the plugin offers)', 'wordlift'); ?></li>
+					<li><i>wl_index_type</i> <?php esc_html_e('(this is the index number sent to use as the custom dimention for type)', 'wordlift'); ?></li>
 
 				</ol>
 			</li>
@@ -46,17 +46,17 @@ 
 				<?php
 				printf(
 				/* translators: 1: Google Analytics Settings. */
-					esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
+					esc_html__('Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift'),
 					'<i>Google Analytics Settings</i>'
 				);
 				?>
 				<ol>
-					<li><?php esc_html_e( 'Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift' ); ?></li>
+					<li><?php esc_html_e('Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift'); ?></li>
 					<li>
 						<?php
 						printf(
 						/* translators: 1: wl_index_uri, 2: wl_index_type. */
-							esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
+							esc_html__('Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift'),
 							'<i>wl_index_uri</i> - <i>wl_event_uri</i>',
 							'<i>wl_index_type</i> - <i>wl_event_type</i>'
 						);
@@ -68,7 +68,7 @@ 
 				<?php
 				printf(
 				/* translators: 1: Triggers, 2: Custom Events. */
-					esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
+					esc_html__('Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift'),
 					'<b>Triggers</b>',
 					'<i>Custom Event</i>'
 				);
@@ -79,7 +79,7 @@ 
 						<?php
 						printf(
 						/* translators: 1: Event name, 2: Mentions. */
-							esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
+							esc_html__('In the %1$s field input %2$s.', 'wordlift'),
 							'<i>Event name</i>',
 							'<i>Mentions</i>'
 						);
@@ -90,7 +90,7 @@ 
 						<?php
 						printf(
 						/* translators: 1: Some Custom Events. */
-							esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
+							esc_html__('Set this to fire on %1$s and in the filter set:', 'wordlift'),
 							'<i>Some Custom Events</i>'
 						);
 						?>
@@ -104,7 +104,7 @@ 
 				<?php
 				printf(
 				/* translators: 1: Tags. */
-					esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
+					esc_html__('Go to the %1$s menu and create a new tag.', 'wordlift'),
 					'<b>Tags</b>'
 				);
 				?>
@@ -114,7 +114,7 @@ 
 						<?php
 						printf(
 						/* translators: 1: Google Analytics. */
-							esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
+							esc_html__('In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift'),
 							'<i>Google Analytics - Universal Analytics</i>'
 						);
 						?>
@@ -123,7 +123,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: Track Type, 2: Event. */
-									esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
+									esc_html__('Set the %1$s to %2$s.', 'wordlift'),
 									'Track Type',
 									'<i>Event</i>'
 								);
@@ -133,7 +133,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: wl_event_category. */
-									esc_html__( 'Set Category to %1$s.', 'wordlift' ),
+									esc_html__('Set Category to %1$s.', 'wordlift'),
 									'<i>{{wl_event_category}}</i>'
 								);
 								?>
@@ -142,7 +142,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: wl_event_action. */
-									esc_html__( 'Set Action to %1$s.', 'wordlift' ),
+									esc_html__('Set Action to %1$s.', 'wordlift'),
 									'<i>{{wl_event_action}}</i>'
 								);
 								?>
@@ -151,7 +151,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: wl_event_label. */
-									esc_html__( 'Set Label to %1$s.', 'wordlift' ),
+									esc_html__('Set Label to %1$s.', 'wordlift'),
 									'<i>{{wl_event_label}}</i>'
 								);
 								?>
@@ -160,7 +160,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: wl_event_value. */
-									esc_html__( 'Set Value to %1$s.', 'wordlift' ),
+									esc_html__('Set Value to %1$s.', 'wordlift'),
 									'<i>{{wl_event_value}}</i>'
 								);
 								?>
@@ -169,7 +169,7 @@ 
 								<?php
 								printf(
 								/* translators: 1: True. */
-									esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
+									esc_html__('Set Non-Interaction Hit to %1$s.', 'wordlift'),
 									'<i>True</i>'
 								);
 								?>
@@ -178,14 +178,14 @@ 
 								<?php
 								printf(
 								/* translators: 1: Google Analytics Settings. */
-									esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
+									esc_html__('Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift'),
 									'<i>Google Analytics Settings</i>'
 								);
 								?>
 							</li>
 						</ol>
 					</li>
-					<li><?php esc_html_e( 'In the triggering tag select the firing trigger you created previously.', 'wordlift' ); ?></li>
+					<li><?php esc_html_e('In the triggering tag select the firing trigger you created previously.', 'wordlift'); ?></li>
 				</ol>
 			</li>
 		</ol>