setup-wizard.php: 4.0.3 vs 3.10.15 · Visualizer – Tables & Charts Manager with Built-in AI Generator

← All changes | templates/setup-wizard.php +334 -177 3.10.15 → 4.0.3 View file →

		@@ -14,10 +14,13 @@
14	14	admin_url( 'admin.php' )
15	15	);
16	16
17	17	$chart_id = ! empty( $this->wizard_data['chart_id'] ) ? (int) $this->wizard_data['chart_id'] : '';
	18	+$chart_type_default = ! empty( $this->wizard_data['chart_type'] ) ? $this->wizard_data['chart_type'] : 'pie';
18	19	$wp_optimole_active = is_plugin_active( 'optimole-wp/optimole-wp.php' );
19		-$last_step_number = 5;
	20	+$wp_otter_active = is_plugin_active( 'otter-blocks/otter-blocks.php' );
	21	+$wp_spc_active = is_plugin_active( 'wp-cloudflare-page-cache/wp-cloudflare-super-page-cache.php' );
	22	+$last_step_number = 3;
20	23
21	24	// Check if we are in the Live Preview which is used to showcase only the plugin features without any other distractions. Ideal for marketing purposes (like Live Preview on WordPress.org or on the plugin's website)
22	25	$is_live_preview = ! empty( $_GET['env'] ) ? ( 'preview' === sanitize_key( $_GET['env'] ) ) : false;
23	26
		@@ -50,33 +53,14 @@
50	53	<a class="nav-link" href="#step-2">
51	54	2
52	55	</a>
53	56	</li>
54		- <li class="nav-item">
55		- <a class="nav-link" href="#step-3">
56		- 3
57		- </a>
58		- </li>
59	57	<?php if ( ! $is_live_preview ) { ?>
60		- <?php if ( ! $wp_optimole_active ) : ?>
61		- <li class="nav-item">
62		- <a class="nav-link" href="#step-4">
63		- 4
64		- </a>
65		- </li>
66		- <li class="nav-item">
67		- <a class="nav-link" href="#step-5">
68		- 5
69		- </a>
70		- </li>
71		- <?php else : ?>
72		- <?php $last_step_number = 4; ?>
73		- <li class="nav-item">
74		- <a class="nav-link" href="#step-4">
75		- 4
76		- </a>
77		- </li>
78		- <?php endif; ?>
	58	+ <li class="nav-item">
	59	+ <a class="nav-link" href="#step-3">
	60	+ 3
	61	+ </a>
	62	+ </li>
79	63	<?php } ?>
80	64	</ul>
81	65	<div class="tab-content">
82	66	<div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
		@@ -83,11 +67,11 @@
83	67	<div class="vz-accordion-item">
84	68	<div class="vz-accordion-item__title">
85	69	<div class="vz-accordion-item__button">
86	70	<h2 class="h2 pb-8">
87		- <?php esc_html_e( 'Select chart from the below available options', 'visualizer' ); ?></h2>
	71	+ <?php esc_html_e( 'Select a chart from the options available below', 'visualizer' ); ?></h2>
88	72	<p class="p">
89		- <?php esc_html_e( 'Pro tip: Keep your requirements in mind and select best chart for it', 'visualizer' ); ?>
	73	+ <?php esc_html_e( 'Pro tip: Keep your requirements in mind and choose the best chart to meet them.', 'visualizer' ); ?>
90	74	</p>
91	75	</div>
92	76	</div>
93	77	<div class="vz-accordion-item__content border-top">
		@@ -96,9 +80,9 @@
96	80	<div class="vz-chart-list">
97	81	<ul>
98	82	<li>
99	83	<label class="vz-chart-option" for="vz-chart-1">
100		- <input type="radio" class="vz-radio-btn" id="vz-chart-1" name="visualizer[wizard_data][chart_type]" value="pie">
	84	+ <input type="radio" class="vz-radio-btn" id="vz-chart-1" name="visualizer[wizard_data][chart_type]" value="pie" <?php echo checked( $chart_type_default, 'pie', false ); ?>>
101	85	<h3 class="h3"><?php esc_html_e( 'Pie/Donut chart', 'visualizer' ); ?></h3>
102	86	<div class="img type-box-pie"></div>
103	87	<div class="bg"></div>
104	88	</label>
		@@ -104,9 +88,9 @@
