← All changes | templates/setup-wizard.php +106 -116 3.10.14 → 3.10.7 View file →

		@@ -16,12 +16,8 @@
16	16
17	17	$chart_id = ! empty( $this->wizard_data['chart_id'] ) ? (int) $this->wizard_data['chart_id'] : '';
18	18	$wp_optimole_active = is_plugin_active( 'optimole-wp/optimole-wp.php' );
19	19	$last_step_number = 5;
20		-
21		-// 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		-$is_live_preview = ! empty( $_GET['env'] ) ? ( 'preview' === sanitize_key( $_GET['env'] ) ) : false;
23		-
24	20	?>
25	21	<div class="vz-wizard-wrap vz-wrap">
26	22	<div class="vz-header--small">
27	23	<div class="container">
		@@ -26,15 +22,16 @@
26	22	<div class="vz-header--small">
27	23	<div class="container">
28	24	<div class="vz-logo">
29	25	<div class="vz-logo-icon">
30		- <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/visualizer-logo.svg' ); ?>" width="136" height="54" alt="">
	26	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/visualizer-logo.svg' ); ?>" width="136" height="54"
	27	+ alt="">
31	28	</div>
32	29	</div>
33	30	<div class="back-btn">
34		- <a href="<?php echo esc_url( $dashboard_url ); ?>" class="btn-link">
35		- <span class="dashicons dashicons-arrow-left-alt"></span><?php esc_html_e( 'Go to dashboard', 'visualizer' ); ?>
36		- </a>
	31	+ <a href="<?php echo esc_url( $dashboard_url ); ?>" class="btn-link"><span
	32	+ class="dashicons dashicons-arrow-left-alt"></span>
	33	+ <?php esc_html_e( 'Go to dashboard', 'visualizer' ); ?></a>
37	34	</div>
38	35	</div>
39	36	</div>
40	37	<div class="container">
		@@ -55,29 +52,27 @@
55	52	<a class="nav-link" href="#step-3">
56	53	3
57	54	</a>
58	55	</li>
59		- <?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; ?>
79		- <?php } ?>
	56	+ <?php if ( ! $wp_optimole_active ) : ?>
	57	+ <li class="nav-item">
	58	+ <a class="nav-link" href="#step-4">
	59	+ 4
	60	+ </a>
	61	+ </li>
	62	+ <li class="nav-item">
	63	+ <a class="nav-link" href="#step-5">
	64	+ 5
	65	+ </a>
	66	+ </li>
	67	+ <?php else : ?>
	68	+ <?php $last_step_number = 4; ?>
	69	+ <li class="nav-item">
	70	+ <a class="nav-link" href="#step-4">
	71	+ 4
	72	+ </a>
	73	+ </li>
	74	+ <?php endif; ?>
80	75	</ul>
81	76	<div class="tab-content">
82	77	<div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
83	78	<div class="vz-accordion-item">
		@@ -177,12 +172,15 @@
177	172	<div class="vz-accordion-item__button">
178	173	<h2 class="h2 pb-8"><?php esc_html_e( 'You\'re almost done!', 'visualizer' ); ?></h2>
179	174	<p class="p"><?php esc_html_e( 'We use demo data during the import process, don&#x92;t worry you can customize it later', 'visualizer' ); ?></p>
180	175	</div>
	176	+ <div class="vz-progress">
	177	+ <div class="vz-progress-bar" style="width: 100%;"></div>
	178	+ </div>
181	179	</div>
182	180	<div class="vz-accordion-item__content">
183	181	<div class="vz-form-wrap">
184		- <div class="form-block" style="padding-top: 8px">
	182	+ <div class="form-block">
185	183	<div class="vz-error-notice notice notice-error hidden"></div>
186	184	<div class="pb-30">
187	185	<div class="vz-shortcode-preview-box">
188	186	<div class="vz-shortcode-preview-title border-0">
		@@ -188,15 +186,12 @@
188	186	<div class="vz-shortcode-preview-title border-0">
189	187	<div class="icon">
190	188	<img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/database-icon.png' ); ?>" alt="">
191	189	</div>
192		- <div class="txt" style="width: 100%;">
	190	+ <div class="txt">
