Changeset 13734

Timestamp:

03/17/10 16:52:44 (4 years ago)

Author:

ryan

Message:

LJ importer tweaks. Props briancolinger. fixes #12620

File:

• trunk/wp-admin/import/livejournal.php (modified) (10 diffs)

trunk/wp-admin/import/livejournal.php

@@ -185 +185 @@
             <p><?php _e( 'It looks like you attempted to import your LiveJournal posts previously and got interrupted.' ) ?></p>
             <p class="submit">
-                <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Continue previous import' ) ?>" />
+                <input type="submit" class="button" value="<?php esc_attr_e( 'Continue previous import' ) ?>" />
             </p>
             <p class="submitbox"><a href="<?php echo esc_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . esc_attr( $_SERVER['REQUEST_URI'] )) ?>" class="deletion submitdelete"><?php _e( 'Cancel &amp; start a new import' ) ?></a></p>
@@ -224 +224 @@
 
             <p class="submit">
-                <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Connect to LiveJournal and Import' ) ?>" />
+                <input type="submit" class="button" value="<?php esc_attr_e( 'Connect to LiveJournal and Import' ) ?>" />
             </p>
 
@@ -763 +763 @@
     function step1() {
         global $verified;
+
+        do_action( 'import_start' );
+
         set_time_limit( 0 );
         update_option( 'ljapi_step', 1 );
@@ -822 +825 @@
             <?php wp_nonce_field( 'lj-api-import' ) ?>
             <input type="hidden" name="step" id="step" value="1" />
-            <p><input type="submit" class="button-primary" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
+            <p><input type="submit" class="button" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
             </form>
             <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
@@ -836 +839 @@
     // Download comments to local XML
     function step2() {
+        do_action( 'import_start' );
+
         set_time_limit( 0 );
         update_option( 'ljapi_step', 2 );
@@ -872 +877 @@
             <?php wp_nonce_field( 'lj-api-import' ) ?>
             <input type="hidden" name="step" id="step" value="2" />
-            <p><input type="submit" class="button-primary" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
+            <p><input type="submit" class="button" value="<?php esc_attr_e( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
             </form>
             <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
@@ -887 +892 @@
     function step3() {
         global $wpdb;
+
+        do_action( 'import_start' );
+
         set_time_limit( 0 );
         update_option( 'ljapi_step', 3 );
@@ -948 +956 @@
         $str .= wp_referer_field( false );
         $str .= '<input type="hidden" name="step" id="step" value="' . esc_attr($next_step) . '" />';
-        $str .= '<p><input type="submit" class="button-primary" value="' . esc_attr( $label ) . '" /> <span id="auto-message"></span></p>';
+        $str .= '<p><input type="submit" class="button" value="' . esc_attr( $label ) . '" /> <span id="auto-message"></span></p>';
         $str .= '</form>';
 
@@ -1001 +1009 @@
                         jQuery( '#<?php echo $msg ?>' ).html( str );
                         jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer',
+                                                                'import':'livejournal',
                                                                 'step':jQuery('#step').val(),
                                                                 '_wpnonce':'<?php echo wp_create_nonce( 'lj-api-import' ) ?>',
@@ -1043 +1052 @@
                         array( 'comment_karma' => 0, 'comment_agent' => 'WP LJ Importer', 'comment_type' => '' ),
                         array( 'comment_type' => 'livejournal' ) );
+
+        do_action( 'import_end' );
     }