104	88	</label>
105	89	</li>
106	90	<li>
107	91	<label class="vz-chart-option" for="vz-chart-2">
108		- <input type="radio" class="vz-radio-btn" id="vz-chart-2" name="visualizer[wizard_data][chart_type]" value="bar">
	92	+ <input type="radio" class="vz-radio-btn" id="vz-chart-2" name="visualizer[wizard_data][chart_type]" value="bar" <?php echo checked( $chart_type_default, 'bar', false ); ?>>
109	93	<h3 class="h3"><?php esc_html_e( 'Bar chart', 'visualizer' ); ?></h3>
110	94	<div class="img type-box-bar"></div>
111	95	<div class="bg"></div>
112	96	</label>
		@@ -112,9 +96,9 @@
112	96	</label>
113	97	</li>
114	98	<li>
115	99	<label class="vz-chart-option" for="vz-chart-3">
116		- <input type="radio" class="vz-radio-btn" id="vz-chart-3" name="visualizer[wizard_data][chart_type]" value="line">
	100	+ <input type="radio" class="vz-radio-btn" id="vz-chart-3" name="visualizer[wizard_data][chart_type]" value="line" <?php echo checked( $chart_type_default, 'line', false ); ?>>
117	101	<h3 class="h3"><?php esc_html_e( 'Line chart', 'visualizer' ); ?></h3>
118	102	<div class="img type-box-line"></div>
119	103	<div class="bg"></div>
120	104	</label>
		@@ -120,9 +104,9 @@
120	104	</label>
121	105	</li>
122	106	<li>
123	107	<label class="vz-chart-option" for="vz-chart-4">
124		- <input type="radio" class="vz-radio-btn" id="vz-chart-4" name="visualizer[wizard_data][chart_type]" value="tabular">
	108	+ <input type="radio" class="vz-radio-btn" id="vz-chart-4" name="visualizer[wizard_data][chart_type]" value="tabular" <?php echo checked( $chart_type_default, 'tabular', false ); ?>>
125	109	<h3 class="h3"><?php esc_html_e( 'Table', 'visualizer' ); ?></h3>
126	110	<div class="img type-box-tabular"></div>
127	111	<div class="bg"></div>
128	112	</label>
		@@ -132,9 +116,9 @@
132	116	<label class="vz-chart-option">
133	117	<input type="radio" class="vz-radio-btn" id="vz-chart-5" readonly>
134	118	<div class="vz-pro-label-wrap">
135	119	<h3><?php esc_html_e( 'Geo chart', 'visualizer' ); ?></h3>
136		- <span class="pro-label"><?php esc_html_e( 'PRO', 'visualizer' ); ?></span>
	120	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
137	121	</div>
138	122	<div class="img type-box-geo"></div>
139	123	<div class="bg"></div>
140	124	</label>
		@@ -146,27 +130,210 @@
146	130	</div>
147	131	</div>
148	132	</li>
149	133	<li>
150		- <div class="vz-power-pro">
151		- <h3 class="h3"><?php esc_html_e( 'Discover the power of PRO!', 'visualizer' ); ?></h3>
152		- <ul>
153		- <li><?php esc_html_e( '11 more chart types', 'visualizer' ); ?></li>
154		- <li><?php esc_html_e( 'Private charts', 'visualizer' ); ?></li>
155		- <li><?php esc_html_e( 'Auto-sync with online files', 'visualizer' ); ?></li>
156		- <li>
157		- <?php esc_html_e( 'Frontend Actions(Print, Export, Copy, Download', 'visualizer' ); ?>)
158		- </li>
159		- <li><?php esc_html_e( 'Create charts from WordPress tables', 'visualizer' ); ?></li>
160		- </ul>
161		- <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>" class="btn btn-secondary" target="_blank"><?php esc_html_e( 'View more features', 'visualizer' ); ?></a>
	134	+ <div class="vz-pro-option">
	135	+ <label class="vz-chart-option">
	136	+ <input type="radio" class="vz-radio-btn" id="vz-chart-6" readonly>
	137	+ <div class="vz-pro-label-wrap">
	138	+ <h3><?php esc_html_e( 'Area chart', 'visualizer' ); ?></h3>
	139	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	140	+ </div>
	141	+ <div class="img type-box-area"></div>
	142	+ <div class="bg"></div>
	143	+ </label>
	144	+ <div class="pro-overlay">
	145	+ <div class="pro-box">
	146	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	147	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	148	+ </div>
	149	+ </div>
