--- a/wp/wp-admin/js/plugin-install.js	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/js/plugin-install.js	Tue Jun 09 03:35:32 2015 +0200
@@ -1,53 +1,72 @@
+/* global plugininstallL10n, tb_click */
+
 /* Plugin Browser Thickbox related JS*/
 var tb_position;
-jQuery(document).ready(function($) {
+jQuery( document ).ready( function( $ ) {
 	tb_position = function() {
-		var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
-
-		if ( $('body.admin-bar').length )
-			adminbar_height = 28;
+		var tbWindow = $( '#TB_window' ),
+			width = $( window ).width(),
+			H = $( window ).height() - ( ( 792 < width ) ? 60 : 20 ),
+			W = ( 792 < width ) ? 772 : width - 20;
 
 		if ( tbWindow.size() ) {
-			tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
-			$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
-			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-			if ( typeof document.body.style.maxWidth != 'undefined' )
-				tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
-		};
+			tbWindow.width( W ).height( H );
+			$( '#TB_iframeContent' ).width( W ).height( H );
+			tbWindow.css({
+				'margin-left': '-' + parseInt( ( W / 2 ), 10 ) + 'px'
+			});
+			if ( typeof document.body.style.maxWidth !== 'undefined' ) {
+				tbWindow.css({
+					'top': '30px',
+					'margin-top': '0'
+				});
+			}
+		}
 
-		return $('a.thickbox').each( function() {
-			var href = $(this).attr('href');
-			if ( ! href )
+		return $( 'a.thickbox' ).each( function() {
+			var href = $( this ).attr( 'href' );
+			if ( ! href ) {
 				return;
-			href = href.replace(/&width=[0-9]+/g, '');
-			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
+			}
+			href = href.replace( /&width=[0-9]+/g, '' );
+			href = href.replace( /&height=[0-9]+/g, '' );
+			$(this).attr( 'href', href + '&width=' + W + '&height=' + ( H ) );
 		});
 	};
 
-	$(window).resize(function(){ tb_position(); });
+	$( window ).resize( function() {
+		tb_position();
+	});
 
-	$('#dashboard_plugins, .plugins').on( 'click', 'a.thickbox', function() {
+	$( '.plugin-card, .plugins .column-description' ).on( 'click', 'a.thickbox', function() {
 		tb_click.call(this);
 
-		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
+		$('#TB_title').css({'background-color':'#23282d','color':'#cfcfcf'});
+		$('#TB_ajaxWindowTitle').html( '<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).data( 'title' ) );
+		$('#TB_iframeContent').attr( 'title', plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) );
+		$('#TB_closeWindowButton').focus();
+
 		return false;
 	});
 
-	/* Plugin install related JS*/
-	$('#plugin-information #sidemenu a').click( function() {
-		var tab = $(this).attr('name');
-		//Flip the tab
-		$('#plugin-information-header a.current').removeClass('current');
-		$(this).addClass('current');
-		//Flip the content.
-		$('#section-holder div.section').hide(); //Hide 'em all
-		$('#section-' + tab).show();
-		return false;
-	});
+	/* Plugin install related JS */
+	$( '#plugin-information-tabs a' ).click( function( event ) {
+		var tab = $( this ).attr( 'name' );
+		event.preventDefault();
+
+		// Flip the tab
+		$( '#plugin-information-tabs a.current' ).removeClass( 'current' );
+		$( this ).addClass( 'current' );
 
-	$('a.install-now').click( function() {
-		return confirm( plugininstallL10n.ays );
+		// Only show the fyi box in the description section, on smaller screen, where it's otherwise always displayed at the top.
+		if ( 'description' !== tab && $( window ).width() < 772 ) {
+			$( '#plugin-information-content' ).find( '.fyi' ).hide();
+		} else {
+			$( '#plugin-information-content' ).find( '.fyi' ).show();
+		}
+
+		// Flip the content.
+		$( '#section-holder div.section' ).hide(); // Hide 'em all.
+		$( '#section-' + tab ).show();
 	});
 });