← All changes | classes/Visualizer/Render/Page/Data.php +43 -91 4.0.5 → 1.4.2.2 View file →

		@@ -1,5 +1,6 @@
1	1	<?php
	2	+
2	3	// +----------------------------------------------------------------------+
3	4	// | Copyright 2013 Madpixels (email : visualizer@madpixels.net) |
4	5	// +----------------------------------------------------------------------+
5	6	// | This program is free software; you can redistribute it and/or modify |
		@@ -17,8 +18,9 @@
17	18	// | MA 02110-1301 USA |
18	19	// +----------------------------------------------------------------------+
19	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
20	21	// +----------------------------------------------------------------------+
	22	+
21	23	/**
22	24	* Renders chart data setup page.
23	25	*
24	26	* @category Visualizer
		@@ -36,39 +38,11 @@
36	38	*
37	39	* @access protected
38	40	*/
39	41	protected function _renderContent() {
40		- // Added by Ash/Upwork
41		- if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
42		- Visualizer_Render_Layout::show( 'simple-editor-screen', $this->chart->ID );
43		- }
44		-
45		- if ( Visualizer_Module::is_pro() ) {
46		- do_action( 'visualizer_add_editor_etc', $this->chart->ID );
47		-
48		- if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
49		- global $Visualizer_Pro;
50		- $Visualizer_Pro->_addEditor( $this->chart->ID );
51		- if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
52		- $Visualizer_Pro->_addFilterWizard( $this->chart->ID );
53		- }
54		- }
55		- }
56		-
57		- $this->add_additional_content();
58		-
59		- // Added by Ash/Upwork
60		- if ( Visualizer_Module::is_pro() ) {
61		- echo '<div id="chart_wrapper_canvas">';
62		- echo '<div id="control_wrapper_canvas"></div>';
63		- }
64	42	echo '<div id="canvas">';
65		- echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
	43	+ echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
66	44	echo '</div>';
67		- if ( Visualizer_Module::is_pro() ) {
68		- echo '</div>';
69		- }
70		- echo $this->custom_css;
71	45	}
72	46
73	47	/**
74	48	* Renders sidebar content.
		@@ -77,45 +51,44 @@
77	51	*
78	52	* @access protected
79	53	*/
80	54	protected function _renderSidebarContent() {
	55	+ $upload_link = add_query_arg( array(
	56	+ 'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA,
	57	+ 'nonce' => wp_create_nonce(),
	58	+ 'chart' => $this->chart->ID,
	59	+ ), admin_url( 'admin-ajax.php' ) );
81	60
82		- $chartSettings = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
83		- $hasTitle = isset( $chartSettings['backend-title'] ) && '' !== $chartSettings['backend-title'];
	61	+ echo '<li class="group open">';
	62	+ echo '<h3 class="group-title">', esc_html__( 'Upload CSV File', Visualizer_Plugin::NAME ), '</h3>';
	63	+ echo '<div class="group-content">';
	64	+ echo '<iframe id="thehole" name="thehole"></iframe>';
84	65
85		- ?>
86		- <div class="viz-info-panel">
87		- <div class="viz-info-item">
88		- <label for="viz-shortcode"><?php _e( 'Shortcode', 'visualizer' ); ?></label>
89		- <div class="viz-info-row">
90		- <input type="text" id="viz-shortcode" value="[visualizer id=&quot;<?php echo $this->chart->ID; ?>&quot; class='']" readonly>
91		- <button class="button" id="viz-copy-shortcode"><?php _e( 'Copy', 'visualizer' ); ?></button>
92		- </div>
93		- </div>
94		- <div class="viz-info-item">
95		- <label for="viz-backend-name"><?php _e( 'Backend chart title for internal usage', 'visualizer' ); ?></label>
96		- <input type="text" id="viz-backend-name" value="<?php echo $hasTitle ? $chartSettings['backend-title'] : ( '#' . esc_attr( $this->chart->ID ) ); ?>">
97		- </div>
98		- </div>
99		- <div id="viz-tabs">
100		- <ul>
101		- <li><a href="#viz-tab-basic-content" id="viz-tab-basic"><?php _e( 'Source', 'visualizer' ); ?></a></li>
102		- <li><a href="#viz-tab-advanced-content" id="viz-tab-advanced"><?php _e( 'Settings', 'visualizer' ); ?></a></li>
103		- <li><a href="#viz-tab-help-content" id="viz-tab-help"><?php _e( 'Help', 'visualizer' ); ?></a></li>
104		- </ul>
105		- <div id="viz-tab-basic-content"><?php Visualizer_Render_Layout::show( 'tab-basic', $this->chart->ID ); ?></div>
106		- <div id="viz-tab-advanced-content"><?php Visualizer_Render_Layout::show( 'tab-advanced', $this->chart->ID, $this->sidebar ); ?></div>
107		- <div id="viz-tab-help-content"><?php Visualizer_Render_Layout::show( 'tab-help', $this->chart->ID ); ?></div>
108		- </div>
	66	+ echo '<p class="group-description">';
	67	+ 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_Plugin::NAME );
	68	+ echo '</p>';
