← All changes | classes/Visualizer/Render/Sidebar.php +72 -30 3.1.1 → 3.3.2 View file →

		@@ -159,8 +159,31 @@
159	159	);
160	160	}
161	161
162	162	/**
	163	+ * Add the correct description for the manual configuration box.
	164	+ */
	165	+ protected function _renderManualConfigDescription() {
	166	+ self::_renderSectionStart();
	167	+ self::_renderSectionDescription( '<span class="viz-gvlink">' . sprintf( __( 'Configure the graph by providing configuration variables right from the %1$sGoogle Visualization API%2$s. You can refer to to some examples %3$shere%4$s.', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/gallery/?#configuration-options" target="_blank">', '</a>', '<a href="https://docs.themeisle.com/article/728-manual-configuration" target="_blank">', '</a>' ) . '</span>' );
	168	+ }
	169	+
	170	+ /**
	171	+ * Add the correct example for the manual configuration box.
	172	+ */
	173	+ protected function _renderManualConfigExample() {
	174	+ return '{
	175	+ "vAxis": {
	176	+ "ticks": [5, 10, 15, 20],
	177	+ "titleTextStyle": {
	178	+ "color": "red"
	179	+ },
	180	+ "textPosition": "in"
	181	+ }
	182	+ }';
	183	+ }
	184	+
	185	+ /**
163	186	* Renders chart advanced settings group.
164	187	*
165	188	* @access protected
166	189	*/
		@@ -166,9 +189,9 @@
166	189	*/
167	190	protected function _renderAdvancedSettings() {
168	191	self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) );
169	192	self::_renderSectionStart();
170		- self::_renderSectionDescription( esc_html__( 'Configure frontend actions here.', 'visualizer' ) );
	193	+ self::_renderSectionDescription( esc_html__( 'Configure frontend actions that need to be shown.', 'visualizer' ) );
171	194	self::_renderSectionEnd();
172	195
173	196	$this->_renderActionSettings();
174	197	self::_renderGroupEnd();
		@@ -173,22 +196,9 @@
173	196	$this->_renderActionSettings();
174	197	self::_renderGroupEnd();
175	198
176	199	self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) );
177		- self::_renderSectionStart();
178		- self::_renderSectionDescription( '<span class="viz-gvlink">' . sprintf( __( 'Configure the graph by providing configuration variables right from the %1$sGoogle Visualization API%2$s', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/gallery/?#configuration-options" target="_blank">', '</a>' ) . '</span>' );
179		-
180		- $example = '
181		-{
182		- "vAxis": {
183		- "ticks": [5, 10, 15, 20],
184		- "titleTextStyle": {
185		- "color": "red"
186		- },
187		- "textPosition": "in"
188		- }
189		-}';
190		-
	200	+ $this->_renderManualConfigDescription();
191	201	self::_renderTextAreaItem(
192	202	esc_html__( 'Configuration', 'visualizer' ),
193	203	'manual',
194	204	$this->manual,
		@@ -193,9 +203,9 @@
193	203	'manual',
194	204	$this->manual,
195	205	sprintf(
196	206	esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ),
197		- '<br><code>' . $example . '</code>'
	207	+ '<br><code>' . $this->_renderManualConfigExample() . '</code>'
198	208	),
199	209	'',
200	210	array( 'rows' => 5 )
201	211	);
		@@ -216,27 +226,27 @@
216	226	self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false );
217	227	self::_renderCheckboxItem(
218	228	esc_html__( 'Print', 'visualizer' ),
219	229	'actions[]',
220		- isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false,
	230	+ isset( $this->actions ) && in_array( 'print', $this->actions, true ) ? true : false,
221	231	'print',
222		- $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the data.', 'visualizer' ),
	232	+ $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the chart/data.', 'visualizer' ),
223	233	$disable_actions
224	234	);
225	235	self::_renderCheckboxItem(
226	236	esc_html__( 'CSV', 'visualizer' ),
227	237	'actions[]',
228		- isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false,
	238	+ isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions, true ) ? true : false,
229	239	'csv;application/csv',
230	240	$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' ),
231	241	$disable_actions
232	242	);
233	243
234		- $disabled = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) );
	244	+ $disabled = ! self::is_excel_enabled();
235	245	self::_renderCheckboxItem(
236	246	esc_html__( 'Excel', 'visualizer' ),
237	247	'actions[]',
238		- isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false,
	248	+ isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions, true ) ? true : false,
239	249	'xls;application/vnd.ms-excel',
240	250	$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : ( $disabled ? '<span class="viz-section-error">' . esc_html__( 'Enable the ZIP and XML extensions to use this setting.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as an Excel spreadsheet.', 'visualizer' ) ),
241	251	$disable_actions || $disabled
242	252	);
		@@ -242,9 +252,9 @@
242	252	);
243	253	self::_renderCheckboxItem(
244	254	esc_html__( 'Copy', 'visualizer' ),
245	255	'actions[]',
246		- isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false,
	256	+ isset( $this->actions ) && in_array( 'copy', $this->actions, true ) ? true : false,
247	257	'copy',
248	258	$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' ),
249	259	$disable_actions
250	260	);
		@@ -251,8 +261,25 @@
