← All changes | classes/Visualizer/Render/Page/Data.php +75 -72 3.10.15 → 1.7.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 |
		@@ -37,38 +38,16 @@
37	38	* @access protected
38	39	*/
39	40	protected function _renderContent() {
40	41	// Added by Ash/Upwork
41		- if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
42		- Visualizer_Render_Layout::show( 'simple-editor-screen', $this->chart->ID );
	42	+ if ( defined( 'Visualizer_Pro' ) ) {
	43	+ global $Visualizer_Pro;
	44	+ $Visualizer_Pro->_addEditor();
43	45	}
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	46	// 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	47	echo '<div id="canvas">';
65		- echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
	48	+ echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
66	49	echo '</div>';
67		- if ( Visualizer_Module::is_pro() ) {
68		- echo '</div>';
69		- }
70		- echo $this->custom_css;
71	50	}
72	51
73	52	/**
74	53	* Renders sidebar content.
		@@ -77,30 +56,72 @@
77	56	*
78	57	* @access protected
79	58	*/
80	59	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>
	60	+ $upload_link = add_query_arg( array(
	61	+ 'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA,
	62	+ 'nonce' => wp_create_nonce(),
	63	+ 'chart' => $this->chart->ID,
	64	+ ), admin_url( 'admin-ajax.php' ) );
92	65
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
	66	+ echo '<input type="button" name="back_button" class="return-settings-btn preview-btn hidden-setting" value="&laquo; Back">';
	67	+ echo '<div class="initial-screen">';
	68	+ echo '<iframe id="thehole" name="thehole"></iframe>';
	69	+ echo '<p class="group-description">';
	70	+ 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' );
	71	+ echo '</p>';
	72	+
	73	+ echo '<p class="group-description">';
	74	+ esc_html_e( 'If you are unsure about how to format your data CSV then please take a look at this sample:', 'visualizer' );
	75	+ echo ' <a href="', VISUALIZER_ABSURL, 'samples/', $this->type, '.csv" target="_blank">', $this->type, '.csv</a> ';
	76	+ printf( esc_html__( 'or read how you can add Google spreadsheet in following %1$sarticle%1$s.', 'visualizer' ), '<a href="https://github.com/madpixelslabs/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank">', '</a>' );
	77	+ echo '</p>';
	78	+
	79	+ echo '<div>';
	80	+ echo '<form id="csv-form" action="', $upload_link, '" method="post" target="thehole" enctype="multipart/form-data">';
	81	+ echo '<input type="hidden" id="remote-data" name="remote_data">';
	82	+ echo '<div class="form-inline">';
	83	+ echo '<div class="button button-primary file-wrapper computer-btn">';
	84	+ echo '<input type="file" id="csv-file" class="file" name="local_data">';
	85	+ esc_attr_e( 'From Computer', 'visualizer' );
	86	+ echo '</div>';
	87	+
	88	+ echo '<a id="remote-file" class="button from-web from-web-btn" href="javascript:;">', esc_html__( 'From Web', 'visualizer' ), '</a>';
	89	+ // Added by Ash/Upwork
	90	+ if ( defined( 'Visualizer_Pro' ) ) {
	91	+ global $Visualizer_Pro;
	92	+ $Visualizer_Pro->_addFormElements();
	93	+ } else {
	94	+ // Added by Ash/Upwork
	95	+ echo '<div class="just-on-pro"> </div>';
	96	+ }
	97	+ echo '</div>';
	98	+ echo '</form>';
	99	+
	100	+ // added by Ash/Upwork
	101	+ if ( defined( 'Visualizer_Pro' ) ) {
	102	+ global $Visualizer_Pro;
	103	+ $Visualizer_Pro->_addEditorElements();
	104	+ } else {
	105	+?>
	106	+<a href="<?php echo Visualizer_Plugin::PRO_TEASER_URL;?>" title="<?php echo Visualizer_Plugin::PRO_TEASER_TITLE;?>" class="check-pro-btn" target="_new">
	107	+<input type="button" class="button preview preview-btn" id="existing-chart-free" value="<?php esc_attr_e( 'Check PRO Version ', 'visualizer' );?>">
	108	+</a>
	109	+<?php
	110	+ }
	111	+
	112	+ echo'<input type="button" name="advanced_button" class="advanced-settings-btn preview-btn" value="' . __( 'Advanced', 'visualizer' ) . ' &raquo;">';
	113	+ // Added by Ash/Upwork
	114	+ echo '</div>';
	115	+ echo '</div>';
	116	+
	117	+ // changed by Ash/Upwork
	118	+ echo '<div class= "second-screen hidden-setting">';
	119	+ echo '<form id="settings-form" action="', add_query_arg( 'nonce', wp_create_nonce() ), '" method="post">';
	120	+ echo $this->sidebar;
	121	+ echo '</form>';
	122	+ echo '</div>';
	123	+ // changed by Ash/Upwork
103	124	}
104	125
105	126	/**
106	127	* Renders toolbar content.
		@@ -109,35 +130,17 @@
109	130	*
110	131	* @access protected
111	132	*/
112	133	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' ) ), '">';
	134	+ // changed by Ash/Upwork
	135	+ echo '<div class="toolbar-div">';
	136	+ echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">';
118	137	esc_html_e( 'Back', 'visualizer' );
119		- echo '</a>';
120		- echo '</div>';
121		- }
	138	+ echo '</a>';
	139	+ echo '</div>';
122	140	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	141
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 );
	142	+ echo '</div>';
	143	+
141	144	}
142	145
143	146	}