← All changes | classes/Visualizer/Render/Page/Data.php +67 -9 3.1.3 → 3.2.1 View file →

		@@ -44,9 +44,9 @@
44	44	if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
45	45	$Visualizer_Pro->_addFilterWizard( $this->chart->ID );
46	46	}
47	47	} else {
48		- Visualizer_Render_Layout::show( 'faux-editor' );
	48	+ Visualizer_Render_Layout::show( 'simple-editor-screen', $this->chart->ID );
49	49	}
50	50
51	51	$this->add_additional_content();
52	52
		@@ -108,9 +108,9 @@
108	108	value="<?php _e( 'Import', 'visualizer' ); ?>">
109	109	</form>
110	110	</div>
111	111	</li>
112		- <li class="viz-group visualizer-import-url visualizer_source_csv_remote">
	112	+ <li class="viz-group visualizer-import-url visualizer_source_csv_remote visualizer_source_json">
113	113	<h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2>
114	114	<ul class="viz-group-content">
115	115	<li class="viz-subsection">
116	116	<span class="viz-section-title"><?php _e( 'One time import', 'visualizer' ); ?></span>
		@@ -157,11 +157,14 @@
157	157	'1' => __( 'Each hour', 'visualizer' ),
158	158	'12' => __( 'Each 12 hours', 'visualizer' ),
159	159	'24' => __( 'Each day', 'visualizer' ),
160	160	'72' => __( 'Each 3 days', 'visualizer' ),
161		- )
	161	+ ),
	162	+ 'csv',
	163	+ $this->chart->ID
162	164	);
163	165	foreach ( $schedules as $num => $name ) {
	166	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
164	167	$extra = $num == $hours ? 'selected' : '';
165	168	?>
166	169	<option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
167	170	<?php
		@@ -175,8 +178,60 @@
175	178	<?php echo apply_filters( 'visualizer_pro_upsell', '', 'schedule-chart' ); ?>
176	179	</form>
177	180	</div>
178	181	</li>
	182	+
	183	+ <li class="viz-subsection">
	184	+ <span class="viz-section-title visualizer_source_json"><?php _e( 'Import from JSON/REST', 'visualizer' ); ?>
	185	+ <span class="dashicons dashicons-lock"></span></span>
	186	+ <div class="viz-section-items section-items">
	187	+ <p class="viz-group-description"><?php _e( 'You can choose here to import/synchronize your chart data with a remote JSON/REST source. For more info check <a href="https://docs.themeisle.com/article/1052-how-to-generate-charts-from-json-data-rest-endpoints" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
	188	+ <form id="vz-import-json" action="<?php echo $upload_link; ?>" method="post" target="thehole" enctype="multipart/form-data">
	189	+ <div class="remote-file-section">
	190	+ <?php
	191	+ $bttn_label = 'visualizer_source_json' === $source_of_chart ? __( 'Modify Parameters', 'visualizer' ) : __( 'Create Parameters', 'visualizer' );
	192	+ if ( VISUALIZER_PRO ) {
	193	+ ?>
	194	+ <p class="viz-group-description"><?php _e( 'How often do you want to check the URL', 'visualizer' ); ?></p>
	195	+ <select name="vz-json-time" id="vz-json-time" class="visualizer-select" data-chart="<?php echo $this->chart->ID; ?>">
	196	+ <?php
	197	+ $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	198	+ $schedules = apply_filters(
	199	+ 'visualizer_chart_schedules', array(
	200	+ '-1' => __( 'One-time', 'visualizer' ),
	201	+ ),
	202	+ 'json',
	203	+ $this->chart->ID
	204	+ );
	205	+ foreach ( $schedules as $num => $name ) {
	206	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
	207	+ $extra = $num == $hours ? 'selected' : '';
	208	+ ?>
	209	+ <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
	210	+ <?php
	211	+ }
	212	+ ?>
	213	+ </select>
	214	+ <?php
	215	+ }
	216	+ ?>
	217	+ </div>
	218	+
	219	+ <input type="button" id="json-chart-button" class="button button-secondary "
	220	+ value="<?php echo $bttn_label; ?>" data-current="chart"
	221	+ data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>"
	222	+ data-t-chart="<?php echo $bttn_label; ?>">
	223	+ <?php
	224	+ if ( VISUALIZER_PRO ) {
	225	+ ?>
	226	+ <input type="button" id="json-chart-save-button" class="button button-primary "
	227	+ value="<?php _e( 'Save Schedule', 'visualizer' ); ?>">
	228	+ <?php
	229	+ }
	230	+ ?>
	231	+ </form>
	232	+ </div>
	233	+ </li>
179	234	</ul>
180	235	</li>
181	236	<li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>">
182	237	<h2 class="viz-group-title viz-sub-group"
		@@ -251,8 +306,9 @@
251	306	'72' => __( 'Each 3 days', 'visualizer' ),
252	307	)
253	308	);
254	309	foreach ( $schedules as $num => $name ) {
	310	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
255	311	$extra = $num == $hours ? 'selected' : '';
256	312	?>
257	313	<option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
258	314	<?php
		@@ -299,8 +355,9 @@
299	355	'72' => __( 'Each 3 days', 'visualizer' ),
300	356	)
301	357	);
302	358	foreach ( $schedules as $num => $name ) {
	359	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
303	360	$extra = $num == $hours ? 'selected' : '';
304	361	?>
305	362	<option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
306	363	<?php
		@@ -317,12 +374,11 @@
317	374	</div>
318	375	</li>
319	376
320	377	<?php
321		- // we will auto-open the manual data feature but only when pro is active and source is empty.
322		- $pro_class = apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' );
	378	+ // we will auto-open the manual data feature only when source is empty.
323	379	?>
324		- <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $source_of_chart ) && empty( $pro_class ) ? 'open' : ''; ?> ">
	380	+ <li class="viz-group <?php echo empty( $source_of_chart ) ? 'open' : ''; ?> ">