162	150	</div>
163	151	</li>
	152	+ <li>
	153	+ <div class="vz-pro-option">
	154	+ <label class="vz-chart-option">
	155	+ <input type="radio" class="vz-radio-btn" id="vz-chart-7" readonly>
	156	+ <div class="vz-pro-label-wrap">
	157	+ <h3><?php esc_html_e( 'Column chart', 'visualizer' ); ?></h3>
	158	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	159	+ </div>
	160	+ <div class="img type-box-column"></div>
	161	+ <div class="bg"></div>
	162	+ </label>
	163	+ <div class="pro-overlay">
	164	+ <div class="pro-box">
	165	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	166	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	167	+ </div>
	168	+ </div>
	169	+ </div>
	170	+ </li>
	171	+ <li>
	172	+ <div class="vz-pro-option">
	173	+ <label class="vz-chart-option">
	174	+ <input type="radio" class="vz-radio-btn" id="vz-chart-8" readonly>
	175	+ <div class="vz-pro-label-wrap">
	176	+ <h3><?php esc_html_e( 'Bubble chart', 'visualizer' ); ?></h3>
	177	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	178	+ </div>
	179	+ <div class="img type-box-bubble"></div>
	180	+ <div class="bg"></div>
	181	+ </label>
	182	+ <div class="pro-overlay">
	183	+ <div class="pro-box">
	184	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	185	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	186	+ </div>
	187	+ </div>
	188	+ </div>
	189	+ </li>
	190	+ <li>
	191	+ <div class="vz-pro-option">
	192	+ <label class="vz-chart-option">
	193	+ <input type="radio" class="vz-radio-btn" id="vz-chart-9" readonly>
	194	+ <div class="vz-pro-label-wrap">
	195	+ <h3><?php esc_html_e( 'Scatter chart', 'visualizer' ); ?></h3>
	196	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	197	+ </div>
	198	+ <div class="img type-box-scatter"></div>
	199	+ <div class="bg"></div>
	200	+ </label>
	201	+ <div class="pro-overlay">
	202	+ <div class="pro-box">
	203	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	204	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	205	+ </div>
	206	+ </div>
	207	+ </div>
	208	+ </li>
	209	+ <li>
	210	+ <div class="vz-pro-option">
	211	+ <label class="vz-chart-option">
	212	+ <input type="radio" class="vz-radio-btn" id="vz-chart-10" readonly>
	213	+ <div class="vz-pro-label-wrap">
	214	+ <h3><?php esc_html_e( 'Gauge chart', 'visualizer' ); ?></h3>
	215	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	216	+ </div>
	217	+ <div class="img type-box-gauge"></div>
	218	+ <div class="bg"></div>
	219	+ </label>
	220	+ <div class="pro-overlay">
	221	+ <div class="pro-box">
	222	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	223	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	224	+ </div>
	225	+ </div>
	226	+ </div>
	227	+ </li>
	228	+ <li>
	229	+ <div class="vz-pro-option">
	230	+ <label class="vz-chart-option">
	231	+ <input type="radio" class="vz-radio-btn" id="vz-chart-11" readonly>
	232	+ <div class="vz-pro-label-wrap">
	233	+ <h3><?php esc_html_e( 'Candlestick chart', 'visualizer' ); ?></h3>
	234	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	235	+ </div>
	236	+ <div class="img type-box-candlestick"></div>
	237	+ <div class="bg"></div>
	238	+ </label>
	239	+ <div class="pro-overlay">
	240	+ <div class="pro-box">
	241	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	242	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	243	+ </div>
	244	+ </div>
	245	+ </div>
	246	+ </li>
	247	+ <li>
	248	+ <div class="vz-pro-option">
	249	+ <label class="vz-chart-option">
	250	+ <input type="radio" class="vz-radio-btn" id="vz-chart-12" readonly>
	251	+ <div class="vz-pro-label-wrap">
	252	+ <h3><?php esc_html_e( 'Timeline', 'visualizer' ); ?></h3>
	253	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	254	+ </div>
	255	+ <div class="img type-box-timeline"></div>
	256	+ <div class="bg"></div>
	257	+ </label>
	258	+ <div class="pro-overlay">
	259	+ <div class="pro-box">
	260	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	261	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	262	+ </div>
	263	+ </div>
	264	+ </div>
	265	+ </li>
	266	+ <li>
	267	+ <div class="vz-pro-option">
	268	+ <label class="vz-chart-option">
	269	+ <input type="radio" class="vz-radio-btn" id="vz-chart-13" readonly>
	270	+ <div class="vz-pro-label-wrap">
	271	+ <h3><?php esc_html_e( 'Combo', 'visualizer' ); ?></h3>
	272	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	273	+ </div>
	274	+ <div class="img type-box-combo"></div>
	275	+ <div class="bg"></div>
	276	+ </label>
	277	+ <div class="pro-overlay">
	278	+ <div class="pro-box">
	279	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	280	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	281	+ </div>
	282	+ </div>
	283	+ </div>
	284	+ </li>
	285	+ <li>
	286	+ <div class="vz-pro-option">
	287	+ <label class="vz-chart-option">
	288	+ <input type="radio" class="vz-radio-btn" id="vz-chart-14" readonly>
	289	+ <div class="vz-pro-label-wrap">
	290	+ <h3><?php esc_html_e( 'Polar Area', 'visualizer' ); ?></h3>
	291	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	292	+ </div>
	293	+ <div class="img type-box-polarArea"></div>
	294	+ <div class="bg"></div>
	295	+ </label>
	296	+ <div class="pro-overlay">
	297	+ <div class="pro-box">
	298	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	299	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	300	+ </div>
	301	+ </div>
	302	+ </div>
	303	+ </li>
	304	+ <li>
	305	+ <div class="vz-pro-option">
	306	+ <label class="vz-chart-option">
	307	+ <input type="radio" class="vz-radio-btn" id="vz-chart-15" readonly>
	308	+ <div class="vz-pro-label-wrap">
	309	+ <h3><?php esc_html_e( 'Radar', 'visualizer' ); ?></h3>
	310	+ <span class="pro-label"><?php esc_html_e( 'PREMIUM', 'visualizer' ); ?></span>
	311	+ </div>
	312	+ <div class="img type-box-radar"></div>
	313	+ <div class="bg"></div>
	314	+ </label>
	315	+ <div class="pro-overlay">
	316	+ <div class="pro-box">
	317	+ <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>"
	318	+ class="btn btn-secondary" target="_blank"><?php esc_html_e( 'Upgrade to Pro', 'visualizer' ); ?></a>
	319	+ </div>
	320	+ </div>
	321	+ </div>
	322	+ </li>