251	261	self::_renderSectionEnd();
252	262	}
253	263
254	264	/**
	265	+ * Checks if the Excel module can be enabled.
	266	+ */
	267	+ private static function is_excel_enabled() {
	268	+ $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
	269	+ if ( is_readable( $vendor_file ) ) {
	270	+ include_once( $vendor_file );
	271	+ }
	272	+
	273	+ if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
	274	+ do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'PHP version %s not supported', phpversion() ), 'error', __FILE__, __LINE__ );
	275	+ return false;
	276	+ }
	277	+
	278	+ return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' );
	279	+ }
	280	+
	281	+ /**
255	282	* Renders chart general settings group.
256	283	*
257	284	* @since 1.0.0
258	285	*
		@@ -350,9 +377,9 @@
350	377
351	378	self::_renderCheckboxItem(
352	379	esc_html__( 'Animate on startup', 'visualizer' ),
353	380	'animation[startup]',
354		- $this->animation['startup'],
	381	+ isset( $this->animation['startup'] ) ? $this->animation['startup'] : 0,
355	382	true,
356	383	esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' )
357	384	);
358	385
		@@ -419,10 +446,10 @@
419	446	*
420	447	* @access protected
421	448	*/
422	449	protected function _renderViewSettings() {
423		- self::_renderGroupStart( esc_html__( 'Layout & Chart Area', 'visualizer' ) );
424		- self::_renderSectionStart( esc_html__( 'Layout', 'visualizer' ), false );
	450	+ self::_renderGroupStart( esc_html__( 'Chart Size & Placement', 'visualizer' ) );
	451	+ self::_renderSectionStart( esc_html__( 'Chart Size/Layout', 'visualizer' ), false );
425	452	self::_renderSectionDescription( esc_html__( 'Configure the total size of the chart. Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', 'visualizer' ) );
426	453
427	454	echo '<div class="viz-section-item">';
428	455	echo '<a class="more-info" href="javascript:;">[?]</a>';
		@@ -439,9 +466,9 @@
439	466	echo '</tr>';
440	467	echo '</table>';
441	468
442	469	echo '<p class="viz-section-description">';
443		- esc_html_e( 'Determines the total width and height of the chart.', 'visualizer' );
	470	+ esc_html_e( 'Determines the total width and height of the chart. This will only show in the front-end.', 'visualizer' );
444	471	echo '</p>';
445	472	echo '</div>';
446	473
447	474	echo '<div class="viz-section-delimiter"></div>';
		@@ -478,9 +505,9 @@
478	505	echo '</label>';
479	506	echo '</div>';
480	507	self::_renderSectionEnd();
481	508
482		- self::_renderSectionStart( esc_html__( 'Chart Area', 'visualizer' ), false );
	509	+ self::_renderSectionStart( esc_html__( 'Placement', 'visualizer' ), false );
483	510	self::_renderSectionDescription( esc_html__( 'Configure the placement and size of the chart area (where the chart itself is drawn, excluding axis and legends). Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', 'visualizer' ) );
484	511
485	512	echo '<div class="viz-section-item">';
486	513	echo '<a class="more-info" href="javascript:;">[?]</a>';
		@@ -552,8 +579,9 @@
552	579	echo '<a class="more-info" href="javascript:;">[?]</a>';
553	580	echo '<b>', $title, '</b>';
554	581	echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>';
555	582	foreach ( $options as $key => $label ) {
	583	+ // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
556	584	$extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false );
557	585	echo '<option value="', $key, '"', $extra, '>';
558	586	echo $label;
559	587	echo '</option>';
		@@ -578,9 +606,9 @@
578	606	protected static function _renderColorPickerItem( $title, $name, $value, $default ) {
579	607	echo '<div class="viz-section-item">';
580	608	echo '<b>', $title, '</b>';
581	609	echo '<div>';
582		- echo '<input type="text" class="color-picker-hex" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', 'visualizer' ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">';
	610	+ echo '<input type="text" class="color-picker-hex color-picker" data-alpha="true" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', 'visualizer' ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">';
583	611	echo '</div>';
584	612	echo '</div>';
585	613	}
586	614
		@@ -689,11 +717,11 @@
689	717	* @static
690	718	* @access public
691	719	* @param string $description The description text.
692	720	*/
693		- public static function _renderSectionDescription( $description ) {
	721	+ public static function _renderSectionDescription( $description, $classes = '' ) {
694	722	echo '<div class="viz-section-item">';
695		- echo '<div class="viz-section-description">', $description, '</div>';
	723	+ echo '<div class="viz-section-description ' . $classes . '">', $description, '</div>';
696	724	echo '</div>';
697	725	}
698	726
699	727	/**
		@@ -735,8 +763,9 @@
735	763	protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) {
736	764	echo '<div class="viz-section-item">';
737	765	echo '<a class="more-info" href="javascript:;">[?]</a>';
738	766	echo '<b>', $title, '</b>';
	767	+ // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
739	768	echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>';
740	769	echo '<p class="viz-section-description">', $desc, '</p>';
741	770	echo '</div>';
742	771	}
		@@ -765,5 +794,18 @@
765	794	public function getLibrary() {
766	795	return $this->_library;
767	796	}
768	797
	798	+ /**
	799	+ * Loads generic libraries conditionally.
	800	+ */
	801	+ protected function load_dependent_assets( $libs ) {
	802	+ if ( in_array( 'moment', $libs, true ) && ! wp_script_is( 'moment', 'registered' ) ) {
	803	+ wp_register_script( 'moment', VISUALIZER_ABSURL . 'js/lib/moment.min.js', array(), Visualizer_Plugin::VERSION );
	804	+ }
	805	+
	806	+ if ( in_array( 'numeral', $libs, true ) && ! wp_script_is( 'numeral', 'registered' ) ) {
	807	+ wp_register_script( 'numeral', VISUALIZER_ABSURL . 'js/lib/numeral.min.js', array(), Visualizer_Plugin::VERSION );
	808	+ }
	809	+
	810	+ }
769	811	}