325	381	<h2 class="viz-group-title viz-sub-group visualizer-editor-tab"
326	382	data-current="chart"><?php _e( 'Manual Data', 'visualizer' ); ?><span
327	383	class="dashicons dashicons-lock"></span></h2>
328	384	<form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole">
		@@ -331,15 +387,16 @@
331	387	</form>
332	388
333	389	<div class="viz-group-content edit-data-content">
334	390	<div>
335		- <p class="viz-group-description"><?php _e( 'You can manually edit the chart data using the spreadsheet like editor.', 'visualizer' ); ?></p>
	391	+ <p class="viz-group-description"><?php echo sprintf( __( 'You can manually edit the chart data using the %s editor.', 'visualizer' ), VISUALIZER_PRO ? 'spreadsheet like' : 'simple' ); ?></p>
	392	+ <?php if ( ! VISUALIZER_PRO ) { ?>
	393	+ <p class="viz-group-description simple-editor-type"><input type="checkbox" id="simple-editor-type" value="textarea"><label for="simple-editor-type"><?php _e( 'Use text area editor instead', 'visualizer' ); ?></label></p>
	394	+ <?php } ?>
336	395	<input type="button" id="editor-chart-button" class="button button-primary "
337	396	value="<?php _e( 'View Editor', 'visualizer' ); ?>" data-current="chart"
338	397	data-t-editor="<?php _e( 'Show Chart', 'visualizer' ); ?>"
339	398	data-t-chart="<?php _e( 'View Editor', 'visualizer' ); ?>">
340		-
341		- <?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
342	399	</div>
343	400	</div>
344	401	</li>
345	402	</ul>
		@@ -549,7 +606,8 @@
549	606	if ( 'visualizer_source_query' === $source ) {
550	607	$query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
551	608	}
552	609	Visualizer_Render_Layout::show( 'db-query', $query );
	610	+ Visualizer_Render_Layout::show( 'json-screen', $this->chart->ID );
553	611	}
554	612
555	613	}