← All changes | classes/Visualizer/Render/Page/Data.php +11 -87 3.1.0 → 3.0.12 View file →

		@@ -43,19 +43,13 @@
43	43	$Visualizer_Pro->_addEditor( $this->chart->ID );
44	44	if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
45	45	$Visualizer_Pro->_addFilterWizard( $this->chart->ID );
46	46	}
47		- } else {
48		- Visualizer_Render_Layout::show( 'faux-editor' );
49	47	}
50		-
51		- $this->add_additional_content();
52		-
53	48	// Added by Ash/Upwork
54	49	echo '<div id="canvas">';
55	50	echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
56	51	echo '</div>';
57		- echo $this->custom_css;
58	52	}
59	53
60	54	/**
61	55	* Renders sidebar content.
		@@ -72,14 +66,10 @@
72	66	'chart' => $this->chart->ID,
73	67	),
74	68	admin_url( 'admin-ajax.php' )
75	69	);
76		-
77		- // this will allow us to open the correct source tab by default.
78		- $source_of_chart = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
79		- $type = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
80	70	?>
81		- <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>" data-chart-source="<?php echo $source_of_chart; ?>" data-chart-type="<?php echo $type; ?>"></span>
	71	+ <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>"></span>
82	72	<iframe id="thehole" name="thehole"></iframe>
83	73	<ul class="viz-group-wrapper full-height">
84	74	<li class="viz-group viz-group-category open" id="vz-chart-source">
85	75	<div class="viz-group-header">
		@@ -86,9 +76,9 @@
86	76	<h2 class="viz-group-title viz-main-group"><?php _e( 'Chart Data', 'visualizer' ); ?></h2>
87	77	</div>
88	78	<ul class="viz-group-content">
89	79	<ul class="viz-group-wrapper">
90		- <li class="viz-group visualizer_source_csv">
	80	+ <li class="viz-group">
91	81	<h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from file', 'visualizer' ); ?></h2>
92	82	<div class="viz-group-content">
93	83	<p class="viz-group-description"><?php esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?></p>
94	84	<p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p>
		@@ -102,9 +92,9 @@
102	92	value="<?php _e( 'Import', 'visualizer' ); ?>">
103	93	</form>
104	94	</div>
105	95	</li>
106		- <li class="viz-group visualizer-import-url visualizer_source_csv_remote">
	96	+ <li class="viz-group visualizer-import-url">
107	97	<h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2>
108	98	<ul class="viz-group-content">
109	99	<li class="viz-subsection">
110	100	<span class="viz-section-title"><?php _e( 'One time import', 'visualizer' ); ?></span>
		@@ -150,9 +140,9 @@
150	140	'visualizer_chart_schedules', array(
151	141	'1' => __( 'Each hour', 'visualizer' ),
152	142	'12' => __( 'Each 12 hours', 'visualizer' ),
153	143	'24' => __( 'Each day', 'visualizer' ),
154		- '72' => __( 'Each 3 days', 'visualizer' ),
	144	+ '36' => __( 'Each 3 days', 'visualizer' ),
155	145	)
156	146	);
157	147	foreach ( $schedules as $num => $name ) {
158	148	$extra = $num == $hours ? 'selected' : '';
		@@ -219,9 +209,9 @@
219	209	<h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from WordPress', 'visualizer' ); ?><span
220	210	class="dashicons dashicons-lock"></span></h2>
221	211	<div class="viz-group-content edit-data-content">
222	212	<div>
223		- <p class="viz-group-description"><?php _e( 'You can import data from WordPress here.', 'visualizer' ); ?></p>
	213	+ <p class="viz-group-description"><?php _e( 'You can import here data from WordPress', 'visualizer' ); ?></p>
224	214	<input type="button" id="filter-chart-button" class="button button-primary "
225	215	value="<?php _e( 'Create Filters', 'visualizer' ); ?>" data-current="chart"
226	216	data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>"
227	217	data-t-chart="<?php _e( 'Create Filters', 'visualizer' ); ?>">
		@@ -230,64 +220,12 @@
230	220	</div>
231	221	</li>
232	222
233	223	<?php
234		- $save_query = add_query_arg(
235		- array(
236		- 'action' => Visualizer_Plugin::ACTION_SAVE_DB_QUERY,
237		- 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION ),
238		- 'chart' => $this->chart->ID,
239		- ), admin_url( 'admin-ajax.php' )
240		- );
241		- ?>
242		- <li class="viz-group visualizer_source_query <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'db-query' ); ?>">
243		- <h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from database', 'visualizer' ); ?><span
244		- class="dashicons dashicons-lock"></span></h2>
245		- <div class="viz-group-content edit-data-content">
246		- <div>
247		- <p class="viz-group-description"><?php _e( 'You can import data from the database here.', 'visualizer' ); ?></p>
248		- <form id="vz-db-wizard" action="<?php echo $save_query; ?>" method="post" target="thehole">
249		- <p class="viz-group-description"><?php _e( 'How often do you want to refresh the data from the database.', 'visualizer' ); ?></p>
250		- <select name="refresh" id="vz-db-import-time" class="visualizer-select">
251		- <?php
252		- $bttn_label = 'visualizer_source_query' === $source_of_chart ? __( 'Modify Query', 'visualizer' ) : __( 'Create Query', 'visualizer' );
253		- $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_SCHEDULE, true );
254		- $schedules = apply_filters(
255		- 'visualizer_schedules', array(
256		- '0' => __( 'Live', 'visualizer' ),
257		- '1' => __( 'Each hour', 'visualizer' ),
258		- '12' => __( 'Each 12 hours', 'visualizer' ),
259		- '24' => __( 'Each day', 'visualizer' ),
260		- '72' => __( 'Each 3 days', 'visualizer' ),
261		- )
262		- );
263		- foreach ( $schedules as $num => $name ) {
264		- $extra = $num == $hours ? 'selected' : '';
265		- ?>
266		- <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
267		- <?php
268		- }
269		- ?>
270		- </select>
271		- <input type="hidden" name="params" id="viz-db-wizard-params">
272		-
273		- <input type="button" id="db-chart-button" class="button button-secondary "
274		- value="<?php echo $bttn_label; ?>" data-current="chart"
275		- data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>"
276		- data-t-chart="<?php echo $bttn_label; ?>">
277		- <input type="button" id="db-chart-save-button" class="button button-primary "
278		- value="<?php _e( 'Save Schedule', 'visualizer' ); ?>">
279		- <?php echo apply_filters( 'visualizer_pro_upsell', '', 'db-query' ); ?>
280		- </form>
281		- </div>
282		- </div>
283		- </li>
284		-
285		- <?php
286		- // we will auto-open the manual data feature but only when pro is active and source is empty.
	224	+ // we will auto-open the manual data feature but only when pro is active.
287	225	$pro_class = apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' );
288	226	?>
289		- <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $source_of_chart ) && empty( $pro_class ) ? 'open' : ''; ?> ">
	227	+ <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $pro_class ) ? 'open' : ''; ?> ">
290	228	<h2 class="viz-group-title viz-sub-group visualizer-editor-tab"
291	229	data-current="chart"><?php _e( 'Manual Data', 'visualizer' ); ?><span
292	230	class="dashicons dashicons-lock"></span></h2>
293	231	<form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole">
		@@ -348,9 +286,9 @@
348	286	foreach ( $permissions as $k => $v ) {
349	287	$this->$k = $v;
350	288	}
351	289	}
352		- ?>
	290	+?>
353	291	<li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-permissions">
354	292	<h2><span class="dashicons dashicons-admin-users"></span><?php _e( 'Permissions', 'visualizer' ); ?></h2>
355	293	<div class="viz-group-header">
356	294	<button class="customize-section-back" tabindex="0"></button>
		@@ -365,15 +303,15 @@
365	303	'tab' => 'permissions',
366	304	),
367	305	remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] )
368	306	);
369		- ?>
	307	+?>
370	308	" method="post">
371	309	<?php $this->permissionsSidebar(); ?>
372	310	</form>
373	311	</ul>
374	312	</li>
375		- <?php
	313	+<?php
376	314	}
377	315
378	316	/**
379	317	* Generates the permissions form.
		@@ -494,23 +432,9 @@
494	432	echo '</div>';
495	433	}
496	434	echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
497	435	if ( isset( $this->cancel_button ) ) {
498		- echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-left" value="', $this->cancel_button, '">';
	436	+ echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-right" value="', $this->cancel_button, '">';
499	437	}
500		- }
501		-
502		- /**
503		- * Renders the additional content.
504		- *
505		- * @access private
506		- */
507		- private function add_additional_content() {
508		- $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
509		- $query = '';
510		- if ( 'visualizer_source_query' === $source ) {
511		- $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
512		- }
513		- Visualizer_Render_Layout::show( 'db-query', $query );
514	438	}
515	439
516	440	}