164	323	</ul>
165	324	</div>
166	325	</div>
167	326	<div class="form-block">
168	327	<button class="btn btn-primary disabled" data-step_number="1"><?php esc_html_e( 'Save And Continue', 'visualizer' ); ?> <span class="dashicons dashicons-arrow-right-alt"></span></button>
	328	+ <span class="spinner"></span>
	329	+ <div class="vz-import-status" style="display: none;">
	330	+ <div class="vz-error-notice notice notice-error hidden"></div>
	331	+ <p class="p pb-8" data-import_message="<?php esc_attr_e( 'Done! Demo data has been successfully imported.', 'visualizer' ); ?>" data-import_initial="<?php esc_attr_e( 'Importing demo data for your selected chart...', 'visualizer' ); ?>"><?php esc_html_e( 'Importing demo data for your selected chart...', 'visualizer' ); ?></p>
	332	+ <div class="vz-progress">
	333	+ <div class="vz-progress-bar"></div>
	334	+ </div>
	335	+ </div>
169	336	</div>
170	337	</div>
171	338	</div>
172	339	</div>
		@@ -174,87 +341,47 @@
174	341	<div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
175	342	<div class="vz-accordion-item">
176	343	<div class="vz-accordion-item__title">
177	344	<div class="vz-accordion-item__button">
178		- <h2 class="h2 pb-8"><?php esc_html_e( 'You\'re almost done!', 'visualizer' ); ?></h2>
179		- <p class="p"><?php esc_html_e( 'We use demo data during the import process, dont worry you can customize it later', 'visualizer' ); ?></p>
	345	+ <h2 class="h2 pb-8"><?php esc_html_e( 'Insert a chart into the draft page', 'visualizer' ); ?></h2>
	346	+ <p class="p"><?php esc_html_e( 'Create a draft page featuring a Visualizer chart with just one click.', 'visualizer' ); ?></p>
180	347	</div>
181	348	</div>
182		- <div class="vz-accordion-item__content">
	349	+ <div class="vz-accordion-item__content border-top">
183	350	<div class="vz-form-wrap">
184		- <div class="form-block" style="padding-top: 8px">
185		- <div class="vz-error-notice notice notice-error hidden"></div>
186		- <div class="pb-30">
	351	+ <div class="form-block">
	352	+ <div class="vz-accordion-item vz-features-accordion mb-0">
