| @@ -83,24 +83,8 @@ | ||
| 83 | 83 | */ |
| 84 | 84 | protected $_alignments; |
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | - * Whether this chart supports animation or not. | |
| 88 | - * | |
| 89 | - * @access protected | |
| 90 | - * @var bool | |
| 91 | - */ | |
| 92 | - protected $_supportsAnimation = true; | |
| 93 | - | |
| 94 | - /** | |
| 95 | - * Which library does this this chart implement? | |
| 96 | - * | |
| 97 | - * @access protected | |
| 98 | - * @var string | |
| 99 | - */ | |
| 100 | - protected $_library = null; | |
| 101 | - | |
| 102 | - /** | |
| 103 | 87 | * Constructor. |
| 104 | 88 | * |
| 105 | 89 | * @since 1.0.0 |
| 106 | 90 | * |
| @@ -131,10 +115,8 @@ | ||
| 131 | 115 | '' => '', |
| 132 | 116 | '1' => esc_html__( 'Yes', 'visualizer' ), |
| 133 | 117 | '0' => esc_html__( 'No', 'visualizer' ), |
| 134 | 118 | ); |
| 135 | - | |
| 136 | - $this->hooks(); | |
| 137 | 119 | } |
| 138 | 120 | |
| 139 | 121 | /** |
| 140 | 122 | * Renders chart title settings. |
| @@ -171,41 +153,10 @@ | ||
| 171 | 153 | self::_renderSectionEnd(); |
| 172 | 154 | |
| 173 | 155 | $this->_renderActionSettings(); |
| 174 | 156 | self::_renderGroupEnd(); |
| 175 | - | |
| 176 | - self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) ); | |
| 177 | - self::_renderSectionStart(); | |
| 178 | - self::_renderSectionDescription( '<span class="viz-gvlink">' . sprintf( __( 'Configure the graph by providing configuration variables right from the %1$sGoogle Visualization API%2$s. 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>' ); | |
| 179 | - | |
| 180 | - $example = ' | |
| 181 | -{ | |
| 182 | - "vAxis": { | |
| 183 | - "ticks": [5, 10, 15, 20], | |
| 184 | - "titleTextStyle": { | |
| 185 | - "color": "red" | |
| 186 | - }, | |
| 187 | - "textPosition": "in" | |
| 188 | 157 | } |
| 189 | -}'; | |
| 190 | 158 | |
| 191 | - self::_renderTextAreaItem( | |
| 192 | - esc_html__( 'Configuration', 'visualizer' ), | |
| 193 | - 'manual', | |
| 194 | - $this->manual, | |
| 195 | - sprintf( | |
| 196 | - esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ), | |
| 197 | - '<br><code>' . $example . '</code>' | |
| 198 | - ), | |
| 199 | - '', | |
| 200 | - array( 'rows' => 5 ) | |
| 201 | - ); | |
| 202 | - | |
| 203 | - self::_renderSectionEnd(); | |
| 204 | - self::_renderGroupEnd(); | |
| 205 | - | |
| 206 | - } | |
| 207 | - | |
| 208 | 159 | /** |
| 209 | 160 | * Renders chart action buttons group. |
| 210 | 161 | * |
| 211 | 162 | * @access protected |
| @@ -210,10 +161,8 @@ | ||
| 210 | 161 | * |
| 211 | 162 | * @access protected |
| 212 | 163 | */ |
| 213 | 164 | protected function _renderActionSettings() { |
| 214 | - global $wp_version; | |
| 215 | - $disable_actions = version_compare( $wp_version, '4.7.0', '<' ); | |
| 216 | 165 | self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false ); |
| 217 | 166 | self::_renderCheckboxItem( |
| 218 | 167 | esc_html__( 'Print', 'visualizer' ), |
| 219 | 168 | 'actions[]', |
| @@ -218,10 +167,9 @@ | ||
| 218 | 167 | esc_html__( 'Print', 'visualizer' ), |
| 219 | 168 | 'actions[]', |
| 220 | 169 | isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false, |
| 221 | 170 | 'print', |
| 222 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the chart/data.', 'visualizer' ), | |
| 223 | - $disable_actions | |
| 171 | + esc_html__( 'To enable printing the data.', 'visualizer' ) | |
| 224 | 172 | ); |
| 225 | 173 | self::_renderCheckboxItem( |
| 226 | 174 | esc_html__( 'CSV', 'visualizer' ), |
| 227 | 175 | 'actions[]', |
| @@ -226,20 +174,19 @@ | ||
| 226 | 174 | esc_html__( 'CSV', 'visualizer' ), |
| 227 | 175 | 'actions[]', |
| 228 | 176 | isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false, |
| 229 | 177 | 'csv;application/csv', |
| 230 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' ), | |
| 231 | - $disable_actions | |
| 178 | + esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' ) | |
| 232 | 179 | ); |
| 233 | 180 | |
| 234 | - $disabled = ! self::is_excel_enabled(); | |
| 181 | + $disabled = ! ( extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) ); | |
| 235 | 182 | self::_renderCheckboxItem( |
| 236 | 183 | esc_html__( 'Excel', 'visualizer' ), |
| 237 | 184 | 'actions[]', |
| 238 | 185 | isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false, |
| 239 | 186 | 'xls;application/vnd.ms-excel', |
| 240 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : ( $disabled ? '<span class="viz-section-error">' . esc_html__( 'Enable the ZIP and XML extensions to use this setting.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as an Excel spreadsheet.', 'visualizer' ) ), | |
| 241 | - $disable_actions || $disabled | |
| 187 | + $disabled ? '<span class="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' ), | |
| 188 | + $disabled | |
| 242 | 189 | ); |
| 243 | 190 | self::_renderCheckboxItem( |
| 244 | 191 | esc_html__( 'Copy', 'visualizer' ), |
| 245 | 192 | 'actions[]', |
| @@ -244,27 +191,14 @@ | ||
| 244 | 191 | esc_html__( 'Copy', 'visualizer' ), |
| 245 | 192 | 'actions[]', |
| 246 | 193 | isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false, |
| 247 | 194 | 'copy', |
| 248 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' ), | |
| 249 | - $disable_actions | |
| 195 | + esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' ) | |
| 250 | 196 | ); |
| 251 | 197 | self::_renderSectionEnd(); |
| 252 | 198 | } |
| 253 | 199 | |
| 254 | 200 | /** |
| 255 | - * Checks if the Excel module can be enabled. | |
| 256 | - */ | |
| 257 | - private static function is_excel_enabled() { | |
| 258 | - $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php'; | |
| 259 | - if ( is_readable( $vendor_file ) ) { | |
| 260 | - include_once( $vendor_file ); | |
| 261 | - } | |
| 262 | - | |
| 263 | - return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ) && version_compare( PHP_VERSION, '5.6.0', '>' ); | |
| 264 | - } | |
| 265 | - | |
| 266 | - /** | |
| 267 | 201 | * Renders chart general settings group. |
| 268 | 202 | * |
| 269 | 203 | * @since 1.0.0 |
| 270 | 204 | * |
| @@ -280,15 +214,15 @@ | ||
| 280 | 214 | $this->_renderChartTitleSettings(); |
| 281 | 215 | self::_renderSectionEnd(); |
| 282 | 216 | |
| 283 | 217 | self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); |
| 284 | - echo '<div class="viz-section-item">'; | |
| 218 | + echo '<div class="section-item">'; | |
| 285 | 219 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 286 | 220 | echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; |
| 287 | 221 | |
| 288 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 222 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 289 | 223 | echo '<tr>'; |
| 290 | - echo '<td class="viz-section-table-column">'; | |
| 224 | + echo '<td class="section-table-column">'; | |
| 291 | 225 | echo '<select name="fontName" class="control-select">'; |
| 292 | 226 | echo '<option></option>'; |
| 293 | 227 | foreach ( self::$_fontFamilies as $font => $label ) { |
| 294 | 228 | echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; |
| @@ -296,9 +230,9 @@ | ||
| 296 | 230 | echo '</option>'; |
| 297 | 231 | } |
| 298 | 232 | echo '</select>'; |
| 299 | 233 | echo '</td>'; |
| 300 | - echo '<td class="viz-section-table-column">'; | |
| 234 | + echo '<td class="section-table-column">'; | |
| 301 | 235 | echo '<select name="fontSize" class="control-select">'; |
| 302 | 236 | echo '<option></option>'; |
| 303 | 237 | for ( $i = 7; $i <= 20; $i++ ) { |
| 304 | 238 | echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; |
| @@ -307,9 +241,9 @@ | ||
| 307 | 241 | echo '</td>'; |
| 308 | 242 | echo '</tr>'; |
| 309 | 243 | echo '</table>'; |
| 310 | 244 | |
| 311 | - echo '<p class="viz-section-description">'; | |
| 245 | + echo '<p class="section-description">'; | |
| 312 | 246 | esc_html_e( 'The default font family and size for all text in the chart.', 'visualizer' ); |
| 313 | 247 | echo '</p>'; |
| 314 | 248 | echo '</div>'; |
| 315 | 249 | self::_renderSectionEnd(); |
| @@ -341,61 +275,12 @@ | ||
| 341 | 275 | |
| 342 | 276 | self::_renderSectionStart( esc_html__( 'Tooltip', 'visualizer' ), false ); |
| 343 | 277 | $this->_renderTooltipSettigns(); |
| 344 | 278 | self::_renderSectionEnd(); |
| 345 | - | |
| 346 | - $this->_renderAnimationSettings(); | |
| 347 | - | |
| 348 | 279 | self::_renderGroupEnd(); |
| 349 | 280 | } |
| 350 | 281 | |
| 351 | 282 | /** |
| 352 | - * Renders animation settings section. | |
| 353 | - * | |
| 354 | - * @access protected | |
| 355 | - */ | |
| 356 | - protected function _renderAnimationSettings() { | |
| 357 | - if ( ! $this->_supportsAnimation ) { | |
| 358 | - return; | |
| 359 | - } | |
| 360 | - | |
| 361 | - self::_renderSectionStart( esc_html__( 'Animation', 'visualizer' ), false ); | |
| 362 | - | |
| 363 | - self::_renderCheckboxItem( | |
| 364 | - esc_html__( 'Animate on startup', 'visualizer' ), | |
| 365 | - 'animation[startup]', | |
| 366 | - isset( $this->animation['startup'] ) ? $this->animation['startup'] : 0, | |
| 367 | - true, | |
| 368 | - esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' ) | |
| 369 | - ); | |
| 370 | - | |
| 371 | - self::_renderTextItem( | |
| 372 | - esc_html__( 'Duration', 'visualizer' ), | |
| 373 | - 'animation[duration]', | |
| 374 | - isset( $this->animation['duration'] ) ? $this->animation['duration'] : 0, | |
| 375 | - esc_html__( 'The duration of the animation, in milliseconds', 'visualizer' ), | |
| 376 | - 0, | |
| 377 | - 'number' | |
| 378 | - ); | |
| 379 | - | |
| 380 | - self::_renderSelectItem( | |
| 381 | - esc_html__( 'Easing', 'visualizer' ), | |
| 382 | - 'animation[easing]', | |
| 383 | - isset( $this->animation['easing'] ) ? $this->animation['easing'] : null, | |
| 384 | - array( | |
| 385 | - 'linear' => esc_html__( 'Constant speed', 'visualizer' ), | |
| 386 | - 'in' => esc_html__( 'Start slow and speed up', 'visualizer' ), | |
| 387 | - 'out' => esc_html__( 'Start fast and slow down', 'visualizer' ), | |
| 388 | - 'inAndOut' => esc_html__( 'Start slow, speed up, then slow down', 'visualizer' ), | |
| 389 | - ), | |
| 390 | - esc_html__( 'The easing function applied to the animation.', 'visualizer' ) | |
| 391 | - ); | |
| 392 | - | |
| 393 | - self::_renderSectionEnd(); | |
| 394 | - | |
| 395 | - } | |
| 396 | - | |
| 397 | - /** | |
| 398 | 283 | * Renders tooltip settings section. |
| 399 | 284 | * |
| 400 | 285 | * @since 1.4.0 |
| 401 | 286 | * |
| @@ -435,29 +320,29 @@ | ||
| 435 | 320 | self::_renderGroupStart( esc_html__( 'Layout & Chart Area', 'visualizer' ) ); |
| 436 | 321 | self::_renderSectionStart( esc_html__( 'Layout', 'visualizer' ), false ); |
| 437 | 322 | 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' ) ); |
| 438 | 323 | |
| 439 | - echo '<div class="viz-section-item">'; | |
| 324 | + echo '<div class="section-item">'; | |
| 440 | 325 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 441 | 326 | echo '<b>', esc_html__( 'Width And Height Of Chart', 'visualizer' ), '</b>'; |
| 442 | 327 | |
| 443 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 328 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 444 | 329 | echo '<tr>'; |
| 445 | - echo '<td class="viz-section-table-column">'; | |
| 330 | + echo '<td class="section-table-column">'; | |
| 446 | 331 | echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">'; |
| 447 | 332 | echo '</td>'; |
| 448 | - echo '<td class="viz-section-table-column">'; | |
| 333 | + echo '<td class="section-table-column">'; | |
| 449 | 334 | echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">'; |
| 450 | 335 | echo '</td>'; |
| 451 | 336 | echo '</tr>'; |
| 452 | 337 | echo '</table>'; |
| 453 | 338 | |
| 454 | - echo '<p class="viz-section-description">'; | |
| 339 | + echo '<p class="section-description">'; | |
| 455 | 340 | esc_html_e( 'Determines the total width and height of the chart.', 'visualizer' ); |
| 456 | 341 | echo '</p>'; |
| 457 | 342 | echo '</div>'; |
| 458 | 343 | |
| 459 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 344 | + echo '<div class="section-delimiter"></div>'; | |
| 460 | 345 | |
| 461 | 346 | self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); |
| 462 | 347 | |
| 463 | 348 | self::_renderTextItem( |
| @@ -482,9 +367,9 @@ | ||
| 482 | 367 | $background_color, |
| 483 | 368 | '#fff' |
| 484 | 369 | ); |
| 485 | 370 | |
| 486 | - echo '<div class="viz-section-item">'; | |
| 371 | + echo '<div class="section-item">'; | |
| 487 | 372 | echo '<label>'; |
| 488 | 373 | echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> '; |
| 489 | 374 | esc_html_e( 'Transparent background', 'visualizer' ); |
| 490 | 375 | echo '</label>'; |
| @@ -493,44 +378,44 @@ | ||
| 493 | 378 | |
| 494 | 379 | self::_renderSectionStart( esc_html__( 'Chart Area', 'visualizer' ), false ); |
| 495 | 380 | 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' ) ); |
| 496 | 381 | |
| 497 | - echo '<div class="viz-section-item">'; | |
| 382 | + echo '<div class="section-item">'; | |
| 498 | 383 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 499 | 384 | echo '<b>', esc_html__( 'Left And Top Margins', 'visualizer' ), '</b>'; |
| 500 | 385 | |
| 501 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 386 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 502 | 387 | echo '<tr>'; |
| 503 | - echo '<td class="viz-section-table-column">'; | |
| 388 | + echo '<td class="section-table-column">'; | |
| 504 | 389 | 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%">'; |
| 505 | 390 | echo '</td>'; |
| 506 | - echo '<td class="viz-section-table-column">'; | |
| 391 | + echo '<td class="section-table-column">'; | |
| 507 | 392 | 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%">'; |
| 508 | 393 | echo '</td>'; |
| 509 | 394 | echo '</tr>'; |
| 510 | 395 | echo '</table>'; |
| 511 | 396 | |
| 512 | - echo '<p class="viz-section-description">'; | |
| 397 | + echo '<p class="section-description">'; | |
| 513 | 398 | esc_html_e( 'Determines how far to draw the chart from the left and top borders.', 'visualizer' ); |
| 514 | 399 | echo '</p>'; |
| 515 | 400 | echo '</div>'; |
| 516 | 401 | |
| 517 | - echo '<div class="viz-section-item">'; | |
| 402 | + echo '<div class="section-item">'; | |
| 518 | 403 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 519 | 404 | echo '<b>', esc_html__( 'Width And Height Of Chart Area', 'visualizer' ), '</b>'; |
| 520 | 405 | |
| 521 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 406 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 522 | 407 | echo '<tr>'; |
| 523 | - echo '<td class="viz-section-table-column">'; | |
| 408 | + echo '<td class="section-table-column">'; | |
| 524 | 409 | echo '<input type="text" name="chartArea[width]" class="control-text" value="', ! empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; |
| 525 | 410 | echo '</td>'; |
| 526 | - echo '<td class="viz-section-table-column">'; | |
| 411 | + echo '<td class="section-table-column">'; | |
| 527 | 412 | echo '<input type="text" name="chartArea[height]" class="control-text" value="', ! empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; |
| 528 | 413 | echo '</td>'; |
| 529 | 414 | echo '</tr>'; |
| 530 | 415 | echo '</table>'; |
| 531 | 416 | |
| 532 | - echo '<p class="viz-section-description">'; | |
| 417 | + echo '<p class="section-description">'; | |
| 533 | 418 | esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); |
| 534 | 419 | echo '</p>'; |
| 535 | 420 | echo '</div>'; |
| 536 | 421 | self::_renderSectionEnd(); |
| @@ -542,37 +427,27 @@ | ||
| 542 | 427 | * |
| 543 | 428 | * @since 1.0.0 |
| 544 | 429 | * |
| 545 | 430 | * @static |
| 546 | - * @access public | |
| 431 | + * @access protected | |
| 547 | 432 | * @param string $title The title of the select item. |
| 548 | 433 | * @param string $name The name of the select item. |
| 549 | 434 | * @param string $value The actual value of the select item. |
| 550 | 435 | * @param array $options The array of select options. |
| 551 | 436 | * @param string $desc The description of the select item. |
| 552 | - * @param bool $multiple Is this a multiple select box. | |
| 553 | - * @param array $classes Any additional classes. | |
| 554 | - * @param array $attributes Custom attributes. | |
| 555 | 437 | */ |
| 556 | - public static function _renderSelectItem( $title, $name, $value, array $options, $desc, $multiple = false, $classes = array(), $attributes = array() ) { | |
| 557 | - $atts = ''; | |
| 558 | - if ( $attributes ) { | |
| 559 | - foreach ( $attributes as $k => $v ) { | |
| 560 | - $atts .= ' data-visualizer-' . $k . '=' . esc_attr( $v ); | |
| 561 | - } | |
| 562 | - } | |
| 563 | - echo '<div class="viz-section-item">'; | |
| 438 | + protected static function _renderSelectItem( $title, $name, $value, array $options, $desc ) { | |
| 439 | + echo '<div class="section-item">'; | |
| 564 | 440 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 565 | 441 | echo '<b>', $title, '</b>'; |
| 566 | - echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>'; | |
| 442 | + echo '<select class="control-select" name="', $name, '">'; | |
| 567 | 443 | foreach ( $options as $key => $label ) { |
| 568 | - $extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false ); | |
| 569 | - echo '<option value="', $key, '"', $extra, '>'; | |
| 444 | + echo '<option value="', $key, '"', selected( $key, $value, false ), '>'; | |
| 570 | 445 | echo $label; |
| 571 | 446 | echo '</option>'; |
| 572 | 447 | } |
| 573 | 448 | echo '</select>'; |
| 574 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 449 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 575 | 450 | echo '</div>'; |
| 576 | 451 | } |
| 577 | 452 | |
| 578 | 453 | /** |
| @@ -587,9 +462,9 @@ | ||
| 587 | 462 | * @param string $value The actual value of the select item. |
| 588 | 463 | * @param string $default The default value of the color picker. |
| 589 | 464 | */ |
| 590 | 465 | protected static function _renderColorPickerItem( $title, $name, $value, $default ) { |
| 591 | - echo '<div class="viz-section-item">'; | |
| 466 | + echo '<div class="section-item">'; | |
| 592 | 467 | echo '<b>', $title, '</b>'; |
| 593 | 468 | echo '<div>'; |
| 594 | 469 | echo '<input type="text" class="color-picker-hex" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', 'visualizer' ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">'; |
| 595 | 470 | echo '</div>'; |
| @@ -607,23 +482,15 @@ | ||
| 607 | 482 | * @param string $name The name of the select item. |
| 608 | 483 | * @param string $value The actual value of the select item. |
| 609 | 484 | * @param string $desc The description of the select item. |
| 610 | 485 | * @param string $placeholder The placeholder for the input. |
| 611 | - * @param string $type The type for the input (out of number, email, tel etc., default is text). | |
| 612 | - * @param array $custom_attributes The custom attributes. | |
| 613 | 486 | */ |
| 614 | - protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array() ) { | |
| 615 | - $attributes = ''; | |
| 616 | - if ( $custom_attributes ) { | |
| 617 | - foreach ( $custom_attributes as $k => $v ) { | |
| 618 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 619 | - } | |
| 620 | - } | |
| 621 | - echo '<div class="viz-section-item">'; | |
| 487 | + protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '' ) { | |
| 488 | + echo '<div class="section-item">'; | |
| 622 | 489 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 623 | 490 | echo '<b>', $title, '</b>'; |
| 624 | - echo '<input type="', $type, '" class="control-text" ', $attributes, ' name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 625 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 491 | + echo '<input type="text" class="control-text" name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 492 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 626 | 493 | echo '</div>'; |
| 627 | 494 | } |
| 628 | 495 | |
| 629 | 496 | /** |
| @@ -631,18 +498,15 @@ | ||
| 631 | 498 | * |
| 632 | 499 | * @since 1.0.0 |
| 633 | 500 | * |
| 634 | 501 | * @static |
| 635 | - * @access public | |
| 502 | + * @access protected | |
| 636 | 503 | * @param string $title The title of this group. |
| 637 | - * @param string $html Any additional HTML. | |
| 638 | - * @param string $class Any additional classes. | |
| 639 | 504 | */ |
| 640 | - public static function _renderGroupStart( $title, $html = '', $class = '' ) { | |
| 641 | - echo '<li class="viz-group ' . $class . '">'; | |
| 642 | - echo '<h3 class="viz-group-title">', $title, '</h3>'; | |
| 643 | - echo $html; | |
| 644 | - echo '<ul class="viz-group-content">'; | |
| 505 | + protected static function _renderGroupStart( $title ) { | |
| 506 | + echo '<li class="group">'; | |
| 507 | + echo '<h3 class="group-title">', $title, '</h3>'; | |
| 508 | + echo '<ul class="group-content">'; | |
| 645 | 509 | } |
| 646 | 510 | |
| 647 | 511 | /** |
| 648 | 512 | * Renders the ending of a group. |
| @@ -649,11 +513,11 @@ | ||
| 649 | 513 | * |
| 650 | 514 | * @since 1.0.0 |
| 651 | 515 | * |
| 652 | 516 | * @static |
| 653 | - * @access public | |
| 517 | + * @access protected | |
| 654 | 518 | */ |
| 655 | - public static function _renderGroupEnd() { | |
| 519 | + protected static function _renderGroupEnd() { | |
| 656 | 520 | echo '</ul>'; |
| 657 | 521 | echo '</li>'; |
| 658 | 522 | } |
| 659 | 523 | |
| @@ -662,21 +526,21 @@ | ||
| 662 | 526 | * |
| 663 | 527 | * @since 1.0.0 |
| 664 | 528 | * |
| 665 | 529 | * @static |
| 666 | - * @access public | |
| 530 | + * @access protected | |
| 667 | 531 | * @param string $title The title of this section. If the title is empty, no title will be displayed. |
| 668 | 532 | * @param boolean $open Determines whether the section items block has to be expanded or collapsed. |
| 669 | 533 | */ |
| 670 | - public static function _renderSectionStart( $title = false, $open = true ) { | |
| 534 | + protected static function _renderSectionStart( $title = false, $open = true ) { | |
| 671 | 535 | |
| 672 | 536 | if ( ! empty( $title ) ) { |
| 673 | - echo '<li class="viz-subsection">'; | |
| 674 | - echo '<span class="viz-section-title">', $title, '</span>'; | |
| 537 | + echo '<li class="subsection">'; | |
| 538 | + echo '<span class="section-title">', $title, '</span>'; | |
| 675 | 539 | } else { |
| 676 | 540 | echo '<li class=" ">'; |
| 677 | 541 | } |
| 678 | - echo '<div class="viz-section-items section-items', $open ? ' open' : '', '">'; | |
| 542 | + echo '<div class="section-items', $open ? ' open' : '', '">'; | |
| 679 | 543 | } |
| 680 | 544 | |
| 681 | 545 | /** |
| 682 | 546 | * Renders the ending of a section. |
| @@ -682,15 +546,13 @@ | ||
| 682 | 546 | * Renders the ending of a section. |
| 683 | 547 | * |
| 684 | 548 | * @since 1.0.0 |
| 685 | 549 | * |
| 686 | - * @public | |
| 550 | + * @static | |
| 687 | 551 | * @access protected |
| 688 | - * @param string $html Any addition HTML to add. | |
| 689 | 552 | */ |
| 690 | - public static function _renderSectionEnd( $html = '' ) { | |
| 553 | + protected static function _renderSectionEnd() { | |
| 691 | 554 | echo '</div>'; |
| 692 | - echo $html; | |
| 693 | 555 | echo '</li>'; |
| 694 | 556 | } |
| 695 | 557 | |
| 696 | 558 | /** |
| @@ -698,14 +560,14 @@ | ||
| 698 | 560 | * |
| 699 | 561 | * @since 1.0.0 |
| 700 | 562 | * |
| 701 | 563 | * @static |
| 702 | - * @access public | |
| 564 | + * @access protected | |
| 703 | 565 | * @param string $description The description text. |
| 704 | 566 | */ |
| 705 | - public static function _renderSectionDescription( $description ) { | |
| 706 | - echo '<div class="viz-section-item">'; | |
| 707 | - echo '<div class="viz-section-description">', $description, '</div>'; | |
| 567 | + protected static function _renderSectionDescription( $description ) { | |
| 568 | + echo '<div class="section-item">'; | |
| 569 | + echo '<div class="section-description">', $description, '</div>'; | |
| 708 | 570 | echo '</div>'; |
| 709 | 571 | } |
| 710 | 572 | |
| 711 | 573 | /** |
| @@ -744,38 +606,13 @@ | ||
| 744 | 606 | /** |
| 745 | 607 | * Render a checkbox item |
| 746 | 608 | */ |
| 747 | 609 | protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) { |
| 748 | - echo '<div class="viz-section-item">'; | |
| 610 | + echo '<div class="section-item">'; | |
| 749 | 611 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 750 | 612 | echo '<b>', $title, '</b>'; |
| 751 | - echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>'; | |
| 752 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 613 | + echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ($value == $default ? 'checked' : ''), ' ', ($disabled ? 'disabled=disabled' : ''), '>'; | |
| 614 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 753 | 615 | echo '</div>'; |
| 754 | - } | |
| 755 | - | |
| 756 | - /** | |
| 757 | - * Render a textarea item. | |
| 758 | - */ | |
| 759 | - protected static function _renderTextAreaItem( $title, $name, $value, $desc, $placeholder = '', $custom_attributes = array() ) { | |
| 760 | - $attributes = ''; | |
| 761 | - if ( $custom_attributes ) { | |
| 762 | - foreach ( $custom_attributes as $k => $v ) { | |
| 763 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 764 | - } | |
| 765 | - } | |
| 766 | - echo '<div class="viz-section-item">'; | |
| 767 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 768 | - echo '<b>', $title, '</b>'; | |
| 769 | - echo '<textarea class="control-text" ', $attributes, ' name="', $name, '" placeholder="', $placeholder, '">', $value, '</textarea>'; | |
| 770 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 771 | - echo '</div>'; | |
| 772 | - } | |
| 773 | - | |
| 774 | - /** | |
| 775 | - * Returns the library this chart implements. | |
| 776 | - */ | |
| 777 | - public function getLibrary() { | |
| 778 | - return $this->_library; | |
| 779 | 616 | } |
| 780 | 617 | |
| 781 | 618 | } |
