| @@ -11,9 +11,9 @@ | ||
| 11 | 11 | <html <?php language_attributes(); ?>> |
| 12 | 12 | <head> |
| 13 | 13 | <meta name="viewport" content="width=device-width"/> |
| 14 | 14 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> |
| 15 | - <title><?php echo esc_html( 'Kit' ); ?> ‹ <?php bloginfo( 'name' ); ?> — WordPress</title> | |
| 15 | + <title><?php echo esc_html( CONVERTKIT_PLUGIN_NAME ); ?> ‹ <?php bloginfo( 'name' ); ?> — WordPress</title> | |
| 16 | 16 | <script type="text/javascript"> |
| 17 | 17 | var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>'; |
| 18 | 18 | </script> |
| 19 | 19 | <?php |
| @@ -21,40 +21,28 @@ | ||
| 21 | 21 | do_action( 'admin_print_styles' ); |
| 22 | 22 | do_action( 'admin_head' ); |
| 23 | 23 | ?> |
| 24 | 24 | </head> |
| 25 | - <body class="wp-admin wp-core-ui convertkit <?php echo esc_attr( $this->is_modal() ? ' convertkit-modal' : '' ); ?>"> | |
| 25 | + <body class="wp-admin wp-core-ui convertkit"> | |
| 26 | 26 | <div id="convertkit-setup-wizard"> |
| 27 | - <?php | |
| 28 | - if ( ! $this->is_modal() ) { | |
| 29 | - ?> | |
| 30 | - <header id="convertkit-setup-wizard-header"> | |
| 31 | - <h1><?php echo esc_html( 'Kit' ); ?></h1> | |
| 32 | - </header> | |
| 33 | - <?php | |
| 34 | - } | |
| 35 | - ?> | |
| 27 | + <header id="convertkit-setup-wizard-header"> | |
| 28 | + <h1><?php echo esc_html( CONVERTKIT_PLUGIN_NAME ); ?></h1> | |
| 29 | + </header> | |
| 36 | 30 | |
| 37 | 31 | <div class="wrap"> |
| 38 | - <?php | |
| 39 | - if ( ! $this->is_modal() ) { | |
| 40 | - ?> | |
| 41 | - <div id="convertkit-setup-wizard-progress"> | |
| 42 | - <ol> | |
| 32 | + <div id="convertkit-setup-wizard-progress"> | |
| 33 | + <ol> | |
| 34 | + <?php | |
| 35 | + foreach ( $this->steps as $step_count => $step ) { | |
| 36 | + ?> | |
| 37 | + <li class="step-<?php echo esc_attr( $step_count ); ?><?php echo ( $step_count <= $this->step ? ' done' : '' ); ?>"><?php echo esc_html( $step['name'] ); ?></li> | |
| 43 | 38 | <?php |
| 44 | - $step_count = 1; | |
| 45 | - foreach ( $this->steps as $step_name => $step ) { | |
| 46 | - ?> | |
| 47 | - <li class="step-<?php echo esc_attr( $step_name ); ?><?php echo ( $step_count <= $this->get_current_step_number() ? ' done' : '' ); ?>"><?php echo esc_html( $step['name'] ); ?></li> | |
| 48 | - <?php | |
| 49 | - ++$step_count; | |
| 50 | - } | |
| 51 | - ?> | |
| 52 | - </ol> | |
| 53 | - </div> | |
| 54 | - <?php | |
| 55 | - } | |
| 39 | + } | |
| 40 | + ?> | |
| 41 | + </ol> | |
| 42 | + </div> | |
| 56 | 43 | |
| 44 | + <?php | |
| 57 | 45 | // If an error occured, display an error notice. |
| 58 | 46 | if ( $this->error ) { |
| 59 | 47 | ?> |
| 60 | 48 | <div class="notice notice-error is-dismissible"> |
| @@ -68,20 +56,14 @@ | ||
| 68 | 56 | |
| 69 | 57 | <div id="convertkit-setup-wizard-body"> |
| 70 | 58 | <form action="<?php echo esc_attr( $this->next_step_url ); ?>" method="POST"> |
| 71 | 59 | <div id="convertkit-setup-wizard-content"> |
| 72 | - <?php | |
| 73 | - if ( ! $this->is_modal() ) { | |
| 60 | + <div id="convertkit-setup-wizard-step"> | |
| 61 | + <?php | |
| 62 | + echo sprintf( | |
| 63 | + /* translators: %1$s: Current Step, %2$s: Total Steps */ | |
| 64 | + esc_html__( 'Step %1$s of %2$s', 'convertkit' ), | |
| 65 | + esc_html( $this->step ), | |
| 66 | + esc_html( count( $this->steps ) ) | |
| 67 | + ); | |
| 74 | 68 | ?> |
| 75 | - <div id="convertkit-setup-wizard-step"> | |
| 76 | - <?php | |
| 77 | - printf( | |
| 78 | - /* translators: %1$s: Current Step, %2$s: Total Steps */ | |
| 79 | - esc_html__( 'Step %1$s of %2$s', 'convertkit' ), | |
| 80 | - esc_html( $this->get_current_step_number() ), | |
| 81 | - esc_html( $this->get_total_steps() ) | |
| 82 | - ); | |
| 83 | - ?> | |
| 84 | - </div> | |
| 85 | - <?php | |
| 86 | - } | |
| 87 | - ?> | |
| 69 | + </div> | |