187	353	<div class="vz-shortcode-preview-box">
188		- <div class="vz-shortcode-preview-title border-0">
189		- <div class="icon">
190		- <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/database-icon.png' ); ?>" alt="">
	354	+ <div class="vz-accordion-item__title vz-accordion-checkbox__title vz-accordion-title--static">
	355	+ <div class="vz-checkbox">
	356	+ <input type="checkbox" class="vz-checkbox-btn" id="insert_shortcode" checked <?php echo $is_live_preview ? 'disabled' : ''; ?>>
191	357	</div>
192		- <div class="txt" style="width: 100%;">
193		- <h4 class="h4 pb-4"><?php esc_html_e( 'Importing demo data', 'visualizer' ); ?></h4>
194		- <p class="p" data-import_message="<?php esc_attr_e( 'Done! Demo data imported successfully.', 'visualizer' ); ?>"><?php esc_html_e( 'Hold on! we are importing demo data for your selected chart', 'visualizer' ); ?></p>
195		- <div class="vz-progress" style="margin-top: 4px;">
196		- <div class="vz-progress-bar"></div>
	358	+ <div>
	359	+ <div class="vz-accordion__step-title h4 pb-4"><?php esc_html_e( 'Create a draft page', 'visualizer' ); ?></div>
	360	+ <p class="help-text"><?php esc_html_e( 'We will automatically create a draft page with Visualizer chart for preview', 'visualizer' ); ?></p>
197	361	</div>
198		- </div>
199	362	</div>
200		- </div>
201		- </div>
202		- <p class="help-text help-text-primary pb-16"><?php esc_html_e( 'Import data from other Charts, WordPress, DataBase, or Manual Data with Visualizer', 'visualizer' ); ?> <a href="<?php echo esc_url( tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'setupWizard' ) ); ?>" target="_blank"><?php esc_html_e( 'Premium version', 'visualizer' ); ?></a></p>
203		- </div>
204		- <div class="form-block"><button class="btn btn-primary disabled" data-step_number="3"><?php esc_html_e( 'Continue', 'visualizer' ); ?> <span class="dashicons dashicons-arrow-right-alt"></span></button>
205		- </div>
206		- </div>
207		- </div>
208		- </div>
209		- </div>
210		- <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
211		- <div class="vz-accordion-item">
212		- <div class="vz-accordion-item__title">
213		- <div class="vz-accordion-item__button">
214		- <h2 class="h2 pb-8"><?php esc_html_e( 'Insert chart into the draft page', 'visualizer' ); ?></h2>
215		- <p class="p"><?php esc_html_e( 'Create a draft page with a Visualizer chart with just one click', 'visualizer' ); ?></p>
216		- </div>
217		- </div>
218		- <div class="vz-accordion-item__content border-top">
219		- <div class="vz-form-wrap">
220		- <div class="form-block">
221		- <div class="vz-accordion">
222		- <div class="vz-accordion-item vz-features-accordion mb-0">
223		- <div class="vz-shortcode-preview-box">
224		- <div class="vz-accordion-item__title vz-accordion-checkbox__title">
225		- <div class="vz-checkbox">
226		- <input type="checkbox" class="vz-checkbox-btn" id="insert_shortcode" checked <?php echo $is_live_preview ? 'disabled' : ''; ?>>
227		- </div>
228		- <button type="button" class="vz-accordion-item__button">
229		- <div class="vz-accordion__step-title h4 pb-4"><?php esc_html_e( 'Create a draft page', 'visualizer' ); ?></div>
230		- <p class="help-text"><?php esc_html_e( 'We will automatically create a draft page with Visualizer chart for preview', 'visualizer' ); ?></p>
231		- <div class="vz-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span>
	363	+ <div class="vz-accordion-item__content vz-accordion-content--static">
	364	+ <div class="vz-shortcode-preview-content">
	365	+ <?php $shortcode = '[visualizer id="{{chart_id}}" class=""]'; ?>
	366	+ <?php if ( $is_live_preview ) { ?>
	367	+ <p class="pb-16"><?php esc_html_e( 'Charts are added in the page/post via Gutenberg Blocks.', 'visualizer' ); ?></p>
	368	+ <p class="pb-16"><?php esc_html_e( 'Alternatively, you can use a shortcode with the following structure:', 'visualizer' ); ?></p>
	369	+ <?php } else { ?>
	370	+ <h4 class="h4 pb-16"><?php esc_html_e( 'Chart preview', 'visualizer' ); ?></h4>
	371	+ <div class="vz-chart pb-30">
	372	+ <?php
	373	+ if ( ! empty( $_GET['preview_chart'] ) ) {
	374	+ $shortcode = str_replace( '{{chart_id}}', $chart_id, $shortcode );
	375	+ echo do_shortcode( $shortcode );
	376	+ }
	377	+ ?>
232	378	</div>
233		- </button>
234		- </div>
235		- <div class="vz-accordion-item__content">
236		- <div class="vz-shortcode-preview-content">
237		- <?php $shortcode = '[visualizer id="{{chart_id}}" lazy="" class=""]'; ?>
238		- <?php if ( $is_live_preview ) { ?>
239		- <p class="pb-16"><?php esc_html_e( 'Charts are added in the page/post via Gutenberg Blocks.', 'visualizer' ); ?></p>
240		- <p class="pb-16"><?php esc_html_e( 'Alternatively, you can use a shortcode with the following structure:', 'visualizer' ); ?></p>
241		- <?php } else { ?>
242		- <h4 class="h4 pb-16"><?php esc_html_e( 'Chart preview', 'visualizer' ); ?></h4>
243		- <div class="vz-chart pb-30">
244		- <?php
245		- if ( ! empty( $_GET['preview_chart'] ) ) {
246		- $shortcode = str_replace( '{{chart_id}}', $chart_id, $shortcode );
247		- echo do_shortcode( $shortcode );
248		- }
249		- ?>
250		- </div>
251		- <?php } ?>
252		- <div class="vz-code-box">
253		- <input type="text" id="basic_shortcode" value="<?php echo esc_attr( $shortcode ); ?>" readonly>
254		- <button type="button" class="vz-copy-code-btn" data-clipboard-target="#basic_shortcode"><?php esc_html_e( 'click to copy', 'visualizer' ); ?> <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/copy.svg' ); ?>" alt="">
255		- </button>
256		- </div>
	379	+ <?php } ?>
	380	+ <div class="vz-code-box">
	381	+ <input type="text" id="basic_shortcode" value="<?php echo esc_attr( $shortcode ); ?>" readonly>
	382	+ <button type="button" class="vz-copy-code-btn" data-clipboard-target="#basic_shortcode"><?php esc_html_e( 'click to copy', 'visualizer' ); ?> <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/copy.svg' ); ?>" alt="">
	383	+ </button>
