Index: wp-admin/includes/plugin-install.php
===================================================================
--- wp-admin/includes/plugin-install.php (revision 18555)
+++ wp-admin/includes/plugin-install.php (working copy)
@@ -233,7 +233,7 @@
}
/**
- * Display plugin information in dialog box form.
+ * Display plugin information in plugin list table.
*
* @since 2.7.0
*/
@@ -261,7 +261,8 @@
if ( empty($section) || ! isset($api->sections[ $section ]) )
$section = array_shift( $section_titles = array_keys((array)$api->sections) );
- iframe_header( __('Plugin Install') );
+ echo '
';
+ echo "
$api->name
\n";
echo "\n";
+
+ if ( isset( $_REQUEST['no-chrome'] ) )
+ exit;
}
-add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+if ( isset( $_REQUEST['no-chrome'] ) ) {
+ add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+} else {
+ add_action('install_plugins_plugin-information', 'install_plugin_information');
+}
\ No newline at end of file
Index: wp-admin/includes/class-wp-plugin-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugin-install-list-table.php (revision 18555)
+++ wp-admin/includes/class-wp-plugin-install-list-table.php (working copy)
@@ -187,9 +187,9 @@
$author = wp_kses( $author, $plugins_allowedtags );
$action_links = array();
- $action_links[] = '
' . __( 'Details' ) . '';
+ $action_links[] = '
' . __( 'Details' ) . '';
if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
$status = install_plugin_install_status( $plugin );
Index: wp-admin/js/plugin-install.dev.js
===================================================================
--- wp-admin/js/plugin-install.dev.js (revision 18555)
+++ wp-admin/js/plugin-install.dev.js (working copy)
@@ -1,42 +1,26 @@
-/* Plugin Browser Thickbox related JS*/
-var tb_position;
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;
-
- 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'});
- };
-
- 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 ) );
- });
- };
-
- $(window).resize(function(){ tb_position(); });
-
- $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() {
- tb_click.call(this);
-
- $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
- $('#TB_ajaxWindowTitle').html('
' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') );
- return false;
+ $('a.infoinline').click(function(e) {
+ if ($('#plugin-information').length < 1 ) {
+ $('
|
').insertAfter($(this).parents('tr'));
+
+ $('#plugin-information td').load(ajaxurl.replace( '/admin-ajax.php', '' ) + '/plugin-install.php?tab=plugin-information&no-chrome=1&plugin=' + $(this).attr('name'), function() {
+ $('#plugin-loading').remove();
+ $(this).wrapInner('
').parent().find('td > div').slideDown('slow');
+ });
+
+ $(this).text('Close Details');
+ } else {
+ $('#plugin-information td > div').slideUp('slow', function() {
+ $('#plugin-information').remove();
+ });
+
+ $(this).text('Details');
+ }
+
+ e.preventDefault();
});
-
- /* Plugin install related JS*/
- $('#plugin-information #sidemenu a').click( function() {
+
+ $('#plugin-information #sidemenu a').live('click', function(e) {
var tab = $(this).attr('name');
//Flip the tab
$('#plugin-information-header a.current').removeClass('current');
@@ -44,10 +28,11 @@
//Flip the content.
$('#section-holder div.section').hide(); //Hide 'em all
$('#section-' + tab).show();
- return false;
+
+ e.preventDefault();
});
$('a.install-now').click( function() {
return confirm( plugininstallL10n.ays );
});
-});
+});
\ No newline at end of file
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php (revision 18555)
+++ wp-admin/plugin-install.php (working copy)
@@ -29,8 +29,6 @@
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
- add_thickbox();
$body_id = $tab;
@@ -49,12 +47,14 @@
include(ABSPATH . 'wp-admin/admin-header.php');
?>
+
views(); ?>
+