109	69
110		- <li class="viz-group bottom-fixed" id="vz-chart-copyright">
111		- <?php _e( 'Hate it? Love it?', 'visualizer' ); ?> <a href="https://wordpress.org/support/plugin/visualizer/reviews/#new-post" target="_blank"><?php _e( 'Rate it!', 'visualizer' ); ?></a>
112		- <?php
113		- // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date, WordPress.DateTime.CurrentTimeTimestamp.Requested
114		- echo date( 'Y', current_time( 'timestamp' ) );
115		- ?>
116		- </li>
117		- <?php
	70	+ echo '<p class="group-description">';
	71	+ esc_html_e( 'If you are unsure about how to format your data CSV then please take a look at this sample:', Visualizer_Plugin::NAME );
	72	+ echo ' <a href="', VISUALIZER_ABSURL, 'samples/', $this->type, '.csv" target="_blank">', $this->type, '.csv</a> ';
	73	+ printf( esc_html__( 'or read how you can add Google spreadsheet in following %sarticle%s.', Visualizer_Plugin::NAME ), '<a href="https://github.com/madpixelslabs/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank">', '</a>' );
	74	+ echo '</p>';
	75	+
	76	+ echo '<div>';
	77	+ echo '<form id="csv-form" action="', $upload_link, '" method="post" target="thehole" enctype="multipart/form-data">';
	78	+ echo '<input type="hidden" id="remote-data" name="remote_data">';
	79	+ echo '<div class="button button-primary file-wrapper">';
	80	+ echo '<input type="file" id="csv-file" class="file" name="local_data">';
	81	+ esc_attr_e( 'From Computer', Visualizer_Plugin::NAME );
	82	+ echo '</div>';
	83	+
	84	+ echo '<div>';
	85	+ echo '<a id="remote-file" class="button" href="javascript:;">', esc_html__( 'From Web', Visualizer_Plugin::NAME ), '</a>';
	86	+ echo '</div>';
	87	+ echo '</form>';
	88	+ echo '</div>';
	89	+ echo '</div>';
	90	+ echo '</li>';
118	91	}
119	92
120	93	/**
121	94	* Renders toolbar content.
		@@ -124,34 +97,13 @@
124	97	*
125	98	* @access protected
126	99	*/
127	100	protected function _renderToolbar() {
128		- // don't show back button at all.
129		- // NOTE: We can't be selective on the post_status here because when a new chart reaches the settings screen, its status changes to publish.
130		- if ( ! VISUALIZER_SKIP_CHART_TYPE_PAGE ) {
131		- echo '<div class="toolbar-div">';
132		- echo '<a class="button button-large" href="', esc_url( add_query_arg( 'tab', 'types' ) ), '">';
133		- esc_html_e( 'Back', 'visualizer' );
134		- echo '</a>';
135		- echo '</div>';
136		- }
137		- echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
138		- if ( isset( $this->cancel_button ) ) {
139		- echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-right" value="', $this->cancel_button, '">';
140		- }
	101	+ echo '<a class="button button-large" href="', add_query_arg( 'tab', false ), '">';
	102	+ esc_html_e( 'Back', Visualizer_Plugin::NAME );
	103	+ echo '</a>';
	104	+ echo '<a class="button button-large button-primary push-right" href="', add_query_arg( 'tab', 'settings' ), '">';
	105	+ esc_html_e( 'Next', Visualizer_Plugin::NAME );
	106	+ echo '</a>';
141	107	}
142	108
143		- /**
144		- * Renders the additional content.
145		- *
146		- * @access private
147		- */
148		- private function add_additional_content() {
149		- $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
150		- $query = '';
151		- if ( 'visualizer_source_query' === $source ) {
152		- $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
153		- }
154		- Visualizer_Render_Layout::show( 'db-query', $query, $this->chart->ID );
155		- Visualizer_Render_Layout::show( 'json-screen', $this->chart->ID );
156		- }
157		-}
	109	+}