193	191	<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>
	192	+ <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>
197	193	</div>
198		- </div>
199	194	</div>
200	195	</div>
201	196	</div>
202	197	<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>
		@@ -222,9 +217,9 @@
222	217	<div class="vz-accordion-item vz-features-accordion mb-0">
223	218	<div class="vz-shortcode-preview-box">
224	219	<div class="vz-accordion-item__title vz-accordion-checkbox__title">
225	220	<div class="vz-checkbox">
226		- <input type="checkbox" class="vz-checkbox-btn" id="insert_shortcode" checked <?php echo $is_live_preview ? 'disabled' : ''; ?>>
	221	+ <input type="checkbox" class="vz-checkbox-btn" id="insert_shortcode" checked>
227	222	</div>
228	223	<button type="button" class="vz-accordion-item__button">
229	224	<div class="vz-accordion__step-title h4 pb-4"><?php esc_html_e( 'Create a draft page', 'visualizer' ); ?></div>
230	225	<p class="help-text"><?php esc_html_e( 'We will automatically create a draft page with Visualizer chart for preview', 'visualizer' ); ?></p>
		@@ -233,16 +228,13 @@
233	228	</button>
234	229	</div>
235	230	<div class="vz-accordion-item__content">
236	231	<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 { ?>
	232	+ <div class="vz-shortcode-preview">
242	233	<h4 class="h4 pb-16"><?php esc_html_e( 'Chart preview', 'visualizer' ); ?></h4>
243	234	<div class="vz-chart pb-30">
244	235	<?php
	236	+ $shortcode = '[visualizer id="{{chart_id}}" lazy="" class=""]';
245	237	if ( ! empty( $_GET['preview_chart'] ) ) {
246	238	$shortcode = str_replace( '{{chart_id}}', $chart_id, $shortcode );
247	239	echo do_shortcode( $shortcode );
248	240	}
		@@ -247,13 +239,13 @@
247	239	echo do_shortcode( $shortcode );
248	240	}
249	241	?>
250	242	</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>
	243	+ <div class="vz-code-box">
	244	+ <input type="text" id="basic_shortcode" value="<?php echo esc_attr( $shortcode ); ?>" redonly>
	245	+ <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="">
	246	+ </button>
	247	+ </div>
256	248	</div>
257	249	</div>
258	250	</div>
259	251	</div>
		@@ -267,98 +259,96 @@
