WordPress 4.5

[autoinstalls/wordpress.git] / wp-admin / import.php

diff --git a/wp-admin/import.php b/wp-admin/import.php
index 076f0d1f3d747eea1b8b443e46dadf2b6eee4d37..a1ce80e2b341838ee95f2659eff52e3456203db6 100644 (file)
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -25,8 +25,8 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 if ( current_user_can( 'install_plugins' ) )
@@ -52,10 +52,14 @@ $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
-       <div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
+       <div class="error">
+               <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
+                       /* translators: %s: importer slug */
+                       printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
+               ?></p>
+       </div>
 <?php endif; ?>
 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>
 
@@ -75,12 +79,11 @@ foreach ( $popular_importers as $pop_importer => $pop_data ) {
 if ( empty( $importers ) ) {
        echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
 } else {
-       uasort($importers, create_function('$a, $b', 'return strnatcasecmp($a[0], $b[0]);'));
+       uasort( $importers, '_usort_by_first_member' );
 ?>
-<table class="widefat importers" cellspacing="0">
+<table class="widefat importers striped">
 
 <?php
-       $alt = '';
        foreach ($importers as $importer_id => $data) {
                $action = '';
                if ( isset( $data['install'] ) ) {
@@ -98,7 +101,7 @@ if ( empty( $importers ) ) {
                        if ( empty($action) ) {
                                if ( is_main_site() ) {
                                        $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
-                                                                               '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox" title="' .
+                                                                               '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox open-plugin-details-modal" title="' .
                                                                                esc_attr__('Install importer') . '">' . $data[0] . '</a>';
                                } else {
                                        $action = $data[0];
@@ -109,9 +112,8 @@ if ( empty( $importers ) ) {
                        $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
                }
 
-               $alt = $alt ? '' : ' class="alternate"';
                echo "
-                       <tr$alt>
+                       <tr>
                                <td class='import-system row-title'>$action</td>
                                <td class='desc'>{$data[1]}</td>
                        </tr>";