← All changes | classes/Visualizer/Render/Sidebar/Graph.php +28 -69 4.0.5 → 3.3.2 View file →

		@@ -128,15 +128,11 @@
128	128	self::_renderTextAreaItem(
129	129	esc_html__( 'Chart Description', 'visualizer' ),
130	130	'description',
131	131	$this->description,
132		- sprintf(
133		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag.
134		- esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ),
135		- '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">',
136		- '</a>'
137		- )
	132	+ sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
138	133	);
	134	+
139	135	}
140	136
141	137	/**
142	138	* Renders general settings block for horizontal axis settings.
		@@ -153,33 +149,8 @@
153	149	esc_html__( 'The title of the horizontal axis.', 'visualizer' )
154	150	);
155	151
156	152	self::_renderSelectItem(
157		- esc_html__( 'Slanted Text', 'visualizer' ),
158		- 'hAxis[slantedText]',
159		- isset( $this->hAxis['slantedText'] ) ? $this->hAxis['slantedText'] : false,
160		- array(
161		- false => 'False',
162		- true => 'True',
163		- ),
164		- '',
165		- false
166		- );
167		-
168		- self::_renderTextItem(
169		- esc_html__( 'Slanted Text Angle', 'visualizer' ),
170		- 'hAxis[slantedTextAngle]',
171		- isset( $this->hAxis['slantedTextAngle'] ) ? $this->hAxis['slantedTextAngle'] : 45,
172		- '',
173		- 45,
174		- 'number',
175		- array(
176		- 'min' => 1,
177		- 'step' => 15,
178		- )
179		- );
180		-
181		- self::_renderSelectItem(
182	153	esc_html__( 'Text Position', 'visualizer' ),
183	154	'hAxis[textPosition]',
184	155	isset( $this->hAxis['textPosition'] ) ? $this->hAxis['textPosition'] : '',
185	156	$this->_positions,
		@@ -191,9 +162,9 @@
191	162	'hAxis[direction]',
192	163	isset( $this->hAxis['direction'] ) ? $this->hAxis['direction'] : '',
193	164	array(
194	165	'' => '',
195		- '1' => esc_html__( 'Default Direction', 'visualizer' ),
	166	+ '1' => esc_html__( 'Identical Direction', 'visualizer' ),
196	167	'-1' => esc_html__( 'Reverse Direction', 'visualizer' ),
197	168	),
198	169	esc_html__( 'The direction in which the values along the horizontal axis grow.', 'visualizer' )
199	170	);
		@@ -217,8 +188,9 @@
217	188	self::_renderGroupStart( esc_html__( 'Horizontal Axis Settings', 'visualizer' ) );
218	189	self::_renderSectionStart( esc_html__( 'General Settings', 'visualizer' ), false );
219	190	$this->_renderHorizontalAxisGeneralSettings();
220	191	self::_renderSectionEnd();
	192	+
221	193	if ( $this->_horizontalGridLines ) {
222	194	self::_renderSectionStart( esc_html__( 'Grid Lines', 'visualizer' ), false );
223	195	self::_renderTextItem(
224	196	esc_html__( 'Count', 'visualizer' ),
		@@ -223,12 +195,10 @@
223	195	self::_renderTextItem(
224	196	esc_html__( 'Count', 'visualizer' ),
225	197	'hAxis[gridlines][count]',
226	198	isset( $this->hAxis['gridlines']['count'] ) ? $this->hAxis['gridlines']['count'] : '',
227		- esc_html__( 'The approximate number of horizontal gridlines inside the chart area. You can specify a value of -1 to automatically compute the number of gridlines, 0 or 1 to draw no gridlines, or 2 or more to only draw gridline. Any number greater than 2 will be used to compute the minSpacing between gridlines.', 'visualizer' ),
228		- 5,
229		- 'number',
230		- array( 'min' => -1, 'max' => 1000, 'step' => 1 )
	199	+ esc_html__( 'The number of vertical gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.', 'visualizer' ),
	200	+ 5
231	201	);
232	202
233	203	self::_renderColorPickerItem(
234	204	esc_html__( 'Color', 'visualizer' ),
		@@ -240,26 +210,24 @@
240	210
241	211	self::_renderSectionStart( esc_html__( 'Minor Grid Lines', 'visualizer' ), false );
242	212	self::_renderTextItem(
243	213	esc_html__( 'Count', 'visualizer' ),
244		- 'hAxis[minorGridlines][count]',
245		- isset( $this->hAxis['minorGridlines']['count'] ) ? $this->hAxis['minorGridlines']['count'] : '',
246		- esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ),
247		- 0,
248		- 'number',
249		- array( 'min' => 0, 'step' => 1 )
	214	+ 'vAxis[minorGridlines][count]',
	215	+ isset( $this->vAxis['minorGridlines']['count'] ) ? $this->vAxis['minorGridlines']['count'] : '',
	216	+ esc_html__( 'The number of horizontal minor gridlines between two regular gridlines.', 'visualizer' ),
	217	+ 0
250	218	);
251	219
252	220	self::_renderColorPickerItem(
253	221	esc_html__( 'Color', 'visualizer' ),
254		- 'hAxis[minorGridlines][color]',
255		- isset( $this->hAxis['minorGridlines']['color'] ) ? $this->hAxis['minorGridlines']['color'] : null,
	222	+ 'vAxis[minorGridlines][color]',
	223	+ isset( $this->vAxis['minorGridlines']['color'] ) ? $this->vAxis['minorGridlines']['color'] : null,
256	224	null
257	225	);
258	226	self::_renderSectionEnd();
259	227	}
260	228
261		- if ( $this->_horizontalGridLines ) {
	229	+ if ( $this->_verticalGridLines ) {
262	230	self::_renderSectionStart( esc_html__( 'View Window', 'visualizer' ), false );
263	231	self::_renderTextItem(
264	232	esc_html__( 'Maximum Value', 'visualizer' ),
265	233	'hAxis[viewWindow][max]',
		@@ -306,9 +274,9 @@
306	274	'vAxis[direction]',
307	275	isset( $this->vAxis['direction'] ) ? $this->vAxis['direction'] : '',
308	276	array(
309	277	'' => '',
310		- '1' => esc_html__( 'Default Direction', 'visualizer' ),
	278	+ '1' => esc_html__( 'Identical Direction', 'visualizer' ),
311	279	'-1' => esc_html__( 'Reverse Direction', 'visualizer' ),
312	280	),
313	281	esc_html__( 'The direction in which the values along the vertical axis grow.', 'visualizer' )
314	282	);
		@@ -339,12 +307,10 @@
339	307	self::_renderTextItem(
340	308	esc_html__( 'Count', 'visualizer' ),
341	309	'vAxis[gridlines][count]',
342	310	isset( $this->vAxis['gridlines']['count'] ) ? $this->vAxis['gridlines']['count'] : '',
343		- esc_html__( 'The approximate number of vertical gridlines inside the chart area. You can specify a value of -1 to automatically compute the number of gridlines, 0 or 1 to draw no gridlines, or 2 or more to only draw gridline. Any number greater than 2 will be used to compute the minSpacing between gridlines.', 'visualizer' ),
344		- 5,
345		- 'number',
346		- array( 'min' => -1, 'max' => 1000, 'step' => 1 )
	311	+ esc_html__( 'The number of horizontal gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.', 'visualizer' ),
	312	+ 5
347	313	);
348	314
349	315	self::_renderColorPickerItem(
350	316	esc_html__( 'Color', 'visualizer' ),
		@@ -356,26 +322,24 @@
356	322
357	323	self::_renderSectionStart( esc_html__( 'Minor Grid Lines', 'visualizer' ), false );
358	324	self::_renderTextItem(
359	325	esc_html__( 'Count', 'visualizer' ),
360		- 'vAxis[minorGridlines][count]',
361		- isset( $this->vAxis['minorGridlines']['count'] ) ? $this->vAxis['minorGridlines']['count'] : '',
362		- esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ),
363		- 0,
364		- 'number',
365		- array( 'min' => 0, 'step' => 1 )
	326	+ 'hAxis[minorGridlines][count]',
	327	+ isset( $this->hAxis['minorGridlines']['count'] ) ? $this->hAxis['minorGridlines']['count'] : '',
	328	+ esc_html__( 'The number of vertical minor gridlines between two regular gridlines.', 'visualizer' ),
	329	+ 0
366	330	);
367	331
368	332	self::_renderColorPickerItem(
369	333	esc_html__( 'Color', 'visualizer' ),
370		- 'vAxis[minorGridlines][color]',
371		- isset( $this->vAxis['minorGridlines']['color'] ) ? $this->vAxis['minorGridlines']['color'] : null,
	334	+ 'hAxis[minorGridlines][color]',
	335	+ isset( $this->hAxis['minorGridlines']['color'] ) ? $this->hAxis['minorGridlines']['color'] : null,
372	336	null
373	337	);
374	338	self::_renderSectionEnd();
375	339	}
376	340
377		- if ( $this->_verticalGridLines ) {
	341	+ if ( $this->_horizontalGridLines ) {
378	342	self::_renderSectionStart( esc_html__( 'View Window', 'visualizer' ), false );
379	343	self::_renderTextItem(
380	344	esc_html__( 'Maximum Value', 'visualizer' ),
381	345	'vAxis[viewWindow][max]',
		@@ -457,10 +421,8 @@
457	421	'series[' . $index . '][color]',
458	422	isset( $this->series[ $index ]['color'] ) ? $this->series[ $index ]['color'] : null,
459	423	null
460	424	);
461		-
462		- $this->_renderRoleField( $index );
463	425	}
464	426
465	427	/**
466	428	* Renders format field for horizontal axis.
		@@ -477,17 +439,15 @@
477	439	sprintf(
478	440	'%s<br><br>%s<br><br>%s',
479	441	esc_html__( 'Enter custom format pattern to apply to horizontal axis labels.', 'visualizer' ),
480	442	sprintf(
481		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag.
482		- esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Note: Using the #&#37;&#37; percentage format will multiply your values by 100.', 'visualizer' ),
	443	+ esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.', 'visualizer' ),
483	444	'<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">',
484	445	'</a>'
485	446	),
486	447	sprintf(
487		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag.
488	448	esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ),
489		- '<a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax" target="_blank">',
	449	+ '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">',
490	450	'</a>'
491	451	)
492	452	)
493	453	);
		@@ -508,19 +468,18 @@
508	468	sprintf(
509	469	'%s<br><br>%s<br><br>%s',
510	470	esc_html__( 'Enter custom format pattern to apply to vertical axis labels.', 'visualizer' ),
511	471	sprintf(
512		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag.
513		- esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Note: Using the #&#37;&#37; percentage format will multiply your values by 100.', 'visualizer' ),
	472	+ esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.', 'visualizer' ),
514	473	'<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">',
515	474	'</a>'
516	475	),
517	476	sprintf(
518		- // translators: %1$s - HTML link tag, %2$s - HTML closing link tag.
519	477	esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ),
520		- '<a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax" target="_blank">',
	478	+ '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">',
521	479	'</a>'
522	480	)
523	481	)
524	482	);
525	483	}
	484	+
526	485	}