Ticket #18289: 18289.diff

wp-admin/includes/plugin-install.php

@@ -261 +261 @@
         if ( empty($section) || ! isset($api->sections[ $section ]) )
                 $section = array_shift( $section_titles = array_keys((array)$api->sections) );
 
-        iframe_header( __('Plugin Install') );
         echo "<div id='$tab-header'>\n";
         echo "<ul id='sidemenu'>\n";
         foreach ( (array)$api->sections as $section_name => $content ) {
@@ -362 +361 @@
                         echo "\t</div>\n";
                 }
         echo "</div>\n";
-
-        iframe_footer();
+        
         exit;
 }
-add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+ No newline at end of file

wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -187 +187 @@
                         $author = wp_kses( $author, $plugins_allowedtags );
 
                         $action_links = array();
-                        $action_links[] = '<a href="' . self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-                                                                '&amp;TB_iframe=true&amp;width=600&amp;height=550' ) . '" class="thickbox" title="' .
-                                                                esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
+                        $action_links[] = '<a href="http://wordpress.org/extend/plugins/' . $plugin['slug'] . '/" 
+                                                                class="infoinline" name="' . $plugin['slug'] . '" 
+                                                                title="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
 
                         if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
                                 $status = install_plugin_install_status( $plugin );

wp-admin/js/plugin-install.dev.js

@@ -1 @@
-/* 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('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
-                return false;
+        $('a.infoinline').click(function(e) {
+                if ($('#plugin-information').length < 1 ) {
+                        $('<tr id="plugin-information"><td colspan="4"><div id="plugin-loading"><img src="' + ajaxurl.replace( '/admin-ajax.php', '' ) + '/images/loading.gif" alt="Loading..."></div></td></tr>').insertAfter($(this).parents('tr'));
+                        
+                        $('#plugin-information td').load(ajaxurl.replace( '/admin-ajax.php', '' ) + '/plugin-install.php?tab=plugin-information&plugin=' + $(this).attr('name'), function() {
+                                $('#plugin-loading').remove();
+                                $(this).wrapInner('<div style="display: none;"></div>').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 +28 @@
                 //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

wp-admin/plugin-install.php

@@ -29 +29 @@
 
 wp_enqueue_style( 'plugin-install' );
 wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
-        add_thickbox();
 
 $body_id = $tab;
 

wp-admin/css/plugin-install.dev.css

@@ +1 @@
+#plugin-loading {
+        padding: 5px 0;
+        text-align: center;
+}
+
 /* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
 div.star-holder {
         position: relative;
@@ -40 +45 @@
         height: 19px;
 }
 
-/* Header on thickbox */
+#plugin-information td {
+        background: #fff;
+        padding: 0;
+}
+
 #plugin-information-header {
         margin: 0;
         padding: 0 5px;
@@ -58 +67 @@
         bottom: -1px;
 }
 
+#plugin-information .updated p {
+        margin: 0.5em 0;
+}
+
 /* Install sidemenu */
 #plugin-information p.action-button {
         width: 100%;