← All changes | classes/Visualizer/Render/Page/Data.php +83 -76 3.10.15 → 1.5.6 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,18 @@
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		- }
	42	+ // Added by Ash/Upwork
	43	+ if( defined( 'Visualizer_Pro' ) ){
	44	+ global $Visualizer_Pro;
	45	+ $Visualizer_Pro->_addEditor();
	46	+ }
	47	+ // Added by Ash/Upwork
44	48
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		- echo '<div id="canvas">';
65		- echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
	49	+ echo '<div id="canvas">';
	50	+ echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
66	51	echo '</div>';
67		- if ( Visualizer_Module::is_pro() ) {
68		- echo '</div>';
69		- }
70		- echo $this->custom_css;
71	52	}
72	53
73	54	/**
74	55	* Renders sidebar content.
		@@ -77,30 +58,73 @@
77	58	*
78	59	* @access protected
79	60	*/
80	61	protected function _renderSidebarContent() {
81		- ?>
82		- <div id="viz-tabs">
83		- <ul>
84		- <li><a href="#viz-tab-basic-content" id="viz-tab-basic"><?php _e( 'Source', 'visualizer' ); ?></a></li>
85		- <li><a href="#viz-tab-advanced-content" id="viz-tab-advanced"><?php _e( 'Settings', 'visualizer' ); ?></a></li>
86		- <li><a href="#viz-tab-help-content" id="viz-tab-help"><?php _e( 'Help', 'visualizer' ); ?></a></li>
87		- </ul>
88		- <div id="viz-tab-basic-content"><?php Visualizer_Render_Layout::show( 'tab-basic', $this->chart->ID ); ?></div>
89		- <div id="viz-tab-advanced-content"><?php Visualizer_Render_Layout::show( 'tab-advanced', $this->chart->ID, $this->sidebar ); ?></div>
90		- <div id="viz-tab-help-content"><?php Visualizer_Render_Layout::show( 'tab-help', $this->chart->ID ); ?></div>
91		- </div>
	62	+ $upload_link = add_query_arg( array(
	63	+ 'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA,
	64	+ 'nonce' => wp_create_nonce(),
	65	+ 'chart' => $this->chart->ID,
	66	+ ), admin_url( 'admin-ajax.php' ) );
92	67
93		- <li class="viz-group bottom-fixed" id="vz-chart-copyright">
94		- Hate it? Love it? <a href="https://wordpress.org/support/plugin/visualizer/reviews/#new-post" target="_blank">Rate it!</a>
95		- <br/>
96		- Visualizer &copy;
97		- <?php
98		- // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date, WordPress.DateTime.CurrentTimeTimestamp.Requested
99		- echo date( 'Y', current_time( 'timestamp' ) );
100		- ?>
101		- </li>
102		- <?php
	68	+ echo '<input type="button" name="back_button" class="return-settings-btn preview-btn hidden-setting" value="&laquo; Back">';
	69	+ echo '<div class="initial-screen">';
	70	+ echo '<iframe id="thehole" name="thehole"></iframe>';
	71	+ echo '<p class="group-description">';
	72	+ 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 );
	73	+ echo '</p>';
	74	+
	75	+ echo '<p class="group-description">';
	76	+ 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 );
	77	+ echo ' <a href="', VISUALIZER_ABSURL, 'samples/', $this->type, '.csv" target="_blank">', $this->type, '.csv</a> ';
	78	+ 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>' );
	79	+ echo '</p>';
	80	+
	81	+ echo '<div>';
	82	+ echo '<form id="csv-form" action="', $upload_link, '" method="post" target="thehole" enctype="multipart/form-data">';
	83	+ echo '<input type="hidden" id="remote-data" name="remote_data">';
	84	+ echo '<div class="form-inline">';
	85	+ echo '<div class="button button-primary file-wrapper computer-btn">';
	86	+ echo '<input type="file" id="csv-file" class="file" name="local_data">';
	87	+ esc_attr_e( 'From Computer', Visualizer_Plugin::NAME );
	88	+ echo '</div>';
	89	+
	90	+ echo '<a id="remote-file" class="button from-web from-web-btn" href="javascript:;">', esc_html__( 'From Web', Visualizer_Plugin::NAME ), '</a>';
	91	+ // Added by Ash/Upwork
	92	+ if( defined( 'Visualizer_Pro' ) ){
	93	+ global $Visualizer_Pro;
	94	+ $Visualizer_Pro->_addFormElements();
	95	+ }else{
	96	+ // Added by Ash/Upwork
	97	+ echo '<div class="just-on-pro"> </div>';
	98	+ }
	99	+ echo '</div>';
	100	+ echo '</form>';
	101	+
	102	+ // added by Ash/Upwork
	103	+ if( defined( 'Visualizer_Pro' ) ){
	104	+ global $Visualizer_Pro;
	105	+ $Visualizer_Pro->_addEditorElements();
	106	+ }else{
	107	+?>
	108	+ <a href="<?php echo Visualizer_Plugin::PRO_TEASER_URL;?>" title="<?php echo Visualizer_Plugin::PRO_TEASER_TITLE;?>" class="check-pro-btn" target="_new">
	109	+ <input type="button" class="button preview preview-btn" id="existing-chart-free" value="<?php esc_attr_e( 'Check PRO Version ', Visualizer_Plugin::NAME );?>">
	110	+ </a>
	111	+<?php
	112	+ }
	113	+
	114	+ echo'<input type="button" name="advanced_button" class="advanced-settings-btn preview-btn" value="'. __( 'Advanced', Visualizer_Plugin::NAME ).' &raquo;">';
	115	+ // Added by Ash/Upwork
	116	+
	117	+ echo '</div>';
	118	+ echo '</div>';
	119	+
	120	+ // changed by Ash/Upwork
	121	+ echo '<div class= "second-screen hidden-setting">';
	122	+ echo '<form id="settings-form" action="', add_query_arg( 'nonce', wp_create_nonce() ), '" method="post">';
	123	+ echo $this->sidebar;
	124	+ echo '</form>';
	125	+ echo '</div>';
	126	+ // changed by Ash/Upwork