267	259	</div>
268	260	</div>
269	261	</div>
270	262	</div>
271		- <?php if ( ! $wp_optimole_active && ! $is_live_preview ) { ?>
272		- <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
273		- <div class="vz-accordion-item">
274		- <div class="vz-accordion-item__title">
275		- <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>
278		- </div>
	263	+ <?php if ( ! $wp_optimole_active ) : ?>
	264	+ <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
	265	+ <div class="vz-accordion-item">
	266	+ <div class="vz-accordion-item__title">
	267	+ <div class="vz-accordion-item__button">
	268	+ <h2 class="h2 pb-8"><?php esc_html_e( 'Extra Features', 'visualizer' ); ?></h2>
	269	+ <p class="p"><?php esc_html_e( 'We\'re confident you\'ll see the improvements. Otherwise, you can remove it anytime', 'visualizer' ); ?></p>
279	270	</div>
280		- <div class="vz-accordion-item__content border-top">
281		- <div class="vz-form-wrap">
282		- <div class="form-block">
283		- <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>
289		- </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 - It&#x92;s Free', 'visualizer' ); ?></p>
293		- <div class="vz-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span>
294		- </div>
295		- </button>
	271	+ </div>
	272	+ <div class="vz-accordion-item__content border-top">
	273	+ <div class="vz-form-wrap">
	274	+ <div class="form-block">
	275	+ <div class="vz-error-notice notice notice-error hidden"></div>
	276	+ <div class="vz-accordion">
	277	+ <div class="vz-accordion-item vz-features-accordion mb-0">
	278	+ <div class="vz-accordion-item__title vz-accordion-checkbox__title">
	279	+ <div class="vz-checkbox">
	280	+ <input type="checkbox" class="vz-checkbox-btn" checked>
296	281	</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>
	282	+ <button type="button" class="vz-accordion-item__button">
	283	+ <div class="vz-accordion__step-title h4 pb-4"><?php esc_html_e( 'Enable perfomance features for your website.', 'visualizer' ); ?></div>
	284	+ <p class="help-text"><?php esc_html_e( 'Optimise and speed up your site with our trusted addon - It&#x92;s Free', 'visualizer' ); ?></p>
	285	+ <div class="vz-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span>
310	286	</div>
	287	+ </button>
	288	+ </div>
	289	+ <div class="vz-accordion-item__content">
	290	+ <div class="vz-features-list">
	291	+ <ul>
	292	+ <li>
	293	+ <div class="icon">
	294	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/boost-logo.png' ); ?>" width="37" height="30" alt="">
	295	+ </div>
	296	+ <div class="txt">
	297	+ <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>
	298	+ <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>
	299	+ </div>
	300	+ </li>
	301	+ </ul>
311	302	</div>
312	303	</div>
313	304	</div>
314	305	</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	306	</div>
	307	+ <div class="form-block">
	308	+ <button class="btn btn-primary vz-wizard-install-plugin" data-step_number="4"><?php esc_html_e( 'Improve now', 'visualizer' ); ?>
	309	+ <button class="btn btn-primary next-btn skip-improvement" style="display: none;"><?php esc_html_e( 'Skip Improvement', 'visualizer' ); ?></button>
	310	+ <span class="spinner"></span>
	311	+ </div>
321	312	</div>
322	313	</div>
323	314	</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>
	315	+ </div>
	316	+ <?php endif; ?>
	317	+ <div id="step-<?php echo esc_attr( $last_step_number ); ?>" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
	318	+ <div class="vz-accordion-item">
	319	+ <div class="vz-accordion-item__title">
	320	+ <div class="vz-accordion-item__button">
	321	+ <h2 class="h2 pb-8"><?php esc_html_e( 'Updates, tutorials, special offers & more', 'visualizer' ); ?></h2>
	322	+ <p class="p"><?php esc_html_e( 'Get exclusive access of Visualizer newsletter', 'visualizer' ); ?></p>
333	323	</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' ) ); ?>">
342		- </div>
	324	+ </div>
	325	+ <div class="vz-accordion-item__content border-top">
	326	+ <div class="vz-form-wrap">
	327	+ <div class="form-block">
	328	+ <div class="vz-newsletter-wrap">
	329	+ <div class="vz-newsletter">
	330	+ <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>
	331	+ <div class="vz-form-group">
	332	+ <input type="email" class="form-control" id="vz_subscribe_email" placeholder="<?php echo esc_attr( get_bloginfo( 'admin_email' ) ); ?>">
343	333	</div>
344		- <div class="vz-newsletter-img">
345		- <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/newsletter-img.png' ); ?>" alt="">
346		- </div>
347	334	</div>
	335	+ <div class="vz-newsletter-img">
	336	+ <img src="<?php echo esc_url( VISUALIZER_ABSURL . 'images/newsletter-img.png' ); ?>" alt="">
	337	+ </div>
348	338	</div>
349		- <div class="form-block">
350		- <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, Don&#x92;t give me access', 'visualizer' ); ?></button>
353		- <span class="spinner"></span>
354		- </div>
	339	+ </div>
	340	+ <div class="form-block">
	341	+ <div class="vz-btn-group">
	342	+ <button class="btn btn-primary vz-subscribe" data-vz_subscribe="true"><?php esc_html_e( 'Send Me Access', 'visualizer' ); ?></button>
	343	+ <button class="btn btn-outline-primary vz-subscribe" data-vz_subscribe="false"><?php esc_html_e( 'Skip, Don&#x92;t give me access', 'visualizer' ); ?></button>
	344	+ <span class="spinner"></span>
355	345	</div>
356	346	</div>
357	347	</div>
358	348	</div>
359	349	</div>
360		- <?php } ?>
	350	+ </div>
361	351	</div>
362	352	</div>
363	353	</div>
364	354	</div>