257	384	</div>
258	385	</div>
259	386	</div>
260	387	</div>
		@@ -267,90 +394,120 @@
267	394	</div>
268	395	</div>
269	396	</div>
270	397	</div>
271		- <?php if ( ! $wp_optimole_active && ! $is_live_preview ) { ?>
272		- <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
	398	+ <?php if ( ! $is_live_preview ) { ?>
	399	+ <div id="step-<?php echo esc_attr( $last_step_number ); ?>" class="tab-pane" role="tabpanel" aria-labelledby="step-<?php echo esc_attr( $last_step_number ); ?>">
273	400	<div class="vz-accordion-item">
274	401	<div class="vz-accordion-item__title">
275	402	<div class="vz-accordion-item__button">
276		- <h2 class="h2 pb-8"><?php esc_html_e( 'Extra Features', 'visualizer' ); ?></h2>
277		- <p class="p"><?php esc_html_e( 'We\'re confident you\'ll see the improvements. Otherwise, you can remove it anytime', 'visualizer' ); ?></p>
	403	+ <h2 class="h2 pb-8"><?php esc_html_e( 'You\'re all set!', 'visualizer' ); ?></h2>
	404	+ <p class="p"><?php esc_html_e( 'Optionally enhance your site and stay updated.', 'visualizer' ); ?></p>
278	405	</div>
279	406	</div>
280	407	<div class="vz-accordion-item__content border-top">
281	408	<div class="vz-form-wrap">
282		- <div class="form-block">
	409	+ <div class="form-block no-sep vz-final-block">
283	410	<div class="vz-error-notice notice notice-error hidden"></div>
284		- <div class="vz-accordion">
285		- <div class="vz-accordion-item vz-features-accordion mb-0">
286		- <div class="vz-accordion-item__title vz-accordion-checkbox__title">
287		- <div class="vz-checkbox">
288		- <input type="checkbox" class="vz-checkbox-btn" checked>
	411	+ <div class="vz-final-options">
	412	+ <div class="vz-option-card">
	413	+ <label class="vz-option-check">
	414	+ <input type="checkbox" id="enable_performance" <?php echo $wp_optimole_active ? 'checked disabled' : 'checked'; ?>>
	415	+ </label>
	416	+ <div class="vz-option-icon">
	417	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/boost-logo.png' ); ?>" width="37" height="30" alt="">
	418	+ </div>
	419	+ <div class="vz-option-body">
	420	+ <div class="vz-option-title">
	421	+ <?php esc_html_e( 'Boost your website speed', 'visualizer' ); ?>
	422	+ <span class="pro-label free-label"><?php esc_html_e( 'Free', 'visualizer' ); ?></span>
289	423	</div>
290		- <button type="button" class="vz-accordion-item__button">
291		- <div class="vz-accordion__step-title h4 pb-4"><?php esc_html_e( 'Enable perfomance features for your website.', 'visualizer' ); ?></div>
292		- <p class="help-text"><?php esc_html_e( 'Optimise and speed up your site with our trusted addon - Its Free', 'visualizer' ); ?></p>
293		- <div class="vz-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span>
294		- </div>
295		- </button>
	424	+ <p class="help-text">
	425	+ <?php
	426	+ if ( $wp_optimole_active ) {
	427	+ esc_html_e( 'Optimole is already active on your site.', 'visualizer' );
	428	+ } else {
	429	+ esc_html_e( 'Improve your website speed and images by 80% with Optimole.', 'visualizer' );
	430	+ }
	431	+ ?>
	432	+ </p>
296	433	</div>
297		- <div class="vz-accordion-item__content">
298		- <div class="vz-features-list">
299		- <ul>
300		- <li>
301		- <div class="icon">
302		- <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/boost-logo.png' ); ?>" width="37" height="30" alt="">
303		- </div>
304		- <div class="txt">
305		- <div class="h4 pb-4"><?php esc_html_e( 'Boost your website speed', 'visualizer' ); ?> <span class="pro-label free-label"><?php esc_html_e( 'Free', 'visualizer' ); ?></span></div>
306		- <p class="help-text"><?php esc_html_e( 'Improve your website speed and images by 80% with', 'visualizer' ); ?> <a href="<?php echo esc_url( tsdk_utmify( 'https://optimole.com/', 'VisualizerSetupWizard' ) ); ?>" target="_blank"><?php esc_html_e( 'Optimole', 'visualizer' ); ?></a></p>
307		- </div>
308		- </li>
309		- </ul>
	434	+ <span class="vz-install-status" data-install-status="optimole-wp"></span>
	435	+ </div>
	436	+ <div class="vz-option-card">
	437	+ <label class="vz-option-check">
	438	+ <input type="checkbox" id="enable_otter_blocks" <?php echo $wp_otter_active ? 'checked disabled' : 'checked'; ?>>
	439	+ </label>
	440	+ <div class="vz-option-icon">
	441	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/otter-logo.png' ); ?>" width="28" height="28" alt="">
	442	+ </div>
	443	+ <div class="vz-option-body">
	444	+ <div class="vz-option-title">
	445	+ <?php esc_html_e( 'Build better pages', 'visualizer' ); ?>
	446	+ <span class="pro-label free-label"><?php esc_html_e( 'Free', 'visualizer' ); ?></span>
310	447	</div>
	448	+ <p class="help-text">
	449	+ <?php
	450	+ if ( $wp_otter_active ) {
	451	+ esc_html_e( 'Otter Blocks is already active on your site.', 'visualizer' );
	452	+ } else {
	453	+ esc_html_e( 'Add powerful Gutenberg blocks for layouts, forms, and more with Otter Blocks.', 'visualizer' );
	454	+ }
	455	+ ?>
	456	+ </p>
311	457	</div>
	458	+ <span class="vz-install-status" data-install-status="otter-blocks"></span>
312	459	</div>
313		- </div>
314		- </div>
315		- <div class="form-block">
316		- <button class="btn btn-primary vz-wizard-install-plugin" data-step_number="4"><?php esc_html_e( 'Improve now', 'visualizer' ); ?>
317		- <button class="btn btn-primary next-btn skip-improvement" style="display: none;"><?php esc_html_e( 'Skip Improvement', 'visualizer' ); ?></button>
318		- <span class="spinner"></span>
319		- </div>
320		- </div>
321		- </div>
322		- </div>
323		- </div>
324		- <?php } ?>
325		- <?php if ( ! $is_live_preview ) { ?>
326		- <div id="step-<?php echo esc_attr( $last_step_number ); ?>" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
327		- <div class="vz-accordion-item">
328		- <div class="vz-accordion-item__title">
329		- <div class="vz-accordion-item__button">
330		- <h2 class="h2 pb-8"><?php esc_html_e( 'Updates, tutorials, special offers & more', 'visualizer' ); ?></h2>
331		- <p class="p"><?php esc_html_e( 'Get exclusive access of Visualizer newsletter', 'visualizer' ); ?></p>
332		- </div>
333		- </div>
334		- <div class="vz-accordion-item__content border-top">
335		- <div class="vz-form-wrap">
336		- <div class="form-block">
337		- <div class="vz-newsletter-wrap">
338		- <div class="vz-newsletter">
339		- <p class="p pb-30"><?php esc_html_e( 'Let us know your email so that we can send you product updates, helpful tutorials, exclusive offers and more useful stuff.', 'visualizer' ); ?></p>
340		- <div class="vz-form-group">
341		- <input type="email" class="form-control" id="vz_subscribe_email" placeholder="<?php echo esc_attr( get_bloginfo( 'admin_email' ) ); ?>">
	460	+ <div class="vz-option-card">
	461	+ <label class="vz-option-check">
	462	+ <input type="checkbox" id="enable_page_cache" <?php echo $wp_spc_active ? 'checked disabled' : 'checked'; ?>>
	463	+ </label>
	464	+ <div class="vz-option-icon">
	465	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/spc-logo.svg' ); ?>" width="28" height="28" alt="">
342	466	</div>
	467	+ <div class="vz-option-body">
	468	+ <div class="vz-option-title">
	469	+ <?php esc_html_e( 'Cache your pages', 'visualizer' ); ?>
	470	+ <span class="pro-label free-label"><?php esc_html_e( 'Free', 'visualizer' ); ?></span>
	471	+ </div>
	472	+ <p class="help-text">
	473	+ <?php
	474	+ if ( $wp_spc_active ) {
	475	+ esc_html_e( 'Super Page Cache is already active on your site.', 'visualizer' );
	476	+ } else {
	477	+ esc_html_e( 'Make your site load faster with Super Page Cache for Cloudflare.', 'visualizer' );
	478	+ }
	479	+ ?>
	480	+ </p>
	481	+ </div>
	482	+ <span class="vz-install-status" data-install-status="wp-cloudflare-page-cache"></span>
343	483	</div>
344		- <div class="vz-newsletter-img">
345		- <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/newsletter-img.png' ); ?>" alt="">
	484	+ <div class="vz-option-card vz-option-card--newsletter">
	485	+ <label class="vz-option-check">
	486	+ <input type="checkbox" id="enable_newsletter" checked>
	487	+ </label>
	488	+ <div class="vz-option-icon">
	489	+ <span class="dashicons dashicons-email-alt"></span>
	490	+ </div>
	491	+ <div class="vz-option-body">
	492	+ <div class="vz-option-title"><?php esc_html_e( 'Stay in the loop', 'visualizer' ); ?></div>
	493	+ <p class="help-text">
	494	+ <?php esc_html_e( 'Get tutorials, tips, and special offers at', 'visualizer' ); ?>
	495	+ <span class="vz-email-text" data-email="<?php echo esc_attr( get_bloginfo( 'admin_email' ) ); ?>"><?php echo esc_html( get_bloginfo( 'admin_email' ) ); ?></span>
	496	+ <button type="button" class="vz-change-email"><?php esc_html_e( 'Change', 'visualizer' ); ?></button>
	497	+ <?php esc_html_e( '· Unsubscribe anytime.', 'visualizer' ); ?>
	498	+ </p>
	499	+ <div class="vz-option-input" style="display: none;">
	500	+ <input type="email" class="form-control" id="vz_subscribe_email" value="<?php echo esc_attr( get_bloginfo( 'admin_email' ) ); ?>">
	501	+ <button type="button" class="btn btn-primary vz-save-email"><?php esc_html_e( 'Save', 'visualizer' ); ?></button>
	502	+ </div>
	503	+ </div>
346	504	</div>
347	505	</div>
348	506	</div>
349	507	<div class="form-block">
350	508	<div class="vz-btn-group">
351		- <button class="btn btn-primary vz-subscribe" data-vz_subscribe="true"><?php esc_html_e( 'Send Me Access', 'visualizer' ); ?></button>
352		- <button class="btn btn-outline-primary vz-subscribe" data-vz_subscribe="false"><?php esc_html_e( 'Skip, Dont give me access', 'visualizer' ); ?></button>
	509	+ <button class="btn btn-primary vz-subscribe" data-vz_subscribe="true"><?php esc_html_e( 'Finish Setup', 'visualizer' ); ?></button>
353	510	<span class="spinner"></span>
354	511	</div>
355	512	</div>
356	513	</div>