| @@ -83,16 +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 | 87 | * Constructor. |
| 96 | 88 | * |
| 97 | 89 | * @since 1.0.0 |
| 98 | 90 | * |
| @@ -149,99 +141,8 @@ | ||
| 149 | 141 | ); |
| 150 | 142 | } |
| 151 | 143 | |
| 152 | 144 | /** |
| 153 | - * Renders chart advanced settings group. | |
| 154 | - * | |
| 155 | - * @access protected | |
| 156 | - */ | |
| 157 | - protected function _renderAdvancedSettings() { | |
| 158 | - self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) ); | |
| 159 | - self::_renderSectionStart(); | |
| 160 | - self::_renderSectionDescription( esc_html__( 'Configure frontend actions here.', 'visualizer' ) ); | |
| 161 | - self::_renderSectionEnd(); | |
| 162 | - | |
| 163 | - $this->_renderActionSettings(); | |
| 164 | - self::_renderGroupEnd(); | |
| 165 | - | |
| 166 | - self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) ); | |
| 167 | - self::_renderSectionStart(); | |
| 168 | - self::_renderSectionDescription( __( 'Configure the graph by providing configuration variables right from the', 'visualizer' ) . ' <a href="https://developers.google.com/chart/interactive/docs/reference" target="_blank">Google Visualization</a> API.' ); | |
| 169 | - | |
| 170 | - $example = ' | |
| 171 | -{ | |
| 172 | - "vAxis": { | |
| 173 | - "ticks": [5, 10, 15, 20], | |
| 174 | - "titleTextStyle": { | |
| 175 | - "color": "red" | |
| 176 | - }, | |
| 177 | - "textPosition": "in" | |
| 178 | - } | |
| 179 | -}'; | |
| 180 | - | |
| 181 | - self::_renderTextAreaItem( | |
| 182 | - esc_html__( 'Configuration', 'visualizer' ), | |
| 183 | - 'manual', | |
| 184 | - $this->manual, | |
| 185 | - sprintf( | |
| 186 | - esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ), '<br><code>' . $example . '</code>' | |
| 187 | - ), | |
| 188 | - '', | |
| 189 | - array( 'rows' => 5 ) | |
| 190 | - ); | |
| 191 | - | |
| 192 | - self::_renderSectionEnd(); | |
| 193 | - self::_renderGroupEnd(); | |
| 194 | - | |
| 195 | - } | |
| 196 | - | |
| 197 | - /** | |
| 198 | - * Renders chart action buttons group. | |
| 199 | - * | |
| 200 | - * @access protected | |
| 201 | - */ | |
| 202 | - protected function _renderActionSettings() { | |
| 203 | - global $wp_version; | |
| 204 | - $disable_actions = version_compare( $wp_version, '4.7.0', '<' ); | |
| 205 | - self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false ); | |
| 206 | - self::_renderCheckboxItem( | |
| 207 | - esc_html__( 'Print', 'visualizer' ), | |
| 208 | - 'actions[]', | |
| 209 | - isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false, | |
| 210 | - 'print', | |
| 211 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the data.', 'visualizer' ), | |
| 212 | - $disable_actions | |
| 213 | - ); | |
| 214 | - self::_renderCheckboxItem( | |
| 215 | - esc_html__( 'CSV', 'visualizer' ), | |
| 216 | - 'actions[]', | |
| 217 | - isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false, | |
| 218 | - 'csv;application/csv', | |
| 219 | - $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' ), | |
| 220 | - $disable_actions | |
| 221 | - ); | |
| 222 | - | |
| 223 | - $disabled = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) ); | |
| 224 | - self::_renderCheckboxItem( | |
| 225 | - esc_html__( 'Excel', 'visualizer' ), | |
| 226 | - 'actions[]', | |
| 227 | - isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false, | |
| 228 | - 'xls;application/vnd.ms-excel', | |
| 229 | - $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' ) ), | |
| 230 | - $disable_actions || $disabled | |
| 231 | - ); | |
| 232 | - self::_renderCheckboxItem( | |
| 233 | - esc_html__( 'Copy', 'visualizer' ), | |
| 234 | - 'actions[]', | |
| 235 | - isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false, | |
| 236 | - 'copy', | |
| 237 | - $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' ), | |
| 238 | - $disable_actions | |
| 239 | - ); | |
| 240 | - self::_renderSectionEnd(); | |
| 241 | - } | |
| 242 | - | |
| 243 | - /** | |
| 244 | 145 | * Renders chart general settings group. |
| 245 | 146 | * |
| 246 | 147 | * @since 1.0.0 |
| 247 | 148 | * |
| @@ -257,15 +158,15 @@ | ||
| 257 | 158 | $this->_renderChartTitleSettings(); |
| 258 | 159 | self::_renderSectionEnd(); |
| 259 | 160 | |
| 260 | 161 | self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); |
| 261 | - echo '<div class="viz-section-item">'; | |
| 162 | + echo '<div class="section-item">'; | |
| 262 | 163 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 263 | 164 | echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; |
| 264 | 165 | |
| 265 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 166 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 266 | 167 | echo '<tr>'; |
| 267 | - echo '<td class="viz-section-table-column">'; | |
| 168 | + echo '<td class="section-table-column">'; | |
| 268 | 169 | echo '<select name="fontName" class="control-select">'; |
| 269 | 170 | echo '<option></option>'; |
| 270 | 171 | foreach ( self::$_fontFamilies as $font => $label ) { |
| 271 | 172 | echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; |
| @@ -273,9 +174,9 @@ | ||
| 273 | 174 | echo '</option>'; |
| 274 | 175 | } |
| 275 | 176 | echo '</select>'; |
| 276 | 177 | echo '</td>'; |
| 277 | - echo '<td class="viz-section-table-column">'; | |
| 178 | + echo '<td class="section-table-column">'; | |
| 278 | 179 | echo '<select name="fontSize" class="control-select">'; |
| 279 | 180 | echo '<option></option>'; |
| 280 | 181 | for ( $i = 7; $i <= 20; $i++ ) { |
| 281 | 182 | echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; |
| @@ -284,9 +185,9 @@ | ||
| 284 | 185 | echo '</td>'; |
| 285 | 186 | echo '</tr>'; |
| 286 | 187 | echo '</table>'; |
| 287 | 188 | |
| 288 | - echo '<p class="viz-section-description">'; | |
| 189 | + echo '<p class="section-description">'; | |
| 289 | 190 | esc_html_e( 'The default font family and size for all text in the chart.', 'visualizer' ); |
| 290 | 191 | echo '</p>'; |
| 291 | 192 | echo '</div>'; |
| 292 | 193 | self::_renderSectionEnd(); |
| @@ -318,61 +219,12 @@ | ||
| 318 | 219 | |
| 319 | 220 | self::_renderSectionStart( esc_html__( 'Tooltip', 'visualizer' ), false ); |
| 320 | 221 | $this->_renderTooltipSettigns(); |
| 321 | 222 | self::_renderSectionEnd(); |
| 322 | - | |
| 323 | - $this->_renderAnimationSettings(); | |
| 324 | - | |
| 325 | 223 | self::_renderGroupEnd(); |
| 326 | 224 | } |
| 327 | 225 | |
| 328 | 226 | /** |
| 329 | - * Renders animation settings section. | |
| 330 | - * | |
| 331 | - * @access protected | |
| 332 | - */ | |
| 333 | - protected function _renderAnimationSettings() { | |
| 334 | - if ( ! $this->_supportsAnimation ) { | |
| 335 | - return; | |
| 336 | - } | |
| 337 | - | |
| 338 | - self::_renderSectionStart( esc_html__( 'Animation', 'visualizer' ), false ); | |
| 339 | - | |
| 340 | - self::_renderCheckboxItem( | |
| 341 | - esc_html__( 'Animate on startup', 'visualizer' ), | |
| 342 | - 'animation[startup]', | |
| 343 | - $this->animation['startup'], | |
| 344 | - true, | |
| 345 | - esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' ) | |
| 346 | - ); | |
| 347 | - | |
| 348 | - self::_renderTextItem( | |
| 349 | - esc_html__( 'Duration', 'visualizer' ), | |
| 350 | - 'animation[duration]', | |
| 351 | - isset( $this->animation['duration'] ) ? $this->animation['duration'] : 0, | |
| 352 | - esc_html__( 'The duration of the animation, in milliseconds', 'visualizer' ), | |
| 353 | - 0, | |
| 354 | - 'number' | |
| 355 | - ); | |
| 356 | - | |
| 357 | - self::_renderSelectItem( | |
| 358 | - esc_html__( 'Easing', 'visualizer' ), | |
| 359 | - 'animation[easing]', | |
| 360 | - isset( $this->animation['easing'] ) ? $this->animation['easing'] : null, | |
| 361 | - array( | |
| 362 | - 'linear' => esc_html__( 'Constant speed', 'visualizer' ), | |
| 363 | - 'in' => esc_html__( 'Start slow and speed up', 'visualizer' ), | |
| 364 | - 'out' => esc_html__( 'Start fast and slow down', 'visualizer' ), | |
| 365 | - 'inAndOut' => esc_html__( 'Start slow, speed up, then slow down', 'visualizer' ), | |
| 366 | - ), | |
| 367 | - esc_html__( 'The easing function applied to the animation.', 'visualizer' ) | |
| 368 | - ); | |
| 369 | - | |
| 370 | - self::_renderSectionEnd(); | |
| 371 | - | |
| 372 | - } | |
| 373 | - | |
| 374 | - /** | |
| 375 | 227 | * Renders tooltip settings section. |
| 376 | 228 | * |
| 377 | 229 | * @since 1.4.0 |
| 378 | 230 | * |
| @@ -412,29 +264,29 @@ | ||
| 412 | 264 | self::_renderGroupStart( esc_html__( 'Layout & Chart Area', 'visualizer' ) ); |
| 413 | 265 | self::_renderSectionStart( esc_html__( 'Layout', 'visualizer' ), false ); |
| 414 | 266 | 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' ) ); |
| 415 | 267 | |
| 416 | - echo '<div class="viz-section-item">'; | |
| 268 | + echo '<div class="section-item">'; | |
| 417 | 269 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 418 | 270 | echo '<b>', esc_html__( 'Width And Height Of Chart', 'visualizer' ), '</b>'; |
| 419 | 271 | |
| 420 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 272 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 421 | 273 | echo '<tr>'; |
| 422 | - echo '<td class="viz-section-table-column">'; | |
| 274 | + echo '<td class="section-table-column">'; | |
| 423 | 275 | echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">'; |
| 424 | 276 | echo '</td>'; |
| 425 | - echo '<td class="viz-section-table-column">'; | |
| 277 | + echo '<td class="section-table-column">'; | |
| 426 | 278 | echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">'; |
| 427 | 279 | echo '</td>'; |
| 428 | 280 | echo '</tr>'; |
| 429 | 281 | echo '</table>'; |
| 430 | 282 | |
| 431 | - echo '<p class="viz-section-description">'; | |
| 283 | + echo '<p class="section-description">'; | |
| 432 | 284 | esc_html_e( 'Determines the total width and height of the chart.', 'visualizer' ); |
| 433 | 285 | echo '</p>'; |
| 434 | 286 | echo '</div>'; |
| 435 | 287 | |
| 436 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 288 | + echo '<div class="section-delimiter"></div>'; | |
| 437 | 289 | |
| 438 | 290 | self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); |
| 439 | 291 | |
| 440 | 292 | self::_renderTextItem( |
| @@ -459,9 +311,9 @@ | ||
| 459 | 311 | $background_color, |
| 460 | 312 | '#fff' |
| 461 | 313 | ); |
| 462 | 314 | |
| 463 | - echo '<div class="viz-section-item">'; | |
| 315 | + echo '<div class="section-item">'; | |
| 464 | 316 | echo '<label>'; |
| 465 | 317 | echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> '; |
| 466 | 318 | esc_html_e( 'Transparent background', 'visualizer' ); |
| 467 | 319 | echo '</label>'; |
| @@ -470,44 +322,44 @@ | ||
| 470 | 322 | |
| 471 | 323 | self::_renderSectionStart( esc_html__( 'Chart Area', 'visualizer' ), false ); |
| 472 | 324 | 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' ) ); |
| 473 | 325 | |
| 474 | - echo '<div class="viz-section-item">'; | |
| 326 | + echo '<div class="section-item">'; | |
| 475 | 327 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 476 | 328 | echo '<b>', esc_html__( 'Left And Top Margins', 'visualizer' ), '</b>'; |
| 477 | 329 | |
| 478 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 330 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 479 | 331 | echo '<tr>'; |
| 480 | - echo '<td class="viz-section-table-column">'; | |
| 332 | + echo '<td class="section-table-column">'; | |
| 481 | 333 | 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%">'; |
| 482 | 334 | echo '</td>'; |
| 483 | - echo '<td class="viz-section-table-column">'; | |
| 335 | + echo '<td class="section-table-column">'; | |
| 484 | 336 | 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%">'; |
| 485 | 337 | echo '</td>'; |
| 486 | 338 | echo '</tr>'; |
| 487 | 339 | echo '</table>'; |
| 488 | 340 | |
| 489 | - echo '<p class="viz-section-description">'; | |
| 341 | + echo '<p class="section-description">'; | |
| 490 | 342 | esc_html_e( 'Determines how far to draw the chart from the left and top borders.', 'visualizer' ); |
| 491 | 343 | echo '</p>'; |
| 492 | 344 | echo '</div>'; |
| 493 | 345 | |
| 494 | - echo '<div class="viz-section-item">'; | |
| 346 | + echo '<div class="section-item">'; | |
| 495 | 347 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 496 | 348 | echo '<b>', esc_html__( 'Width And Height Of Chart Area', 'visualizer' ), '</b>'; |
| 497 | 349 | |
| 498 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 350 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 499 | 351 | echo '<tr>'; |
| 500 | - echo '<td class="viz-section-table-column">'; | |
| 352 | + echo '<td class="section-table-column">'; | |
| 501 | 353 | echo '<input type="text" name="chartArea[width]" class="control-text" value="', ! empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; |
| 502 | 354 | echo '</td>'; |
| 503 | - echo '<td class="viz-section-table-column">'; | |
| 355 | + echo '<td class="section-table-column">'; | |
| 504 | 356 | echo '<input type="text" name="chartArea[height]" class="control-text" value="', ! empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; |
| 505 | 357 | echo '</td>'; |
| 506 | 358 | echo '</tr>'; |
| 507 | 359 | echo '</table>'; |
| 508 | 360 | |
| 509 | - echo '<p class="viz-section-description">'; | |
| 361 | + echo '<p class="section-description">'; | |
| 510 | 362 | esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); |
| 511 | 363 | echo '</p>'; |
| 512 | 364 | echo '</div>'; |
| 513 | 365 | self::_renderSectionEnd(); |
| @@ -519,37 +371,27 @@ | ||
| 519 | 371 | * |
| 520 | 372 | * @since 1.0.0 |
| 521 | 373 | * |
| 522 | 374 | * @static |
| 523 | - * @access public | |
| 375 | + * @access protected | |
| 524 | 376 | * @param string $title The title of the select item. |
| 525 | 377 | * @param string $name The name of the select item. |
| 526 | 378 | * @param string $value The actual value of the select item. |
| 527 | 379 | * @param array $options The array of select options. |
| 528 | 380 | * @param string $desc The description of the select item. |
| 529 | - * @param bool $multiple Is this a multiple select box. | |
| 530 | - * @param array $classes Any additional classes. | |
| 531 | - * @param array $attributes Custom attributes. | |
| 532 | 381 | */ |
| 533 | - public static function _renderSelectItem( $title, $name, $value, array $options, $desc, $multiple = false, $classes = array(), $attributes = array() ) { | |
| 534 | - $atts = ''; | |
| 535 | - if ( $attributes ) { | |
| 536 | - foreach ( $attributes as $k => $v ) { | |
| 537 | - $atts .= ' data-visualizer-' . $k . '=' . esc_attr( $v ); | |
| 538 | - } | |
| 539 | - } | |
| 540 | - echo '<div class="viz-section-item">'; | |
| 382 | + protected static function _renderSelectItem( $title, $name, $value, array $options, $desc ) { | |
| 383 | + echo '<div class="section-item">'; | |
| 541 | 384 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 542 | 385 | echo '<b>', $title, '</b>'; |
| 543 | - echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>'; | |
| 386 | + echo '<select class="control-select" name="', $name, '">'; | |
| 544 | 387 | foreach ( $options as $key => $label ) { |
| 545 | - $extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false ); | |
| 546 | - echo '<option value="', $key, '"', $extra, '>'; | |
| 388 | + echo '<option value="', $key, '"', selected( $key, $value, false ), '>'; | |
| 547 | 389 | echo $label; |
| 548 | 390 | echo '</option>'; |
| 549 | 391 | } |
| 550 | 392 | echo '</select>'; |
| 551 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 393 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 552 | 394 | echo '</div>'; |
| 553 | 395 | } |
| 554 | 396 | |
| 555 | 397 | /** |
| @@ -564,9 +406,9 @@ | ||
| 564 | 406 | * @param string $value The actual value of the select item. |
| 565 | 407 | * @param string $default The default value of the color picker. |
| 566 | 408 | */ |
| 567 | 409 | protected static function _renderColorPickerItem( $title, $name, $value, $default ) { |
| 568 | - echo '<div class="viz-section-item">'; | |
| 410 | + echo '<div class="section-item">'; | |
| 569 | 411 | echo '<b>', $title, '</b>'; |
| 570 | 412 | echo '<div>'; |
| 571 | 413 | 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, '">'; |
| 572 | 414 | echo '</div>'; |
| @@ -584,23 +426,15 @@ | ||
| 584 | 426 | * @param string $name The name of the select item. |
| 585 | 427 | * @param string $value The actual value of the select item. |
| 586 | 428 | * @param string $desc The description of the select item. |
| 587 | 429 | * @param string $placeholder The placeholder for the input. |
| 588 | - * @param string $type The type for the input (out of number, email, tel etc., default is text). | |
| 589 | - * @param array $custom_attributes The custom attributes. | |
| 590 | 430 | */ |
| 591 | - protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array() ) { | |
| 592 | - $attributes = ''; | |
| 593 | - if ( $custom_attributes ) { | |
| 594 | - foreach ( $custom_attributes as $k => $v ) { | |
| 595 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 596 | - } | |
| 597 | - } | |
| 598 | - echo '<div class="viz-section-item">'; | |
| 431 | + protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '' ) { | |
| 432 | + echo '<div class="section-item">'; | |
| 599 | 433 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 600 | 434 | echo '<b>', $title, '</b>'; |
| 601 | - echo '<input type="', $type, '" class="control-text" ', $attributes, ' name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 602 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 435 | + echo '<input type="text" class="control-text" name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 436 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 603 | 437 | echo '</div>'; |
| 604 | 438 | } |
| 605 | 439 | |
| 606 | 440 | /** |
| @@ -608,18 +442,15 @@ | ||
| 608 | 442 | * |
| 609 | 443 | * @since 1.0.0 |
| 610 | 444 | * |
| 611 | 445 | * @static |
| 612 | - * @access public | |
| 446 | + * @access protected | |
| 613 | 447 | * @param string $title The title of this group. |
| 614 | - * @param string $html Any additional HTML. | |
| 615 | - * @param string $class Any additional classes. | |
| 616 | 448 | */ |
| 617 | - public static function _renderGroupStart( $title, $html = '', $class = '' ) { | |
| 618 | - echo '<li class="viz-group ' . $class . '">'; | |
| 619 | - echo '<h3 class="viz-group-title">', $title, '</h3>'; | |
| 620 | - echo $html; | |
| 621 | - echo '<ul class="viz-group-content">'; | |
| 449 | + protected static function _renderGroupStart( $title ) { | |
| 450 | + echo '<li class="group">'; | |
| 451 | + echo '<h3 class="group-title">', $title, '</h3>'; | |
| 452 | + echo '<ul class="group-content">'; | |
| 622 | 453 | } |
| 623 | 454 | |
| 624 | 455 | /** |
| 625 | 456 | * Renders the ending of a group. |
| @@ -626,11 +457,11 @@ | ||
| 626 | 457 | * |
| 627 | 458 | * @since 1.0.0 |
| 628 | 459 | * |
| 629 | 460 | * @static |
| 630 | - * @access public | |
| 461 | + * @access protected | |
| 631 | 462 | */ |
| 632 | - public static function _renderGroupEnd() { | |
| 463 | + protected static function _renderGroupEnd() { | |
| 633 | 464 | echo '</ul>'; |
| 634 | 465 | echo '</li>'; |
| 635 | 466 | } |
| 636 | 467 | |
| @@ -639,21 +470,18 @@ | ||
| 639 | 470 | * |
| 640 | 471 | * @since 1.0.0 |
| 641 | 472 | * |
| 642 | 473 | * @static |
| 643 | - * @access public | |
| 474 | + * @access protected | |
| 644 | 475 | * @param string $title The title of this section. If the title is empty, no title will be displayed. |
| 645 | 476 | * @param boolean $open Determines whether the section items block has to be expanded or collapsed. |
| 646 | 477 | */ |
| 647 | - public static function _renderSectionStart( $title = false, $open = true ) { | |
| 648 | - | |
| 478 | + protected static function _renderSectionStart( $title = false, $open = true ) { | |
| 479 | + echo '<li>'; | |
| 649 | 480 | if ( ! empty( $title ) ) { |
| 650 | - echo '<li class="viz-subsection">'; | |
| 651 | - echo '<span class="viz-section-title">', $title, '</span>'; | |
| 652 | - } else { | |
| 653 | - echo '<li class=" ">'; | |
| 481 | + echo '<span class="section-title">', $title, '</span>'; | |
| 654 | 482 | } |
| 655 | - echo '<div class="viz-section-items section-items', $open ? ' open' : '', '">'; | |
| 483 | + echo '<div class="section-items', $open ? ' open' : '', '">'; | |
| 656 | 484 | } |
| 657 | 485 | |
| 658 | 486 | /** |
| 659 | 487 | * Renders the ending of a section. |
| @@ -659,15 +487,13 @@ | ||
| 659 | 487 | * Renders the ending of a section. |
| 660 | 488 | * |
| 661 | 489 | * @since 1.0.0 |
| 662 | 490 | * |
| 663 | - * @public | |
| 491 | + * @static | |
| 664 | 492 | * @access protected |
| 665 | - * @param string $html Any addition HTML to add. | |
| 666 | 493 | */ |
| 667 | - public static function _renderSectionEnd( $html = '' ) { | |
| 494 | + protected static function _renderSectionEnd() { | |
| 668 | 495 | echo '</div>'; |
| 669 | - echo $html; | |
| 670 | 496 | echo '</li>'; |
| 671 | 497 | } |
| 672 | 498 | |
| 673 | 499 | /** |
| @@ -675,14 +501,14 @@ | ||
| 675 | 501 | * |
| 676 | 502 | * @since 1.0.0 |
| 677 | 503 | * |
| 678 | 504 | * @static |
| 679 | - * @access public | |
| 505 | + * @access protected | |
| 680 | 506 | * @param string $description The description text. |
| 681 | 507 | */ |
| 682 | - public static function _renderSectionDescription( $description ) { | |
| 683 | - echo '<div class="viz-section-item">'; | |
| 684 | - echo '<div class="viz-section-description">', $description, '</div>'; | |
| 508 | + protected static function _renderSectionDescription( $description ) { | |
| 509 | + echo '<div class="section-item">'; | |
| 510 | + echo '<div class="section-description">', $description, '</div>'; | |
| 685 | 511 | echo '</div>'; |
| 686 | 512 | } |
| 687 | 513 | |
| 688 | 514 | /** |
| @@ -720,32 +546,14 @@ | ||
| 720 | 546 | |
| 721 | 547 | /** |
| 722 | 548 | * Render a checkbox item |
| 723 | 549 | */ |
| 724 | - protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) { | |
| 725 | - echo '<div class="viz-section-item">'; | |
| 550 | + protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc ) { | |
| 551 | + echo '<div class="section-item">'; | |
| 726 | 552 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 727 | 553 | echo '<b>', $title, '</b>'; |
| 728 | - echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>'; | |
| 729 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 730 | - echo '</div>'; | |
| 731 | - } | |
| 732 | - | |
| 733 | - /** | |
| 734 | - * Render a textarea item. | |
| 735 | - */ | |
| 736 | - protected static function _renderTextAreaItem( $title, $name, $value, $desc, $placeholder = '', $custom_attributes = array() ) { | |
| 737 | - $attributes = ''; | |
| 738 | - if ( $custom_attributes ) { | |
| 739 | - foreach ( $custom_attributes as $k => $v ) { | |
| 740 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 741 | - } | |
| 742 | - } | |
| 743 | - echo '<div class="viz-section-item">'; | |
| 744 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 745 | - echo '<b>', $title, '</b>'; | |
| 746 | - echo '<textarea class="control-text" ', $attributes, ' name="', $name, '" placeholder="', $placeholder, '">', $value, '</textarea>'; | |
| 747 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 554 | + echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ($value == $default ? 'checked' : ''), '>'; | |
| 555 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 748 | 556 | echo '</div>'; |
| 749 | 557 | } |
| 750 | 558 | |
| 751 | 559 | } |