103	127	}
104	128
105	129	/**
106	130	* Renders toolbar content.
		@@ -109,35 +133,18 @@
109	133	*
110	134	* @access protected
111	135	*/
112	136	protected function _renderToolbar() {
113		- // don't show back button at all.
114		- // 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.
115		- if ( ! VISUALIZER_SKIP_CHART_TYPE_PAGE ) {
116		- echo '<div class="toolbar-div">';
117		- echo '<a class="button button-large" href="', esc_url( add_query_arg( 'tab', 'types' ) ), '">';
118		- esc_html_e( 'Back', 'visualizer' );
119		- echo '</a>';
120		- echo '</div>';
121		- }
	137	+ // changed by Ash/Upwork
	138	+ echo '<div class="toolbar-div">';
	139	+ echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">';
	140	+ esc_html_e( 'Back', Visualizer_Plugin::NAME );
	141	+ echo '</a>';
	142	+ echo '</div>';
122	143	echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
123		- if ( isset( $this->cancel_button ) ) {
124		- echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-right" value="', $this->cancel_button, '">';
125		- }
126		- }
127	144
128		- /**
129		- * Renders the additional content.
130		- *
131		- * @access private
132		- */
133		- private function add_additional_content() {
134		- $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
135		- $query = '';
136		- if ( 'visualizer_source_query' === $source ) {
137		- $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
138		- }
139		- Visualizer_Render_Layout::show( 'db-query', $query, $this->chart->ID );
140		- Visualizer_Render_Layout::show( 'json-screen', $this->chart->ID );
	145	+ echo '</div>';
	146	+
	147	+
141	148	}
142	149
143	150	}