| @@ -63,8 +63,28 @@ | ||
| 63 | 63 | */ |
| 64 | 64 | protected $_yesno; |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | + * The array of available legend positions. | |
| 68 | + * | |
| 69 | + * @since 1.0.0 | |
| 70 | + * | |
| 71 | + * @access protected | |
| 72 | + * @var array | |
| 73 | + */ | |
| 74 | + protected $_legendPositions; | |
| 75 | + | |
| 76 | + /** | |
| 77 | + * The array of available alignments. | |
| 78 | + * | |
| 79 | + * @since 1.0.0 | |
| 80 | + * | |
| 81 | + * @access protected | |
| 82 | + * @var array | |
| 83 | + */ | |
| 84 | + protected $_alignments; | |
| 85 | + | |
| 86 | + /** | |
| 67 | 87 | * Whether this chart supports animation or not. |
| 68 | 88 | * |
| 69 | 89 | * @access protected |
| 70 | 90 | * @var bool |
| @@ -89,8 +109,25 @@ | ||
| 89 | 109 | */ |
| 90 | 110 | public function __construct( $data = array() ) { |
| 91 | 111 | parent::__construct( $data ); |
| 92 | 112 | |
| 113 | + $this->_legendPositions = array( | |
| 114 | + '' => '', | |
| 115 | + 'left' => esc_html__( 'Left of the chart', 'visualizer' ), | |
| 116 | + 'right' => esc_html__( 'Right of the chart', 'visualizer' ), | |
| 117 | + 'top' => esc_html__( 'Above the chart', 'visualizer' ), | |
| 118 | + 'bottom' => esc_html__( 'Below the chart', 'visualizer' ), | |
| 119 | + 'in' => esc_html__( 'Inside the chart', 'visualizer' ), | |
| 120 | + 'none' => esc_html__( 'Omit the legend', 'visualizer' ), | |
| 121 | + ); | |
| 122 | + | |
| 123 | + $this->_alignments = array( | |
| 124 | + '' => '', | |
| 125 | + 'start' => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ), | |
| 126 | + 'center' => esc_html__( 'Centered in the allocated area', 'visualizer' ), | |
| 127 | + 'end' => esc_html__( 'Aligned to the end of the allocated area', 'visualizer' ), | |
| 128 | + ); | |
| 129 | + | |
| 93 | 130 | $this->_yesno = array( |
| 94 | 131 | '' => '', |
| 95 | 132 | '1' => esc_html__( 'Yes', 'visualizer' ), |
| 96 | 133 | '0' => esc_html__( 'No', 'visualizer' ), |
| @@ -119,15 +156,8 @@ | ||
| 119 | 156 | 'titleTextStyle[color]', |
| 120 | 157 | isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null, |
| 121 | 158 | '#000' |
| 122 | 159 | ); |
| 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 | 160 | } |
| 131 | 161 | |
| 132 | 162 | /** |
| 133 | 163 | * Add the correct description for the manual configuration box. |
| @@ -157,26 +187,14 @@ | ||
| 157 | 187 | * |
| 158 | 188 | * @access protected |
| 159 | 189 | */ |
| 160 | 190 | protected function _renderAdvancedSettings() { |
| 161 | - // Chart control settings. | |
| 162 | - $this->_renderChartControlsGroup(); | |
| 163 | - | |
| 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 | - } | |
| 191 | + self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) ); | |
| 170 | 192 | self::_renderSectionStart(); |
| 171 | 193 | self::_renderSectionDescription( esc_html__( 'Configure frontend actions that need to be shown.', 'visualizer' ) ); |
| 172 | 194 | self::_renderSectionEnd(); |
| 173 | 195 | |
| 174 | 196 | $this->_renderActionSettings(); |
| 175 | - if ( ! Visualizer_Module_Admin::proFeaturesLocked() ) { | |
| 176 | - echo apply_filters( 'visualizer_pro_upsell', '', 'frontend-actions' ); | |
| 177 | - echo '</div>'; | |
| 178 | - } | |
| 179 | 197 | self::_renderGroupEnd(); |
| 180 | 198 | |
| 181 | 199 | self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) ); |
| 182 | 200 | $this->_renderManualConfigDescription(); |
| @@ -204,11 +222,9 @@ | ||
| 204 | 222 | */ |
| 205 | 223 | protected function _renderActionSettings() { |
| 206 | 224 | global $wp_version; |
| 207 | 225 | $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' ) ); | |
| 226 | + self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false ); | |
| 211 | 227 | self::_renderCheckboxItem( |
| 212 | 228 | esc_html__( 'Print', 'visualizer' ), |
| 213 | 229 | 'actions[]', |
| 214 | 230 | isset( $this->actions ) && in_array( 'print', $this->actions, true ) ? true : false, |
| @@ -241,19 +257,8 @@ | ||
| 241 | 257 | 'copy', |
| 242 | 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' ), |
| 243 | 259 | $disable_actions |
| 244 | 260 | ); |
| 245 | - | |
| 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 | 261 | self::_renderSectionEnd(); |
| 257 | 262 | } |
| 258 | 263 | |
| 259 | 264 | /** |
| @@ -264,17 +269,286 @@ | ||
| 264 | 269 | if ( is_readable( $vendor_file ) ) { |
| 265 | 270 | include_once( $vendor_file ); |
| 266 | 271 | } |
| 267 | 272 | |
| 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; | |
| 273 | + return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ) && version_compare( PHP_VERSION, '5.6.0', '>' ); | |
| 274 | + } | |
| 275 | + | |
| 276 | + /** | |
| 277 | + * Renders chart general settings group. | |
| 278 | + * | |
| 279 | + * @since 1.0.0 | |
| 280 | + * | |
| 281 | + * @access protected | |
| 282 | + */ | |
| 283 | + protected function _renderGeneralSettings() { | |
| 284 | + self::_renderGroupStart( esc_html__( 'General Settings', 'visualizer' ) ); | |
| 285 | + self::_renderSectionStart(); | |
| 286 | + self::_renderSectionDescription( esc_html__( 'Configure title, font styles, tooltip, legend and else settings for the chart.', 'visualizer' ) ); | |
| 287 | + self::_renderSectionEnd(); | |
| 288 | + | |
| 289 | + self::_renderSectionStart( esc_html__( 'Title', 'visualizer' ), false ); | |
| 290 | + $this->_renderChartTitleSettings(); | |
| 291 | + self::_renderSectionEnd(); | |
| 292 | + | |
| 293 | + self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); | |
| 294 | + echo '<div class="viz-section-item">'; | |
| 295 | + echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 296 | + echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; | |
| 297 | + | |
| 298 | + echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 299 | + echo '<tr>'; | |
| 300 | + echo '<td class="viz-section-table-column">'; | |
| 301 | + echo '<select name="fontName" class="control-select">'; | |
| 302 | + echo '<option></option>'; | |
| 303 | + foreach ( self::$_fontFamilies as $font => $label ) { | |
| 304 | + echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; | |
| 305 | + echo $label; | |
| 306 | + echo '</option>'; | |
| 271 | 307 | } |
| 308 | + echo '</select>'; | |
| 309 | + echo '</td>'; | |
| 310 | + echo '<td class="viz-section-table-column">'; | |
| 311 | + echo '<select name="fontSize" class="control-select">'; | |
| 312 | + echo '<option></option>'; | |
| 313 | + for ( $i = 7; $i <= 20; $i++ ) { | |
| 314 | + echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; | |
| 315 | + } | |
| 316 | + echo '</select>'; | |
| 317 | + echo '</td>'; | |
| 318 | + echo '</tr>'; | |
| 319 | + echo '</table>'; | |
| 272 | 320 | |
| 273 | - return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ); | |
| 321 | + echo '<p class="viz-section-description">'; | |
| 322 | + esc_html_e( 'The default font family and size for all text in the chart.', 'visualizer' ); | |
| 323 | + echo '</p>'; | |
| 324 | + echo '</div>'; | |
| 325 | + self::_renderSectionEnd(); | |
| 326 | + | |
| 327 | + self::_renderSectionStart( esc_html__( 'Legend', 'visualizer' ), false ); | |
| 328 | + self::_renderSelectItem( | |
| 329 | + esc_html__( 'Position', 'visualizer' ), | |
| 330 | + 'legend[position]', | |
| 331 | + $this->legend['position'], | |
| 332 | + $this->_legendPositions, | |
| 333 | + esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' ) | |
| 334 | + ); | |
| 335 | + | |
| 336 | + self::_renderSelectItem( | |
| 337 | + esc_html__( 'Alignment', 'visualizer' ), | |
| 338 | + 'legend[alignment]', | |
| 339 | + $this->legend['alignment'], | |
| 340 | + $this->_alignments, | |
| 341 | + esc_html__( 'Determines the alignment of the legend.', 'visualizer' ) | |
| 342 | + ); | |
| 343 | + | |
| 344 | + self::_renderColorPickerItem( | |
| 345 | + esc_html__( 'Font Color', 'visualizer' ), | |
| 346 | + 'legend[textStyle][color]', | |
| 347 | + isset( $this->legend['textStyle']['color'] ) ? $this->legend['textStyle']['color'] : null, | |
| 348 | + '#000' | |
| 349 | + ); | |
| 350 | + self::_renderSectionEnd(); | |
| 351 | + | |
| 352 | + self::_renderSectionStart( esc_html__( 'Tooltip', 'visualizer' ), false ); | |
| 353 | + $this->_renderTooltipSettigns(); | |
| 354 | + self::_renderSectionEnd(); | |
| 355 | + | |
| 356 | + $this->_renderAnimationSettings(); | |
| 357 | + | |
| 358 | + self::_renderGroupEnd(); | |
| 274 | 359 | } |
| 275 | 360 | |
| 276 | 361 | /** |
| 362 | + * Renders animation settings section. | |
| 363 | + * | |
| 364 | + * @access protected | |
| 365 | + */ | |
| 366 | + protected function _renderAnimationSettings() { | |
| 367 | + if ( ! $this->_supportsAnimation ) { | |
| 368 | + return; | |
| 369 | + } | |
| 370 | + | |
| 371 | + self::_renderSectionStart( esc_html__( 'Animation', 'visualizer' ), false ); | |
| 372 | + | |
| 373 | + self::_renderCheckboxItem( | |
| 374 | + esc_html__( 'Animate on startup', 'visualizer' ), | |
| 375 | + 'animation[startup]', | |
| 376 | + isset( $this->animation['startup'] ) ? $this->animation['startup'] : 0, | |
| 377 | + true, | |
| 378 | + esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' ) | |
| 379 | + ); | |
| 380 | + | |
| 381 | + self::_renderTextItem( | |
| 382 | + esc_html__( 'Duration', 'visualizer' ), | |
| 383 | + 'animation[duration]', | |
| 384 | + isset( $this->animation['duration'] ) ? $this->animation['duration'] : 0, | |
| 385 | + esc_html__( 'The duration of the animation, in milliseconds', 'visualizer' ), | |
| 386 | + 0, | |
| 387 | + 'number' | |
| 388 | + ); | |
| 389 | + | |
| 390 | + self::_renderSelectItem( | |
| 391 | + esc_html__( 'Easing', 'visualizer' ), | |
| 392 | + 'animation[easing]', | |
| 393 | + isset( $this->animation['easing'] ) ? $this->animation['easing'] : null, | |
| 394 | + array( | |
| 395 | + 'linear' => esc_html__( 'Constant speed', 'visualizer' ), | |
| 396 | + 'in' => esc_html__( 'Start slow and speed up', 'visualizer' ), | |
| 397 | + 'out' => esc_html__( 'Start fast and slow down', 'visualizer' ), | |
| 398 | + 'inAndOut' => esc_html__( 'Start slow, speed up, then slow down', 'visualizer' ), | |
| 399 | + ), | |
| 400 | + esc_html__( 'The easing function applied to the animation.', 'visualizer' ) | |
| 401 | + ); | |
| 402 | + | |
| 403 | + self::_renderSectionEnd(); | |
| 404 | + | |
| 405 | + } | |
| 406 | + | |
| 407 | + /** | |
| 408 | + * Renders tooltip settings section. | |
| 409 | + * | |
| 410 | + * @since 1.4.0 | |
| 411 | + * | |
| 412 | + * @access protected | |
| 413 | + */ | |
| 414 | + protected function _renderTooltipSettigns() { | |
| 415 | + self::_renderSelectItem( | |
| 416 | + esc_html__( 'Trigger', 'visualizer' ), | |
| 417 | + 'tooltip[trigger]', | |
| 418 | + isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null, | |
| 419 | + array( | |
| 420 | + '' => '', | |
| 421 | + 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', 'visualizer' ), | |
| 422 | + 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', 'visualizer' ), | |
| 423 | + 'none' => esc_html__( 'The tooltip will not be displayed', 'visualizer' ), | |
| 424 | + ), | |
| 425 | + esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', 'visualizer' ) | |
| 426 | + ); | |
| 427 | + | |
| 428 | + self::_renderSelectItem( | |
| 429 | + esc_html__( 'Show Color Code', 'visualizer' ), | |
| 430 | + 'tooltip[showColorCode]', | |
| 431 | + isset( $this->tooltip['showColorCode'] ) ? $this->tooltip['showColorCode'] : null, | |
| 432 | + $this->_yesno, | |
| 433 | + esc_html__( 'If set to yes, will show colored squares next to the slice information in the tooltip.', 'visualizer' ) | |
| 434 | + ); | |
| 435 | + } | |
| 436 | + | |
| 437 | + /** | |
| 438 | + * Renders chart view settings group. | |
| 439 | + * | |
| 440 | + * @since 1.0.0 | |
| 441 | + * | |
| 442 | + * @access protected | |
| 443 | + */ | |
| 444 | + protected function _renderViewSettings() { | |
| 445 | + self::_renderGroupStart( esc_html__( 'Chart Size & Placement', 'visualizer' ) ); | |
| 446 | + self::_renderSectionStart( esc_html__( 'Chart Size/Layout', 'visualizer' ), false ); | |
| 447 | + 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' ) ); | |
| 448 | + | |
| 449 | + echo '<div class="viz-section-item">'; | |
| 450 | + echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 451 | + echo '<b>', esc_html__( 'Width And Height Of Chart', 'visualizer' ), '</b>'; | |
| 452 | + | |
| 453 | + echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 454 | + echo '<tr>'; | |
| 455 | + echo '<td class="viz-section-table-column">'; | |
| 456 | + echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">'; | |
| 457 | + echo '</td>'; | |
| 458 | + echo '<td class="viz-section-table-column">'; | |
| 459 | + echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">'; | |
| 460 | + echo '</td>'; | |
| 461 | + echo '</tr>'; | |
| 462 | + echo '</table>'; | |
| 463 | + | |
| 464 | + echo '<p class="viz-section-description">'; | |
| 465 | + esc_html_e( 'Determines the total width and height of the chart. This will only show in the front-end.', 'visualizer' ); | |
| 466 | + echo '</p>'; | |
| 467 | + echo '</div>'; | |
| 468 | + | |
| 469 | + echo '<div class="viz-section-delimiter"></div>'; | |
| 470 | + | |
| 471 | + self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); | |
| 472 | + | |
| 473 | + self::_renderTextItem( | |
| 474 | + esc_html__( 'Stroke Width', 'visualizer' ), | |
| 475 | + 'backgroundColor[strokeWidth]', | |
| 476 | + isset( $this->backgroundColor['strokeWidth'] ) ? $this->backgroundColor['strokeWidth'] : null, | |
| 477 | + esc_html__( 'The chart border width in pixels.', 'visualizer' ), | |
| 478 | + '0' | |
| 479 | + ); | |
| 480 | + | |
| 481 | + self::_renderColorPickerItem( | |
| 482 | + esc_html__( 'Stroke Color', 'visualizer' ), | |
| 483 | + 'backgroundColor[stroke]', | |
| 484 | + ! empty( $this->backgroundColor['stroke'] ) ? $this->backgroundColor['stroke'] : null, | |
| 485 | + '#666' | |
| 486 | + ); | |
| 487 | + | |
| 488 | + $background_color = ! empty( $this->backgroundColor['fill'] ) ? $this->backgroundColor['fill'] : null; | |
| 489 | + self::_renderColorPickerItem( | |
| 490 | + esc_html__( 'Background Color', 'visualizer' ), | |
| 491 | + 'backgroundColor[fill]', | |
| 492 | + $background_color, | |
| 493 | + '#fff' | |
| 494 | + ); | |
| 495 | + | |
| 496 | + echo '<div class="viz-section-item">'; | |
| 497 | + echo '<label>'; | |
| 498 | + echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> '; | |
| 499 | + esc_html_e( 'Transparent background', 'visualizer' ); | |
| 500 | + echo '</label>'; | |
| 501 | + echo '</div>'; | |
| 502 | + self::_renderSectionEnd(); | |
| 503 | + | |
| 504 | + self::_renderSectionStart( esc_html__( 'Placement', 'visualizer' ), false ); | |
| 505 | + 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' ) ); | |
| 506 | + | |
| 507 | + echo '<div class="viz-section-item">'; | |
| 508 | + echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 509 | + echo '<b>', esc_html__( 'Left And Top Margins', 'visualizer' ), '</b>'; | |
| 510 | + | |
| 511 | + echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 512 | + echo '<tr>'; | |
| 513 | + echo '<td class="viz-section-table-column">'; | |
| 514 | + echo '<input type="text" name="chartArea[left]" class="control-text" value="', $this->chartArea['left'] || $this->chartArea['left'] === '0' ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">'; | |
| 515 | + echo '</td>'; | |
| 516 | + echo '<td class="viz-section-table-column">'; | |
| 517 | + echo '<input type="text" name="chartArea[top]" class="control-text" value="', $this->chartArea['top'] || $this->chartArea['top'] === '0' ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">'; | |
| 518 | + echo '</td>'; | |
| 519 | + echo '</tr>'; | |
| 520 | + echo '</table>'; | |
| 521 | + | |
| 522 | + echo '<p class="viz-section-description">'; | |
| 523 | + esc_html_e( 'Determines how far to draw the chart from the left and top borders.', 'visualizer' ); | |
| 524 | + echo '</p>'; | |
| 525 | + echo '</div>'; | |
| 526 | + | |
| 527 | + echo '<div class="viz-section-item">'; | |
| 528 | + echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 529 | + echo '<b>', esc_html__( 'Width And Height Of Chart Area', 'visualizer' ), '</b>'; | |
| 530 | + | |
| 531 | + echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 532 | + echo '<tr>'; | |
| 533 | + echo '<td class="viz-section-table-column">'; | |
| 534 | + echo '<input type="text" name="chartArea[width]" class="control-text" value="', ! empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; | |
| 535 | + echo '</td>'; | |
| 536 | + echo '<td class="viz-section-table-column">'; | |
| 537 | + echo '<input type="text" name="chartArea[height]" class="control-text" value="', ! empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; | |
| 538 | + echo '</td>'; | |
| 539 | + echo '</tr>'; | |
| 540 | + echo '</table>'; | |
| 541 | + | |
| 542 | + echo '<p class="viz-section-description">'; | |
| 543 | + esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); | |
| 544 | + echo '</p>'; | |
| 545 | + echo '</div>'; | |
| 546 | + self::_renderSectionEnd(); | |
| 547 | + self::_renderGroupEnd(); | |
| 548 | + } | |
| 549 | + | |
| 550 | + /** | |
| 277 | 551 | * Renders select item. |
| 278 | 552 | * |
| 279 | 553 | * @since 1.0.0 |
| 280 | 554 | * |
| @@ -327,9 +601,9 @@ | ||
| 327 | 601 | protected static function _renderColorPickerItem( $title, $name, $value, $default ) { |
| 328 | 602 | echo '<div class="viz-section-item">'; |
| 329 | 603 | echo '<b>', $title, '</b>'; |
| 330 | 604 | 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, '">'; | |
| 605 | + 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, '">'; | |
| 332 | 606 | echo '</div>'; |
| 333 | 607 | echo '</div>'; |
| 334 | 608 | } |
| 335 | 609 | |
| @@ -347,9 +621,9 @@ | ||
| 347 | 621 | * @param string $placeholder The placeholder for the input. |
| 348 | 622 | * @param string $type The type for the input (out of number, email, tel etc., default is text). |
| 349 | 623 | * @param array $custom_attributes The custom attributes. |
| 350 | 624 | */ |
| 351 | - protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array(), $extra_class = array() ) { | |
| 625 | + protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array() ) { | |
| 352 | 626 | $attributes = ''; |
| 353 | 627 | if ( $custom_attributes ) { |
| 354 | 628 | foreach ( $custom_attributes as $k => $v ) { |
| 355 | 629 | $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; |
| @@ -354,10 +628,9 @@ | ||
| 354 | 628 | foreach ( $custom_attributes as $k => $v ) { |
| 355 | 629 | $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; |
| 356 | 630 | } |
| 357 | 631 | } |
| 358 | - $extra_class[] = 'viz-section-item'; | |
| 359 | - echo '<div class="' . esc_attr( implode( ' ', $extra_class ) ) . '">'; | |
| 632 | + echo '<div class="viz-section-item">'; | |
| 360 | 633 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 361 | 634 | echo '<b>', $title, '</b>'; |
| 362 | 635 | echo '<input type="', $type, '" class="control-text" ', $attributes, ' name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; |
| 363 | 636 | echo '<p class="viz-section-description">', $desc, '</p>'; |
| @@ -374,10 +647,10 @@ | ||
| 374 | 647 | * @param string $title The title of this group. |
| 375 | 648 | * @param string $html Any additional HTML. |
| 376 | 649 | * @param string $class Any additional classes. |
| 377 | 650 | */ |
| 378 | - public static function _renderGroupStart( $title, $html = '', $class = '', $id = '' ) { | |
| 379 | - echo '<li id="' . $id . '" class="viz-group ' . $class . '">'; | |
| 651 | + public static function _renderGroupStart( $title, $html = '', $class = '' ) { | |
| 652 | + echo '<li class="viz-group ' . $class . '">'; | |
| 380 | 653 | echo '<h3 class="viz-group-title">', $title, '</h3>'; |
| 381 | 654 | echo $html; |
| 382 | 655 | echo '<ul class="viz-group-content">'; |
| 383 | 656 | } |
| @@ -439,11 +712,11 @@ | ||
| 439 | 712 | * @static |
| 440 | 713 | * @access public |
| 441 | 714 | * @param string $description The description text. |
| 442 | 715 | */ |
| 443 | - public static function _renderSectionDescription( $description, $classes = '' ) { | |
| 716 | + public static function _renderSectionDescription( $description ) { | |
| 444 | 717 | echo '<div class="viz-section-item">'; |
| 445 | - echo '<div class="viz-section-description ' . $classes . '">', $description, '</div>'; | |
| 718 | + echo '<div class="viz-section-description">', $description, '</div>'; | |
| 446 | 719 | echo '</div>'; |
| 447 | 720 | } |
| 448 | 721 | |
| 449 | 722 | /** |
| @@ -471,9 +744,9 @@ | ||
| 471 | 744 | self::_renderTextItem( |
| 472 | 745 | esc_html__( 'Date Format', 'visualizer' ), |
| 473 | 746 | 'series[' . $index . '][format]', |
| 474 | 747 | 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>' ), | |
| 748 | + 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="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ), | |
| 476 | 749 | 'eeee, dd LLLL yyyy' |
| 477 | 750 | ); |
| 478 | 751 | break; |
| 479 | 752 | } |
| @@ -521,9 +794,9 @@ | ||
| 521 | 794 | * Loads generic libraries conditionally. |
| 522 | 795 | */ |
| 523 | 796 | protected function load_dependent_assets( $libs ) { |
| 524 | 797 | if ( in_array( 'moment', $libs, true ) && ! wp_script_is( 'moment', 'registered' ) ) { |
| 525 | - wp_register_script( 'moment' ); | |
| 798 | + wp_register_script( 'moment', VISUALIZER_ABSURL . 'js/lib/moment.min.js', array(), Visualizer_Plugin::VERSION ); | |
| 526 | 799 | } |
| 527 | 800 | |
| 528 | 801 | if ( in_array( 'numeral', $libs, true ) && ! wp_script_is( 'numeral', 'registered' ) ) { |
| 529 | 802 | wp_register_script( 'numeral', VISUALIZER_ABSURL . 'js/lib/numeral.min.js', array(), Visualizer_Plugin::VERSION ); |
| @@ -528,279 +801,6 @@ | ||
| 528 | 801 | if ( in_array( 'numeral', $libs, true ) && ! wp_script_is( 'numeral', 'registered' ) ) { |
| 529 | 802 | wp_register_script( 'numeral', VISUALIZER_ABSURL . 'js/lib/numeral.min.js', array(), Visualizer_Plugin::VERSION ); |
| 530 | 803 | } |
| 531 | 804 | |
| 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 | 805 | } |
| 806 | 806 | } |
