From c06c59913bae744330a760620dfae7a6d76e6717 Mon Sep 17 00:00:00 2001
From: jrfnl <github_nospam@adviesenzo.nl>
Date: Mon, 11 May 2015 20:40:11 +0200
Subject: [PATCH] Add TGMPA version nr to table and update pages.

Fixes #399
---
 class-tgm-plugin-activation.php | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/class-tgm-plugin-activation.php b/class-tgm-plugin-activation.php
index fc87917d..581c97df 100644
--- a/class-tgm-plugin-activation.php
+++ b/class-tgm-plugin-activation.php
@@ -661,7 +661,6 @@ public function install_plugins_page() {
 					<input type="hidden" name="plugin_status" value="<?php echo esc_attr( $plugin_table->view_context ); ?>" />
 					<?php $plugin_table->display(); ?>
 				</form>
-
 			</div>
 			<?php
 
@@ -805,6 +804,8 @@ protected function do_plugin_install() {
 					}
 				}
 
+				$this->show_tgmpa_version();
+
 				// Display message based on if all plugins are now active or not.
 				if ( $this->is_tgmpa_complete() ) {
 					echo '<p>', sprintf( esc_html( $this->strings['complete'] ), '<a href="' . esc_url( self_admin_url() ) . '">' . esc_html__( 'Return to the Dashboard', 'tgmpa' ) . '</a>' ), '</p>';
@@ -813,7 +814,6 @@ protected function do_plugin_install() {
 				} else {
 					echo '<p><a href="', esc_url( $this->get_tgmpa_url() ), '" target="_parent">', esc_html( $this->strings['return'] ), '</a></p>';
 				}
-
 				return true;
 
 			} elseif ( isset( $this->plugins[ $slug ]['file_path'], $_GET['tgmpa-activate'] ) && 'activate-plugin' === $_GET['tgmpa-activate'] ) {
@@ -1893,6 +1893,15 @@ public function force_deactivation() {
 
 		}
 
+		/**
+		 * Echo the current TGMPA version number to the page.
+		 */
+		public function show_tgmpa_version() {
+			echo '<p style="float: right; padding: 0em 1.5em 0.5em 0;"><strong><small>',
+				sprintf( _x( 'TGMPA v %s', '%s = version number', 'tgmpa' ), self::TGMPA_VERSION ),
+				'</small></strong></p>';
+		}
+
 		/**
 		 * Returns the singleton instance of the class.
 		 *
@@ -2586,6 +2595,19 @@ public function wp_plugin_update_row( $slug, $item ) {
 				</tr>';
 		}
 
+		/**
+		 * Extra controls to be displayed between bulk actions and pagination.
+		 *
+		 * @since 2.5.0
+		 *
+		 * @param string $which 'top' or 'bottom' table navigation
+		 */
+		public function extra_tablenav( $which ) {
+			if ( 'bottom' === $which ) {
+				$this->tgmpa->show_tgmpa_version();
+			}
+		}
+
 		/**
 		 * Defines the bulk actions for handling registered plugins.
 		 *
@@ -3399,6 +3421,8 @@ public function bulk_footer() {
 						// Flush plugins cache so we can make sure that the installed plugins list is always up to date.
 						wp_clean_plugins_cache();
 
+						$this->tgmpa->show_tgmpa_version();
+
 						// Display message based on if all plugins are now active or not.
 						$update_actions = array();
 
@@ -3414,12 +3438,12 @@ public function bulk_footer() {
 						}
 
 						/**
-						 * Filter the list of action links available following bulk plugin updates.
+						 * Filter the list of action links available following bulk plugin installs/updates.
 						 *
 						 * @since 2.5.0
 						 *
 						 * @param array $update_actions Array of plugin action links.
-						 * @param array $plugin_info    Array of information for the last-updated plugin.
+						 * @param array $plugin_info    Array of information for the last-handled plugin.
 						 */
 						$update_actions = apply_filters( 'tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );