| @@ -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( CONVERTKIT_PLUGIN_NAME ); ?> ‹ <?php bloginfo( 'name' ); ?> — WordPress</title> | |
| 15 | + <title><?php echo esc_html( 'Kit' ); ?> ‹ <?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 |
| @@ -27,9 +27,9 @@ | ||
| 27 | 27 | <?php |
| 28 | 28 | if ( ! $this->is_modal() ) { |
| 29 | 29 | ?> |
| 30 | 30 | <header id="convertkit-setup-wizard-header"> |
| 31 | - <h1><?php echo esc_html( CONVERTKIT_PLUGIN_NAME ); ?></h1> | |
| 31 | + <h1><?php echo esc_html( 'Kit' ); ?></h1> | |
| 32 | 32 | </header> |
| 33 | 33 | <?php |
| 34 | 34 | } |
| 35 | 35 | ?> |
| @@ -40,12 +40,14 @@ | ||
| 40 | 40 | ?> |
| 41 | 41 | <div id="convertkit-setup-wizard-progress"> |
| 42 | 42 | <ol> |
| 43 | 43 | <?php |
| 44 | - foreach ( $this->steps as $step_count => $step ) { | |
| 44 | + $step_count = 1; | |
| 45 | + foreach ( $this->steps as $step_name => $step ) { | |
| 45 | 46 | ?> |
| 46 | - <li class="step-<?php echo esc_attr( $step_count ); ?><?php echo ( $step_count <= $this->step ? ' done' : '' ); ?>"><?php echo esc_html( $step['name'] ); ?></li> | |
| 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> | |
| 47 | 48 | <?php |
| 49 | + ++$step_count; | |
| 48 | 50 | } |
| 49 | 51 | ?> |
| 50 | 52 | </ol> |
| 51 | 53 | </div> |
| @@ -66,14 +68,20 @@ | ||
| 66 | 68 | |
| 67 | 69 | <div id="convertkit-setup-wizard-body"> |
| 68 | 70 | <form action="<?php echo esc_attr( $this->next_step_url ); ?>" method="POST"> |
| 69 | 71 | <div id="convertkit-setup-wizard-content"> |
| 70 | - <div id="convertkit-setup-wizard-step"> | |
| 72 | + <?php | |
| 73 | + if ( ! $this->is_modal() ) { | |
| 74 | + ?> | |
| 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> | |
| 71 | 85 | <?php |
| 72 | - printf( | |
| 73 | - /* translators: %1$s: Current Step, %2$s: Total Steps */ | |
| 74 | - esc_html__( 'Step %1$s of %2$s', 'convertkit' ), | |
| 75 | - esc_html( $this->step ), | |
| 76 | - esc_html( count( $this->steps ) ) | |
| 77 | - ); | |
| 78 | - ?> | |
| 79 | - </div> | |
| 86 | + } | |
| 87 | + ?> | |
