PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 1.6.6
Visualizer – Tables & Charts Manager with Built-in AI Generator v1.6.6
4.0.7 4.0.6 4.0.5 4.0.4 4.0.3 3.0.5 3.0.6 3.0.7 3.0.8 3.0.9 3.1.0 3.1.1 3.1.2 3.1.3 3.10.0 3.10.1 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14 3.10.15 3.10.2 3.10.3 3.10.4 All 148 releases
← All changes | classes/Visualizer/Render/Sidebar.php +284 -532 3.10.101.6.6 View file →
@@ -18,8 +18,10 @@
18 18 // | MA 02110-1301 USA |
19 19 // +----------------------------------------------------------------------+
20 20 // | Author: Eugene Manuilov <eugene@manuilov.org> |
21 21 // +----------------------------------------------------------------------+
22 +
23 +
22 24 /**
23 25 * Base class for all chart sidebar groups.
24 26 *
25 27 * @category Visualizer
@@ -63,22 +65,26 @@
63 65 */
64 66 protected $_yesno;
65 67
66 68 /**
67 - * Whether this chart supports animation or not.
69 + * The array of available legend positions.
68 70 *
71 + * @since 1.0.0
72 + *
69 73 * @access protected
70 - * @var bool
74 + * @var array
71 75 */
72 - protected $_supportsAnimation = true;
76 + protected $_legendPositions;
73 77
74 78 /**
75 - * Which library does this this chart implement?
79 + * The array of available alignments.
76 80 *
81 + * @since 1.0.0
82 + *
77 83 * @access protected
78 - * @var string
84 + * @var array
79 85 */
80 - protected $_library = null;
86 + protected $_alignments;
81 87
82 88 /**
83 89 * Constructor.
84 90 *
@@ -89,15 +95,30 @@
89 95 */
90 96 public function __construct( $data = array() ) {
91 97 parent::__construct( $data );
92 98
99 + $this->_legendPositions = array(
100 + '' => '',
101 + 'left' => esc_html__( 'Left of the chart', Visualizer_Plugin::NAME ),
102 + 'right' => esc_html__( 'Right of the chart', Visualizer_Plugin::NAME ),
103 + 'top' => esc_html__( 'Above the chart', Visualizer_Plugin::NAME ),
104 + 'bottom' => esc_html__( 'Below the chart', Visualizer_Plugin::NAME ),
105 + 'in' => esc_html__( 'Inside the chart', Visualizer_Plugin::NAME ),
106 + 'none' => esc_html__( 'Omit the legend', Visualizer_Plugin::NAME ),
107 + );
108 +
109 + $this->_alignments = array(
110 + '' => '',
111 + 'start' => esc_html__( 'Aligned to the start of the allocated area', Visualizer_Plugin::NAME ),
112 + 'center' => esc_html__( 'Centered in the allocated area', Visualizer_Plugin::NAME ),
113 + 'end' => esc_html__( 'Aligned to the end of the allocated area', Visualizer_Plugin::NAME ),
114 + );
115 +
93 116 $this->_yesno = array(
94 117 '' => '',
95 - '1' => esc_html__( 'Yes', 'visualizer' ),
96 - '0' => esc_html__( 'No', 'visualizer' ),
118 + '1' => esc_html__( 'Yes', Visualizer_Plugin::NAME ),
119 + '0' => esc_html__( 'No', Visualizer_Plugin::NAME ),
97 120 );
98 -
99 - $this->hooks();
100 121 }
101 122
102 123 /**
103 124 * Renders chart title settings.
@@ -107,171 +128,245 @@
107 128 * @access protected
108 129 */
109 130 protected function _renderChartTitleSettings() {
110 131 self::_renderTextItem(
111 - esc_html__( 'Chart Title', 'visualizer' ),
132 + esc_html__( 'Chart Title', Visualizer_Plugin::NAME ),
112 133 'title',
113 134 $this->title,
114 - esc_html__( 'Text to display above the chart.', 'visualizer' )
135 + esc_html__( 'Text to display above the chart.', Visualizer_Plugin::NAME )
115 136 );
116 137
117 138 self::_renderColorPickerItem(
118 - esc_html__( 'Chart Title Color', 'visualizer' ),
139 + esc_html__( 'Chart Title Color', Visualizer_Plugin::NAME ),
119 140 'titleTextStyle[color]',
120 141 isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null,
121 142 '#000'
122 143 );
123 -
124 - self::_renderTextAreaItem(
125 - esc_html__( 'Chart Description', 'visualizer' ),
126 - 'description',
127 - $this->description,
128 - 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>' )
129 - );
130 144 }
131 145
132 146 /**
133 - * Add the correct description for the manual configuration box.
147 + * Renders chart general settings group.
148 + *
149 + * @since 1.0.0
150 + *
151 + * @access protected
134 152 */
135 - protected function _renderManualConfigDescription() {
136 - self::_renderSectionStart();
137 - 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>' );
153 + protected function _renderGeneralSettings() {
154 + self::_renderGroupStart( esc_html__( 'General Settings', Visualizer_Plugin::NAME ) );
155 + self::_renderSectionStart();
156 + self::_renderSectionDescription( esc_html__( 'Configure title, font styles, tooltip, legend and else settings for the chart.', Visualizer_Plugin::NAME ) );
157 + self::_renderSectionEnd();
158 +
159 + self::_renderSectionStart( esc_html__( 'Title', Visualizer_Plugin::NAME ), false );
160 + $this->_renderChartTitleSettings();
161 + self::_renderSectionEnd();
162 +
163 + self::_renderSectionStart( esc_html__( 'Font Styles' ), false );
164 + echo '<div class="section-item">';
165 + echo '<a class="more-info" href="javascript:;">[?]</a>';
166 + echo '<b>', esc_html__( 'Family And Size', Visualizer_Plugin::NAME ), '</b>';
167 +
168 + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">';
169 + echo '<tr>';
170 + echo '<td class="section-table-column">';
171 + echo '<select name="fontName" class="control-select">';
172 + echo '<option></option>';
173 + foreach ( self::$_fontFamilies as $font => $label ) {
174 + echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>';
175 + echo $label;
176 + echo '</option>';
177 + }
178 + echo '</select>';
179 + echo '</td>';
180 + echo '<td class="section-table-column">';
181 + echo '<select name="fontSize" class="control-select">';
182 + echo '<option></option>';
183 + for ( $i = 7; $i <= 20; $i++ ) {
184 + echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>';
185 + }
186 + echo '</select>';
187 + echo '</td>';
188 + echo '</tr>';
189 + echo '</table>';
190 +
191 + echo '<p class="section-description">';
192 + esc_html_e( 'The default font family and size for all text in the chart.', Visualizer_Plugin::NAME );
193 + echo '</p>';
194 + echo '</div>';
195 + self::_renderSectionEnd();
196 +
197 + self::_renderSectionStart( esc_html__( 'Legend', Visualizer_Plugin::NAME ), false );
198 + self::_renderSelectItem(
199 + esc_html__( 'Position', Visualizer_Plugin::NAME ),
200 + 'legend[position]',
201 + $this->legend['position'],
202 + $this->_legendPositions,
203 + esc_html__( 'Determines where to place the legend, compared to the chart area.', Visualizer_Plugin::NAME )
204 + );
205 +
206 + self::_renderSelectItem(
207 + esc_html__( 'Alignment', Visualizer_Plugin::NAME ),
208 + 'legend[alignment]',
209 + $this->legend['alignment'],
210 + $this->_alignments,
211 + esc_html__( 'Determines the alignment of the legend.', Visualizer_Plugin::NAME )
212 + );
213 +
214 + self::_renderColorPickerItem(
215 + esc_html__( 'Font Color', Visualizer_Plugin::NAME ),
216 + 'legend[textStyle][color]',
217 + isset( $this->legend['textStyle']['color'] ) ? $this->legend['textStyle']['color'] : null,
218 + '#000'
219 + );
220 + self::_renderSectionEnd();
221 +
222 + self::_renderSectionStart( esc_html__( 'Tooltip', Visualizer_Plugin::NAME ), false );
223 + $this->_renderTooltipSettigns();
224 + self::_renderSectionEnd();
225 + self::_renderGroupEnd();
138 226 }
139 227
140 228 /**
141 - * Add the correct example for the manual configuration box.
229 + * Renders tooltip settings section.
230 + *
231 + * @since 1.4.0
232 + *
233 + * @access protected
142 234 */
143 - protected function _renderManualConfigExample() {
144 - return '{
145 - "vAxis": {
146 - "ticks": [5, 10, 15, 20],
147 - "titleTextStyle": {
148 - "color": "red"
149 - },
150 - "textPosition": "in"
151 - }
152 - }';
235 + protected function _renderTooltipSettigns() {
236 + self::_renderSelectItem(
237 + esc_html__( 'Trigger', Visualizer_Plugin::NAME ),
238 + 'tooltip[trigger]',
239 + isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null,
240 + array(
241 + '' => '',
242 + 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', Visualizer_Plugin::NAME ),
243 + 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', Visualizer_Plugin::NAME ),
244 + 'none' => esc_html__( 'The tooltip will not be displayed', Visualizer_Plugin::NAME ),
245 + ),
246 + esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', Visualizer_Plugin::NAME )
247 + );
248 +
249 + self::_renderSelectItem(
250 + esc_html__( 'Show Color Code', Visualizer_Plugin::NAME ),
251 + 'tooltip[showColorCode]',
252 + isset( $this->tooltip['showColorCode'] ) ? $this->tooltip['showColorCode'] : null,
253 + $this->_yesno,
254 + esc_html__( 'If set to yes, will show colored squares next to the slice information in the tooltip.', Visualizer_Plugin::NAME )
255 + );
153 256 }
154 257
155 258 /**
156 - * Renders chart advanced settings group.
259 + * Renders chart view settings group.
157 260 *
261 + * @since 1.0.0
262 + *
158 263 * @access protected
159 264 */
160 - protected function _renderAdvancedSettings() {
161 - // Chart control settings.
162 - $this->_renderChartControlsGroup();
265 + protected function _renderViewSettings() {
266 + self::_renderGroupStart( esc_html__( 'Layout & Chart Area', Visualizer_Plugin::NAME ) );
267 + self::_renderSectionStart( esc_html__( 'Layout', Visualizer_Plugin::NAME ), false );
268 + 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_Plugin::NAME ) );
163 269
164 - if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
165 - self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) );
166 - } else {
167 - self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) . '<span class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-frontend-actions' ), 'vz-frontend-actions' );
168 - echo '<div style="position: relative">';
169 - }
170 - self::_renderSectionStart();
171 - self::_renderSectionDescription( esc_html__( 'Configure frontend actions that need to be shown.', 'visualizer' ) );
172 - self::_renderSectionEnd();
270 + echo '<div class="section-item">';
271 + echo '<a class="more-info" href="javascript:;">[?]</a>';
272 + echo '<b>', esc_html__( 'Width And Height Of Chart', Visualizer_Plugin::NAME ), '</b>';
173 273
174 - $this->_renderActionSettings();
175 - if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) {
176 - echo apply_filters( 'visualizer_pro_upsell', '', 'frontend-actions' );
177 - echo '</div>';
178 - }
179 - self::_renderGroupEnd();
274 + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">';
275 + echo '<tr>';
276 + echo '<td class="section-table-column">';
277 + echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">';
278 + echo '</td>';
279 + echo '<td class="section-table-column">';
280 + echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">';
281 + echo '</td>';
282 + echo '</tr>';
283 + echo '</table>';
180 284
181 - self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) );
182 - $this->_renderManualConfigDescription();
183 - self::_renderTextAreaItem(
184 - esc_html__( 'Configuration', 'visualizer' ),
185 - 'manual',
186 - $this->manual,
187 - sprintf(
188 - esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ),
189 - '<br><code>' . $this->_renderManualConfigExample() . '</code>'
190 - ),
191 - '',
192 - array( 'rows' => 5 )
193 - );
285 + echo '<p class="section-description">';
286 + esc_html_e( 'Determines the total width and height of the chart.', Visualizer_Plugin::NAME );
287 + echo '</p>';
288 + echo '</div>';
194 289
195 - self::_renderSectionEnd();
196 - self::_renderGroupEnd();
290 + echo '<div class="section-delimiter"></div>';
197 291
198 - }
292 + self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', Visualizer_Plugin::NAME ) );
199 293
200 - /**
201 - * Renders chart action buttons group.
202 - *
203 - * @access protected
204 - */
205 - protected function _renderActionSettings() {
206 - global $wp_version;
207 - $disable_actions = version_compare( $wp_version, '4.7.0', '<' );
208 - // default open this section when not testing through cypress because cypress expects to click and open each section
209 - // and may not like finding a section is already open.
210 - self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), ! defined( 'TI_CYPRESS_TESTING' ) );
211 - self::_renderCheckboxItem(
212 - esc_html__( 'Print', 'visualizer' ),
213 - 'actions[]',
214 - isset( $this->actions ) && in_array( 'print', $this->actions, true ) ? true : false,
215 - 'print',
216 - $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' ),
217 - $disable_actions
218 - );
219 - self::_renderCheckboxItem(
220 - esc_html__( 'CSV', 'visualizer' ),
221 - 'actions[]',
222 - isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions, true ) ? true : false,
223 - 'csv;application/csv',
224 - $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' ),
225 - $disable_actions
226 - );
294 + self::_renderTextItem(
295 + esc_html__( 'Stroke Width', Visualizer_Plugin::NAME ),
296 + 'backgroundColor[strokeWidth]',
297 + isset( $this->backgroundColor['strokeWidth'] ) ? $this->backgroundColor['strokeWidth'] : null,
298 + esc_html__( 'The chart border width in pixels.', Visualizer_Plugin::NAME ),
299 + '0'
300 + );
227 301
228 - $disabled = ! self::is_excel_enabled();
229 - self::_renderCheckboxItem(
230 - esc_html__( 'Excel', 'visualizer' ),
231 - 'actions[]',
232 - isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions, true ) ? true : false,
233 - 'xls;application/vnd.ms-excel',
234 - $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' ) ),
235 - $disable_actions || $disabled
236 - );
237 - self::_renderCheckboxItem(
238 - esc_html__( 'Copy', 'visualizer' ),
239 - 'actions[]',
240 - isset( $this->actions ) && in_array( 'copy', $this->actions, true ) ? true : false,
241 - 'copy',
242 - $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' ),
243 - $disable_actions
244 - );
302 + self::_renderColorPickerItem(
303 + esc_html__( 'Stroke Color', Visualizer_Plugin::NAME ),
304 + 'backgroundColor[stroke]',
305 + !empty( $this->backgroundColor['stroke'] ) ? $this->backgroundColor['stroke'] : null,
306 + '#666'
307 + );
245 308
246 - // not all charts support downloading as an image.
247 - $disabled = ! $this->can_chart_have_action( 'image' );
248 - self::_renderCheckboxItem(
249 - esc_html__( 'Download Image', 'visualizer' ),
250 - 'actions[]',
251 - isset( $this->actions ) && in_array( 'image', $this->actions, true ) ? true : false,
252 - 'image',
253 - $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__( 'Not supported for this chart type.', 'visualizer' ) . '</span>' : esc_html__( 'To download the chart as an image.', 'visualizer' ) ),
254 - $disable_actions || $disabled
255 - );
256 - self::_renderSectionEnd();
257 - }
309 + $background_color = !empty( $this->backgroundColor['fill'] ) ? $this->backgroundColor['fill'] : null;
310 + self::_renderColorPickerItem(
311 + esc_html__( 'Background Color', Visualizer_Plugin::NAME ),
312 + 'backgroundColor[fill]',
313 + $background_color,
314 + '#fff'
315 + );
258 316
259 - /**
260 - * Checks if the Excel module can be enabled.
261 - */
262 - private static function is_excel_enabled() {
263 - $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
264 - if ( is_readable( $vendor_file ) ) {
265 - include_once( $vendor_file );
266 - }
317 + echo '<div class="section-item">';
318 + echo '<label>';
319 + echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> ';
320 + esc_html_e( 'Transparent background' );
321 + echo '</label>';
322 + echo '</div>';
323 + self::_renderSectionEnd();
267 324
268 - if ( version_compare( phpversion(), '5.6.0', '<' ) ) {
269 - do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'PHP version %s not supported', phpversion() ), 'error', __FILE__, __LINE__ );
270 - return false;
271 - }
325 + self::_renderSectionStart( esc_html__( 'Chart Area', Visualizer_Plugin::NAME ), false );
326 + 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_Plugin::NAME ) );
272 327
273 - return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' );
328 + echo '<div class="section-item">';
329 + echo '<a class="more-info" href="javascript:;">[?]</a>';
330 + echo '<b>', esc_html__( 'Left And Top Margins', Visualizer_Plugin::NAME ), '</b>';
331 +
332 + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">';
333 + echo '<tr>';
334 + echo '<td class="section-table-column">';
335 + echo '<input type="text" name="chartArea[left]" class="control-text" value="', !empty( $this->chartArea['left'] ) ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">';
336 + echo '</td>';
337 + echo '<td class="section-table-column">';
338 + echo '<input type="text" name="chartArea[top]" class="control-text" value="', !empty( $this->chartArea['top'] ) ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">';
339 + echo '</td>';
340 + echo '</tr>';
341 + echo '</table>';
342 +
343 + echo '<p class="section-description">';
344 + esc_html_e( 'Determines how far to draw the chart from the left and top borders.', Visualizer_Plugin::NAME );
345 + echo '</p>';
346 + echo '</div>';
347 +
348 + echo '<div class="section-item">';
349 + echo '<a class="more-info" href="javascript:;">[?]</a>';
350 + echo '<b>', esc_html__( 'Width And Height Of Chart Area', Visualizer_Plugin::NAME ), '</b>';
351 +
352 + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">';
353 + echo '<tr>';
354 + echo '<td class="section-table-column">';
355 + echo '<input type="text" name="chartArea[width]" class="control-text" value="', !empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">';
356 + echo '</td>';
357 + echo '<td class="section-table-column">';
358 + echo '<input type="text" name="chartArea[height]" class="control-text" value="', !empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">';
359 + echo '</td>';
360 + echo '</tr>';
361 + echo '</table>';
362 +
363 + echo '<p class="section-description">';
364 + esc_html_e( 'Determines the width and hight of the chart area.', Visualizer_Plugin::NAME );
365 + echo '</p>';
366 + echo '</div>';
367 + self::_renderSectionEnd();
368 + self::_renderGroupEnd();
274 369 }
275 370
276 371 /**
277 372 * Renders select item.
@@ -278,38 +373,27 @@
278 373 *
279 374 * @since 1.0.0
280 375 *
281 376 * @static
282 - * @access public
377 + * @access protected
283 378 * @param string $title The title of the select item.
284 379 * @param string $name The name of the select item.
285 380 * @param string $value The actual value of the select item.
286 - * @param array $options The array of select options.
381 + * @param array $options The array of select options.
287 382 * @param string $desc The description of the select item.
288 - * @param bool $multiple Is this a multiple select box.
289 - * @param array $classes Any additional classes.
290 - * @param array $attributes Custom attributes.
291 383 */
292 - public static function _renderSelectItem( $title, $name, $value, array $options, $desc, $multiple = false, $classes = array(), $attributes = array() ) {
293 - $atts = '';
294 - if ( $attributes ) {
295 - foreach ( $attributes as $k => $v ) {
296 - $atts .= ' data-visualizer-' . $k . '=' . esc_attr( $v );
297 - }
298 - }
299 - echo '<div class="viz-section-item">';
384 + protected static function _renderSelectItem( $title, $name, $value, array $options, $desc ) {
385 + echo '<div class="section-item">';
300 386 echo '<a class="more-info" href="javascript:;">[?]</a>';
301 387 echo '<b>', $title, '</b>';
302 - echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>';
303 - foreach ( $options as $key => $label ) {
304 - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
305 - $extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false );
306 - echo '<option value="', $key, '"', $extra, '>';
307 - echo $label;
308 - echo '</option>';
309 - }
388 + echo '<select class="control-select" name="', $name, '">';
389 + foreach ( $options as $key => $label ) {
390 + echo '<option value="', $key, '"', selected( $key, $value, false ), '>';
391 + echo $label;
392 + echo '</option>';
393 + }
310 394 echo '</select>';
311 - echo '<p class="viz-section-description">', $desc, '</p>';
395 + echo '<p class="section-description">', $desc, '</p>';
312 396 echo '</div>';
313 397 }
314 398
315 399 /**
@@ -324,12 +408,12 @@
324 408 * @param string $value The actual value of the select item.
325 409 * @param string $default The default value of the color picker.
326 410 */
327 411 protected static function _renderColorPickerItem( $title, $name, $value, $default ) {
328 - echo '<div class="viz-section-item">';
412 + echo '<div class="section-item">';
329 413 echo '<b>', $title, '</b>';
330 414 echo '<div>';
331 - echo '<input type="text" class="color-picker-hex color-picker" data-alpha-enabled="true" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', 'visualizer' ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">';
415 + echo '<input type="text" class="color-picker-hex" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', Visualizer_Plugin::NAME ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">';
332 416 echo '</div>';
333 417 echo '</div>';
334 418 }
335 419
@@ -344,24 +428,15 @@
344 428 * @param string $name The name of the select item.
345 429 * @param string $value The actual value of the select item.
346 430 * @param string $desc The description of the select item.
347 431 * @param string $placeholder The placeholder for the input.
348 - * @param string $type The type for the input (out of number, email, tel etc., default is text).
349 - * @param array $custom_attributes The custom attributes.
350 432 */
351 - protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array(), $extra_class = array() ) {
352 - $attributes = '';
353 - if ( $custom_attributes ) {
354 - foreach ( $custom_attributes as $k => $v ) {
355 - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"';
356 - }
357 - }
358 - $extra_class[] = 'viz-section-item';
359 - echo '<div class="' . esc_attr( implode( ' ', $extra_class ) ) . '">';
433 + protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '' ) {
434 + echo '<div class="section-item">';
360 435 echo '<a class="more-info" href="javascript:;">[?]</a>';
361 436 echo '<b>', $title, '</b>';
362 - echo '<input type="', $type, '" class="control-text" ', $attributes, ' name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">';
363 - echo '<p class="viz-section-description">', $desc, '</p>';
437 + echo '<input type="text" class="control-text" name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">';
438 + echo '<p class="section-description">', $desc, '</p>';
364 439 echo '</div>';
365 440 }
366 441
367 442 /**
@@ -369,18 +444,15 @@
369 444 *
370 445 * @since 1.0.0
371 446 *
372 447 * @static
373 - * @access public
448 + * @access protected
374 449 * @param string $title The title of this group.
375 - * @param string $html Any additional HTML.
376 - * @param string $class Any additional classes.
377 450 */
378 - public static function _renderGroupStart( $title, $html = '', $class = '', $id = '' ) {
379 - echo '<li id="' . $id . '" class="viz-group ' . $class . '">';
380 - echo '<h3 class="viz-group-title">', $title, '</h3>';
381 - echo $html;
382 - echo '<ul class="viz-group-content">';
451 + protected static function _renderGroupStart( $title ) {
452 + echo '<li class="group">';
453 + echo '<h3 class="group-title">', $title, '</h3>';
454 + echo '<ul class="group-content">';
383 455 }
384 456
385 457 /**
386 458 * Renders the ending of a group.
@@ -387,11 +459,11 @@
387 459 *
388 460 * @since 1.0.0
389 461 *
390 462 * @static
391 - * @access public
463 + * @access protected
392 464 */
393 - public static function _renderGroupEnd() {
465 + protected static function _renderGroupEnd() {
394 466 echo '</ul>';
395 467 echo '</li>';
396 468 }
397 469
@@ -400,21 +472,18 @@
400 472 *
401 473 * @since 1.0.0
402 474 *
403 475 * @static
404 - * @access public
405 - * @param string $title The title of this section. If the title is empty, no title will be displayed.
476 + * @access protected
477 + * @param string $title The title of this section. If the title is empty, no title will be displayed.
406 478 * @param boolean $open Determines whether the section items block has to be expanded or collapsed.
407 479 */
408 - public static function _renderSectionStart( $title = false, $open = true ) {
409 -
410 - if ( ! empty( $title ) ) {
411 - echo '<li class="viz-subsection">';
412 - echo '<span class="viz-section-title">', $title, '</span>';
413 - } else {
414 - echo '<li class=" ">';
415 - }
416 - echo '<div class="viz-section-items section-items', $open ? ' open' : '', '">';
480 + protected static function _renderSectionStart( $title = false, $open = true ) {
481 + echo '<li>';
482 + if ( !empty( $title ) ) {
483 + echo '<span class="section-title">', $title, '</span>';
484 + }
485 + echo '<div class="section-items', $open ? ' open' : '', '">';
417 486 }
418 487
419 488 /**
420 489 * Renders the ending of a section.
@@ -420,15 +489,13 @@
420 489 * Renders the ending of a section.
421 490 *
422 491 * @since 1.0.0
423 492 *
424 - * @public
493 + * @static
425 494 * @access protected
426 - * @param string $html Any addition HTML to add.
427 495 */
428 - public static function _renderSectionEnd( $html = '' ) {
496 + protected static function _renderSectionEnd() {
429 497 echo '</div>';
430 - echo $html;
431 498 echo '</li>';
432 499 }
433 500
434 501 /**
@@ -436,14 +503,14 @@
436 503 *
437 504 * @since 1.0.0
438 505 *
439 506 * @static
440 - * @access public
507 + * @access protected
441 508 * @param string $description The description text.
442 509 */
443 - public static function _renderSectionDescription( $description, $classes = '' ) {
444 - echo '<div class="viz-section-item">';
445 - echo '<div class="viz-section-description ' . $classes . '">', $description, '</div>';
510 + protected static function _renderSectionDescription( $description ) {
511 + echo '<div class="section-item">';
512 + echo '<div class="section-description">', $description, '</div>';
446 513 echo '</div>';
447 514 }
448 515
449 516 /**
@@ -454,15 +521,15 @@
454 521 * @access protected
455 522 * @param int $index The index of the series.
456 523 */
457 524 protected function _renderFormatField( $index = 0 ) {
458 - switch ( $this->__series[ $index + 1 ]['type'] ) {
525 + switch ( $this->__series[$index + 1]['type'] ) {
459 526 case 'number':
460 527 self::_renderTextItem(
461 - esc_html__( 'Number Format', 'visualizer' ),
528 + esc_html__( 'Number Format', Visualizer_Plugin::NAME ),
462 529 'series[' . $index . '][format]',
463 - isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '',
464 - sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU pattern set%2$s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use &#37; percentage format then your values will be multiplied by 100.', 'visualizer' ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ),
530 + isset( $this->series[$index]['format'] ) ? $this->series[$index]['format'] : '',
531 + sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %sICU pattern set%s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use #%% percentage format then your values will be multiplied by 100.', Visualizer_Plugin::NAME ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ),
465 532 '#,###.##'
466 533 );
467 534 break;
468 535 case 'date':
@@ -468,12 +535,12 @@
468 535 case 'date':
469 536 case 'datetime':
470 537 case 'timeofday':
471 538 self::_renderTextItem(
472 - esc_html__( 'Date Format', 'visualizer' ),
539 + esc_html__( 'Date Format', Visualizer_Plugin::NAME ),
473 540 'series[' . $index . '][format]',
474 - isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '',
475 - sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU date and time format%2$s.', 'visualizer' ), '<a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax" target="_blank">', '</a>' ),
541 + isset( $this->series[$index]['format'] ) ? $this->series[$index]['format'] : '',
542 + sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %sICU date and time format%s.', Visualizer_Plugin::NAME ), '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ),
476 543 'eeee, dd LLLL yyyy'
477 544 );
478 545 break;
479 546 }
@@ -478,329 +545,14 @@
478 545 break;
479 546 }
480 547 }
481 548
482 - /**
483 - * Render a checkbox item
484 - */
485 - protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) {
486 - echo '<div class="viz-section-item">';
549 + protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc ) {
550 + echo '<div class="section-item">';
487 551 echo '<a class="more-info" href="javascript:;">[?]</a>';
488 552 echo '<b>', $title, '</b>';
489 - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
490 - echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>';
491 - echo '<p class="viz-section-description">', $desc, '</p>';
553 + echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ($value == $default ? "checked" : ""), '>';
554 + echo '<p class="section-description">', $desc, '</p>';
492 555 echo '</div>';
493 556 }
494 557
495 - /**
496 - * Render a textarea item.
497 - */
498 - protected static function _renderTextAreaItem( $title, $name, $value, $desc, $placeholder = '', $custom_attributes = array() ) {
499 - $attributes = '';
500 - if ( $custom_attributes ) {
501 - foreach ( $custom_attributes as $k => $v ) {
502 - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"';
503 - }
504 - }
505 - echo '<div class="viz-section-item">';
506 - echo '<a class="more-info" href="javascript:;">[?]</a>';
507 - echo '<b>', $title, '</b>';
508 - echo '<textarea class="control-text" ', $attributes, ' name="', $name, '" placeholder="', $placeholder, '">', $value, '</textarea>';
509 - echo '<p class="viz-section-description">', $desc, '</p>';
510 - echo '</div>';
511 - }
512 -
513 - /**
514 - * Returns the library this chart implements.
515 - */
516 - public function getLibrary() {
517 - return $this->_library;
518 - }
519 -
520 - /**
521 - * Loads generic libraries conditionally.
522 - */
523 - protected function load_dependent_assets( $libs ) {
524 - if ( in_array( 'moment', $libs, true ) && ! wp_script_is( 'moment', 'registered' ) ) {
525 - wp_register_script( 'moment' );
526 - }
527 -
528 - if ( in_array( 'numeral', $libs, true ) && ! wp_script_is( 'numeral', 'registered' ) ) {
529 - wp_register_script( 'numeral', VISUALIZER_ABSURL . 'js/lib/numeral.min.js', array(), Visualizer_Plugin::VERSION );
530 - }
531 -
532 - }
533 -
534 - /**
535 - * Renders save chart as image setting group.
536 - *
537 - * @access protected
538 - */
539 - protected function _renderChartImageSettings() {
540 - // Default enable if amp is active.
541 - $is_amp = function_exists( 'amp_is_enabled' ) && amp_is_enabled();
542 - $this->save_chart_image = null === $this->save_chart_image && $is_amp ? true : $this->save_chart_image;
543 -
544 - $is_create_chart = true;
545 - if ( filter_input( INPUT_GET, 'library', FILTER_VALIDATE_BOOLEAN ) ) {
546 - if ( filter_input( INPUT_GET, 'action' ) === Visualizer_Plugin::ACTION_EDIT_CHART ) {
547 - $is_create_chart = false;
548 - }
549 - }
550 - $this->lazy_load_chart = null === $this->lazy_load_chart && $is_create_chart ? true : $this->lazy_load_chart;
551 -
552 - self::_renderSectionStart( esc_html__( 'Save chart as an image inside Media Library', 'visualizer' ), false );
553 - self::_renderCheckboxItem(
554 - esc_html__( 'Save inside media library?', 'visualizer' ),
555 - 'save_chart_image',
556 - $this->save_chart_image ? true : false,
557 - 'yes',
558 - esc_html__( 'To enable save the image as an inside media library.', 'visualizer' ),
559 - false
560 - );
561 - self::_renderSectionEnd();
562 -
563 - self::_renderSectionStart( esc_html__( 'Lazy rendering of chart', 'visualizer' ), false );
564 - self::_renderCheckboxItem(
565 - esc_html__( 'Enable lazy rendering of chart?', 'visualizer' ),
566 - 'lazy_load_chart',
567 - $this->lazy_load_chart ? true : false,
568 - 'yes',
569 - esc_html__( 'To enable lazy chart rendering.', 'visualizer' ),
570 - false
571 - );
572 - self::_renderSectionEnd();
573 - }
574 -
575 - /**
576 - * Renders chart controls group.
577 - *
578 - * @access protected
579 - */
580 - protected function _renderChartControlsGroup() {
581 - if ( 'google' !== $this->getLibrary() ) {
582 - return;
583 - }
584 - if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
585 - self::_renderGroupStart( esc_html__( 'Chart Data Filter Configuration', 'visualizer' ) );
586 - } else {
587 - self::_renderGroupStart( esc_html__( 'Chart Data Filter Configuration', 'visualizer' ) . '<span class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-filter-controls' ), 'vz-data-controls' );
588 - echo '<div style="position: relative">';
589 - }
590 - self::_renderSectionStart();
591 - self::_renderSectionDescription( '<span class="viz-gvlink">' . sprintf( __( 'Configure the data filter controls by providing configuration variables right from the %1$sChart Controls API%2$s. ', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/gallery/controls#controls-gallery" target="_blank">', '</a>' ) . '</span>' );
592 - self::_renderSectionEnd();
593 - $this->_renderChartControlsSettings();
594 - if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) {
595 - echo apply_filters( 'visualizer_pro_upsell', '', 'data-filter-configuration' );
596 - echo '</div>';
597 - }
598 - self::_renderGroupEnd();
599 - }
600 -
601 - /**
602 - * Renders chart controls setting.
603 - *
604 - * @access protected
605 - */
606 - protected function _renderChartControlsSettings() {
607 -
608 - self::_renderSectionStart( esc_html__( 'Options', 'visualizer' ), false );
609 - $control_type = ! empty( $this->controls['controlType'] ) ? $this->controls['controlType'] : '';
610 -
611 - self::_renderSelectItem(
612 - esc_html__( 'Filter Type', 'visualizer' ),
613 - 'controls[controlType]',
614 - $control_type,
615 - array(
616 - '' => '',
617 - 'StringFilter' => esc_html__( 'String Filter', 'visualizer' ),
618 - 'NumberRangeFilter' => esc_html__( 'Number Range Filter', 'visualizer' ),
619 - 'CategoryFilter' => esc_html__( 'Category Filter', 'visualizer' ),
620 - 'ChartRangeFilter' => esc_html__( 'Chart Range Filter', 'visualizer' ),
621 - 'DateRangeFilter' => esc_html__( 'Date Range Filter', 'visualizer' ),
622 - ),
623 - '',
624 - false,
625 - array( 'vz-controls-opt' )
626 - );
627 -
628 - $column_index = [ 'false' => '' ];
629 - $column_label = [ 'false' => '' ];
630 - if ( ! empty( $this->__series ) ) {
631 - foreach ( $this->__series as $key => $column ) {
632 - $column_type = isset( $column['type'] ) ? $column['type'] : '';
633 - $label = isset( $column['label'] ) ? $column['label'] : '';
634 - $column_label[ $label ] = $label;
635 - $column_index[ $key ] = sprintf( __( '%1$d — Column Type: %2$s ', 'visualizer' ), $key, ucfirst( $column_type ) );
636 - }
637 - }
638 -
639 - self::_renderSelectItem(
640 - esc_html__( 'Filter By Column Index', 'visualizer' ),
641 - 'controls[filterColumnIndex]',
642 - isset( $this->controls['filterColumnIndex'] ) ? $this->controls['filterColumnIndex'] : '',
643 - $column_index,
644 - '',
645 - false,
646 - array( 'vz-controls-opt' )
647 - );
648 -
649 - self::_renderSelectItem(
650 - esc_html__( 'Filter By Column Label', 'visualizer' ),
651 - 'controls[filterColumnLabel]',
652 - ! empty( $this->controls['filterColumnLabel'] ) ? $this->controls['filterColumnLabel'] : '',
653 - $column_label,
654 - '',
655 - false,
656 - array( 'vz-controls-opt' )
657 - );
658 -
659 - self::_renderSelectItem(
660 - esc_html__( 'Use Formatted Value', 'visualizer' ),
661 - 'controls[useFormattedValue]',
662 - ! empty( $this->controls['useFormattedValue'] ) ? $this->controls['useFormattedValue'] : '',
663 - array(
664 - 'false' => esc_html__( 'False', 'visualizer' ),
665 - 'true' => esc_html__( 'True', 'visualizer' ),
666 - ),
667 - '',
668 - false
669 - );
670 -
671 - self::_renderTextItem(
672 - esc_html__( 'Min Value', 'visualizer' ),
673 - 'controls[minValue]',
674 - ! empty( $this->controls['minValue'] ) ? $this->controls['minValue'] : '',
675 - esc_html__( 'Minimum allowed value for the range lower extent.', 'visualizer' ),
676 - '',
677 - 'text'
678 - );
679 -
680 - self::_renderTextItem(
681 - esc_html__( 'Max Value', 'visualizer' ),
682 - 'controls[maxValue]',
683 - ! empty( $this->controls['maxValue'] ) ? $this->controls['maxValue'] : '',
684 - esc_html__( 'Maximum allowed value for the range higher extent.', 'visualizer' ),
685 - '',
686 - 'text'
687 - );
688 -
689 - self::_renderSelectItem(
690 - esc_html__( 'Match Type', 'visualizer' ),
691 - 'controls[matchType]',
692 - ! empty( $this->controls['matchType'] ) ? $this->controls['matchType'] : '',
693 - array(
694 - 'prefix' => esc_html__( 'Prefix', 'visualizer' ),
695 - 'exact' => esc_html__( 'Exact', 'visualizer' ),
696 - 'any' => esc_html__( 'Any', 'visualizer' ),
697 - ),
698 - '',
699 - false
700 - );
701 -
702 - self::_renderSelectItem(
703 - esc_html__( 'Case Sensitive', 'visualizer' ),
704 - 'controls[caseSensitive]',
705 - ! empty( $this->controls['caseSensitive'] ) ? $this->controls['caseSensitive'] : '',
706 - array(
707 - 'false' => esc_html__( 'False', 'visualizer' ),
708 - 'true' => esc_html__( 'True', 'visualizer' ),
709 - ),
710 - '',
711 - false
712 - );
713 -
714 - self::_renderSectionEnd();
715 -
716 - self::_renderSectionStart( esc_html__( 'UI Options', 'visualizer' ), false );
717 -
718 - self::_renderTextItem(
719 - esc_html__( 'Label', 'visualizer' ),
720 - 'controls[ui][label]',
721 - ! empty( $this->controls['ui']['label'] ) ? $this->controls['ui']['label'] : '',
722 - '',
723 - '',
724 - 'text'
725 - );
726 -
727 - self::_renderTextItem(
728 - esc_html__( 'Label Separator', 'visualizer' ),
729 - 'controls[ui][labelSeparator]',
730 - ! empty( $this->controls['ui']['labelSeparator'] ) ? $this->controls['ui']['labelSeparator'] : '',
731 - '',
732 - '',
733 - 'text'
734 - );
735 -
736 - self::_renderTextItem(
737 - esc_html__( 'Caption', 'visualizer' ),
738 - 'controls[ui][caption]',
739 - ! empty( $this->controls['ui']['caption'] ) ? $this->controls['ui']['caption'] : '',
740 - '',
741 - '',
742 - 'text'
743 - );
744 -
745 - self::_renderSelectItem(
746 - esc_html__( 'Label Stacking', 'visualizer' ),
747 - 'controls[ui][labelStacking]',
748 - ! empty( $this->controls['ui']['labelStacking'] ) ? $this->controls['ui']['labelStacking'] : '',
749 - array(
750 - 'horizontal' => esc_html__( 'Horizontal', 'visualizer' ),
751 - 'vertical' => esc_html__( 'Vertical', 'visualizer' ),
752 - ),
753 - '',
754 - false
755 - );
756 -
757 - self::_renderSelectItem(
758 - esc_html__( 'Orientation', 'visualizer' ),
759 - 'controls[ui][orientation]',
760 - ! empty( $this->controls['ui']['orientation'] ) ? $this->controls['ui']['orientation'] : '',
761 - array(
762 - 'horizontal' => esc_html__( 'Horizontal', 'visualizer' ),
763 - 'vertical' => esc_html__( 'Vertical', 'visualizer' ),
764 - ),
765 - '',
766 - false
767 - );
768 -
769 - self::_renderSelectItem(
770 - esc_html__( 'Show Range Values', 'visualizer' ),
771 - 'controls[showRangeValues]',
772 - ! empty( $this->controls['showRangeValues'] ) ? $this->controls['showRangeValues'] : '',
773 - array(
774 - 'true' => esc_html__( 'True', 'visualizer' ),
775 - 'false' => esc_html__( 'False', 'visualizer' ),
776 - ),
777 - '',
778 - false
779 - );
780 -
781 - self::_renderSelectItem(
782 - esc_html__( 'Allow Multiple', 'visualizer' ),
783 - 'controls[allowMultiple]',
784 - ! empty( $this->controls['allowMultiple'] ) ? $this->controls['allowMultiple'] : '',
785 - array(
786 - 'true' => esc_html__( 'True', 'visualizer' ),
787 - 'false' => esc_html__( 'False', 'visualizer' ),
788 - ),
789 - '',
790 - false
791 - );
792 -
793 - self::_renderSelectItem(
794 - esc_html__( 'Allow Typing', 'visualizer' ),
795 - 'controls[allowTyping]',
796 - ! empty( $this->controls['allowTyping'] ) ? $this->controls['allowTyping'] : '',
797 - array(
798 - 'true' => esc_html__( 'True', 'visualizer' ),
799 - 'false' => esc_html__( 'False', 'visualizer' ),
800 - ),
801 - '',
802 - false
803 - );
804 - self::_renderSectionEnd();
805 - }
806 -}
558 +}