| @@ -63,28 +63,8 @@ | ||
| 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 | - /** | |
| 87 | 67 | * Whether this chart supports animation or not. |
| 88 | 68 | * |
| 89 | 69 | * @access protected |
| 90 | 70 | * @var bool |
| @@ -109,25 +89,8 @@ | ||
| 109 | 89 | */ |
| 110 | 90 | public function __construct( $data = array() ) { |
| 111 | 91 | parent::__construct( $data ); |
| 112 | 92 | |
| 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 | - | |
| 130 | 93 | $this->_yesno = array( |
| 131 | 94 | '' => '', |
| 132 | 95 | '1' => esc_html__( 'Yes', 'visualizer' ), |
| 133 | 96 | '0' => esc_html__( 'No', 'visualizer' ), |
| @@ -159,8 +122,31 @@ | ||
| 159 | 122 | ); |
| 160 | 123 | } |
| 161 | 124 | |
| 162 | 125 | /** |
| 126 | + * Add the correct description for the manual configuration box. | |
| 127 | + */ | |
| 128 | + protected function _renderManualConfigDescription() { | |
| 129 | + self::_renderSectionStart(); | |
| 130 | + 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>' ); | |
| 131 | + } | |
| 132 | + | |
| 133 | + /** | |
| 134 | + * Add the correct example for the manual configuration box. | |
| 135 | + */ | |
| 136 | + protected function _renderManualConfigExample() { | |
| 137 | + return '{ | |
| 138 | + "vAxis": { | |
| 139 | + "ticks": [5, 10, 15, 20], | |
| 140 | + "titleTextStyle": { | |
| 141 | + "color": "red" | |
| 142 | + }, | |
| 143 | + "textPosition": "in" | |
| 144 | + } | |
| 145 | + }'; | |
| 146 | + } | |
| 147 | + | |
| 148 | + /** | |
| 163 | 149 | * Renders chart advanced settings group. |
| 164 | 150 | * |
| 165 | 151 | * @access protected |
| 166 | 152 | */ |
| @@ -166,9 +152,9 @@ | ||
| 166 | 152 | */ |
| 167 | 153 | protected function _renderAdvancedSettings() { |
| 168 | 154 | self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) ); |
| 169 | 155 | self::_renderSectionStart(); |
| 170 | - self::_renderSectionDescription( esc_html__( 'Configure frontend actions here.', 'visualizer' ) ); | |
| 156 | + self::_renderSectionDescription( esc_html__( 'Configure frontend actions that need to be shown.', 'visualizer' ) ); | |
| 171 | 157 | self::_renderSectionEnd(); |
| 172 | 158 | |
| 173 | 159 | $this->_renderActionSettings(); |
| 174 | 160 | self::_renderGroupEnd(); |
| @@ -173,22 +159,9 @@ | ||
| 173 | 159 | $this->_renderActionSettings(); |
| 174 | 160 | self::_renderGroupEnd(); |
| 175 | 161 | |
| 176 | 162 | 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', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/gallery/?#configuration-options" 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 | - } | |
| 189 | -}'; | |
| 190 | - | |
| 163 | + $this->_renderManualConfigDescription(); | |
| 191 | 164 | self::_renderTextAreaItem( |
| 192 | 165 | esc_html__( 'Configuration', 'visualizer' ), |
| 193 | 166 | 'manual', |
| 194 | 167 | $this->manual, |
| @@ -193,9 +166,9 @@ | ||
| 193 | 166 | 'manual', |
| 194 | 167 | $this->manual, |
| 195 | 168 | sprintf( |
| 196 | 169 | esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ), |
| 197 | - '<br><code>' . $example . '</code>' | |
| 170 | + '<br><code>' . $this->_renderManualConfigExample() . '</code>' | |
| 198 | 171 | ), |
| 199 | 172 | '', |
| 200 | 173 | array( 'rows' => 5 ) |
| 201 | 174 | ); |
| @@ -212,31 +185,33 @@ | ||
| 212 | 185 | */ |
| 213 | 186 | protected function _renderActionSettings() { |
| 214 | 187 | global $wp_version; |
| 215 | 188 | $disable_actions = version_compare( $wp_version, '4.7.0', '<' ); |
| 216 | - self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false ); | |
| 189 | + // default open this section when not testing through cypress because cypress expects to click and open each section | |
| 190 | + // and may not like finding a section is already open. | |
| 191 | + self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), ! defined( 'TI_CYPRESS_TESTING' ) ); | |
| 217 | 192 | self::_renderCheckboxItem( |
| 218 | 193 | esc_html__( 'Print', 'visualizer' ), |
| 219 | 194 | 'actions[]', |
| 220 | - isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false, | |
| 195 | + isset( $this->actions ) && in_array( 'print', $this->actions, true ) ? true : false, | |
| 221 | 196 | '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 data.', 'visualizer' ), | |
| 197 | + $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 | 198 | $disable_actions |
| 224 | 199 | ); |
| 225 | 200 | self::_renderCheckboxItem( |
| 226 | 201 | esc_html__( 'CSV', 'visualizer' ), |
| 227 | 202 | 'actions[]', |
| 228 | - isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false, | |
| 203 | + isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions, true ) ? true : false, | |
| 229 | 204 | 'csv;application/csv', |
| 230 | 205 | $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 | 206 | $disable_actions |
| 232 | 207 | ); |
| 233 | 208 | |
| 234 | - $disabled = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) ); | |
| 209 | + $disabled = ! self::is_excel_enabled(); | |
| 235 | 210 | self::_renderCheckboxItem( |
| 236 | 211 | esc_html__( 'Excel', 'visualizer' ), |
| 237 | 212 | 'actions[]', |
| 238 | - isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false, | |
| 213 | + isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions, true ) ? true : false, | |
| 239 | 214 | 'xls;application/vnd.ms-excel', |
| 240 | 215 | $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 | 216 | $disable_actions || $disabled |
| 242 | 217 | ); |
| @@ -242,291 +217,45 @@ | ||
| 242 | 217 | ); |
| 243 | 218 | self::_renderCheckboxItem( |
| 244 | 219 | esc_html__( 'Copy', 'visualizer' ), |
| 245 | 220 | 'actions[]', |
| 246 | - isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false, | |
| 221 | + isset( $this->actions ) && in_array( 'copy', $this->actions, true ) ? true : false, | |
| 247 | 222 | 'copy', |
| 248 | 223 | $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 | 224 | $disable_actions |
| 250 | 225 | ); |
| 226 | + | |
| 227 | + // not all charts support downloading as an image. | |
| 228 | + $disabled = ! $this->can_chart_have_action( 'image' ); | |
| 229 | + self::_renderCheckboxItem( | |
| 230 | + esc_html__( 'Download Image', 'visualizer' ), | |
| 231 | + 'actions[]', | |
| 232 | + isset( $this->actions ) && in_array( 'image', $this->actions, true ) ? true : false, | |
| 233 | + 'image', | |
| 234 | + $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : ( $disabled ? '<span class="viz-section-error">' . esc_html__( 'Not supported for this chart type.', 'visualizer' ) . '</span>' : esc_html__( 'To download the chart as an image.', 'visualizer' ) ), | |
| 235 | + $disable_actions || $disabled | |
| 236 | + ); | |
| 251 | 237 | self::_renderSectionEnd(); |
| 252 | 238 | } |
| 253 | 239 | |
| 254 | 240 | /** |
| 255 | - * Renders chart general settings group. | |
| 256 | - * | |
| 257 | - * @since 1.0.0 | |
| 258 | - * | |
| 259 | - * @access protected | |
| 241 | + * Checks if the Excel module can be enabled. | |
| 260 | 242 | */ |
| 261 | - protected function _renderGeneralSettings() { | |
| 262 | - self::_renderGroupStart( esc_html__( 'General Settings', 'visualizer' ) ); | |
| 263 | - self::_renderSectionStart(); | |
| 264 | - self::_renderSectionDescription( esc_html__( 'Configure title, font styles, tooltip, legend and else settings for the chart.', 'visualizer' ) ); | |
| 265 | - self::_renderSectionEnd(); | |
| 266 | - | |
| 267 | - self::_renderSectionStart( esc_html__( 'Title', 'visualizer' ), false ); | |
| 268 | - $this->_renderChartTitleSettings(); | |
| 269 | - self::_renderSectionEnd(); | |
| 270 | - | |
| 271 | - self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); | |
| 272 | - echo '<div class="viz-section-item">'; | |
| 273 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 274 | - echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; | |
| 275 | - | |
| 276 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 277 | - echo '<tr>'; | |
| 278 | - echo '<td class="viz-section-table-column">'; | |
| 279 | - echo '<select name="fontName" class="control-select">'; | |
| 280 | - echo '<option></option>'; | |
| 281 | - foreach ( self::$_fontFamilies as $font => $label ) { | |
| 282 | - echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; | |
| 283 | - echo $label; | |
| 284 | - echo '</option>'; | |
| 243 | + private static function is_excel_enabled() { | |
| 244 | + $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php'; | |
| 245 | + if ( is_readable( $vendor_file ) ) { | |
| 246 | + include_once( $vendor_file ); | |
| 285 | 247 | } |
| 286 | - echo '</select>'; | |
| 287 | - echo '</td>'; | |
| 288 | - echo '<td class="viz-section-table-column">'; | |
| 289 | - echo '<select name="fontSize" class="control-select">'; | |
| 290 | - echo '<option></option>'; | |
| 291 | - for ( $i = 7; $i <= 20; $i++ ) { | |
| 292 | - echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; | |
| 293 | - } | |
| 294 | - echo '</select>'; | |
| 295 | - echo '</td>'; | |
| 296 | - echo '</tr>'; | |
| 297 | - echo '</table>'; | |
| 298 | 248 | |
| 299 | - echo '<p class="viz-section-description">'; | |
| 300 | - esc_html_e( 'The default font family and size for all text in the chart.', 'visualizer' ); | |
| 301 | - echo '</p>'; | |
| 302 | - echo '</div>'; | |
| 303 | - self::_renderSectionEnd(); | |
| 304 | - | |
| 305 | - self::_renderSectionStart( esc_html__( 'Legend', 'visualizer' ), false ); | |
| 306 | - self::_renderSelectItem( | |
| 307 | - esc_html__( 'Position', 'visualizer' ), | |
| 308 | - 'legend[position]', | |
| 309 | - $this->legend['position'], | |
| 310 | - $this->_legendPositions, | |
| 311 | - esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' ) | |
| 312 | - ); | |
| 313 | - | |
| 314 | - self::_renderSelectItem( | |
| 315 | - esc_html__( 'Alignment', 'visualizer' ), | |
| 316 | - 'legend[alignment]', | |
| 317 | - $this->legend['alignment'], | |
| 318 | - $this->_alignments, | |
| 319 | - esc_html__( 'Determines the alignment of the legend.', 'visualizer' ) | |
| 320 | - ); | |
| 321 | - | |
| 322 | - self::_renderColorPickerItem( | |
| 323 | - esc_html__( 'Font Color', 'visualizer' ), | |
| 324 | - 'legend[textStyle][color]', | |
| 325 | - isset( $this->legend['textStyle']['color'] ) ? $this->legend['textStyle']['color'] : null, | |
| 326 | - '#000' | |
| 327 | - ); | |
| 328 | - self::_renderSectionEnd(); | |
| 329 | - | |
| 330 | - self::_renderSectionStart( esc_html__( 'Tooltip', 'visualizer' ), false ); | |
| 331 | - $this->_renderTooltipSettigns(); | |
| 332 | - self::_renderSectionEnd(); | |
| 333 | - | |
| 334 | - $this->_renderAnimationSettings(); | |
| 335 | - | |
| 336 | - self::_renderGroupEnd(); | |
| 337 | - } | |
| 338 | - | |
| 339 | - /** | |
| 340 | - * Renders animation settings section. | |
| 341 | - * | |
| 342 | - * @access protected | |
| 343 | - */ | |
| 344 | - protected function _renderAnimationSettings() { | |
| 345 | - if ( ! $this->_supportsAnimation ) { | |
| 346 | - return; | |
| 249 | + if ( version_compare( phpversion(), '5.6.0', '<' ) ) { | |
| 250 | + do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'PHP version %s not supported', phpversion() ), 'error', __FILE__, __LINE__ ); | |
| 251 | + return false; | |
| 347 | 252 | } |
| 348 | 253 | |
| 349 | - self::_renderSectionStart( esc_html__( 'Animation', 'visualizer' ), false ); | |
| 350 | - | |
| 351 | - self::_renderCheckboxItem( | |
| 352 | - esc_html__( 'Animate on startup', 'visualizer' ), | |
| 353 | - 'animation[startup]', | |
| 354 | - $this->animation['startup'], | |
| 355 | - true, | |
| 356 | - esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' ) | |
| 357 | - ); | |
| 358 | - | |
| 359 | - self::_renderTextItem( | |
| 360 | - esc_html__( 'Duration', 'visualizer' ), | |
| 361 | - 'animation[duration]', | |
| 362 | - isset( $this->animation['duration'] ) ? $this->animation['duration'] : 0, | |
| 363 | - esc_html__( 'The duration of the animation, in milliseconds', 'visualizer' ), | |
| 364 | - 0, | |
| 365 | - 'number' | |
| 366 | - ); | |
| 367 | - | |
| 368 | - self::_renderSelectItem( | |
| 369 | - esc_html__( 'Easing', 'visualizer' ), | |
| 370 | - 'animation[easing]', | |
| 371 | - isset( $this->animation['easing'] ) ? $this->animation['easing'] : null, | |
| 372 | - array( | |
| 373 | - 'linear' => esc_html__( 'Constant speed', 'visualizer' ), | |
| 374 | - 'in' => esc_html__( 'Start slow and speed up', 'visualizer' ), | |
| 375 | - 'out' => esc_html__( 'Start fast and slow down', 'visualizer' ), | |
| 376 | - 'inAndOut' => esc_html__( 'Start slow, speed up, then slow down', 'visualizer' ), | |
| 377 | - ), | |
| 378 | - esc_html__( 'The easing function applied to the animation.', 'visualizer' ) | |
| 379 | - ); | |
| 380 | - | |
| 381 | - self::_renderSectionEnd(); | |
| 382 | - | |
| 254 | + return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ); | |
| 383 | 255 | } |
| 384 | 256 | |
| 385 | 257 | /** |
| 386 | - * Renders tooltip settings section. | |
| 387 | - * | |
| 388 | - * @since 1.4.0 | |
| 389 | - * | |
| 390 | - * @access protected | |
| 391 | - */ | |
| 392 | - protected function _renderTooltipSettigns() { | |
| 393 | - self::_renderSelectItem( | |
| 394 | - esc_html__( 'Trigger', 'visualizer' ), | |
| 395 | - 'tooltip[trigger]', | |
| 396 | - isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null, | |
| 397 | - array( | |
| 398 | - '' => '', | |
| 399 | - 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', 'visualizer' ), | |
| 400 | - 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', 'visualizer' ), | |
| 401 | - 'none' => esc_html__( 'The tooltip will not be displayed', 'visualizer' ), | |
| 402 | - ), | |
| 403 | - esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', 'visualizer' ) | |
| 404 | - ); | |
| 405 | - | |
| 406 | - self::_renderSelectItem( | |
| 407 | - esc_html__( 'Show Color Code', 'visualizer' ), | |
| 408 | - 'tooltip[showColorCode]', | |
| 409 | - isset( $this->tooltip['showColorCode'] ) ? $this->tooltip['showColorCode'] : null, | |
| 410 | - $this->_yesno, | |
| 411 | - esc_html__( 'If set to yes, will show colored squares next to the slice information in the tooltip.', 'visualizer' ) | |
| 412 | - ); | |
| 413 | - } | |
| 414 | - | |
| 415 | - /** | |
| 416 | - * Renders chart view settings group. | |
| 417 | - * | |
| 418 | - * @since 1.0.0 | |
| 419 | - * | |
| 420 | - * @access protected | |
| 421 | - */ | |
| 422 | - protected function _renderViewSettings() { | |
| 423 | - self::_renderGroupStart( esc_html__( 'Layout & Chart Area', 'visualizer' ) ); | |
| 424 | - self::_renderSectionStart( esc_html__( 'Layout', 'visualizer' ), false ); | |
| 425 | - 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' ) ); | |
| 426 | - | |
| 427 | - echo '<div class="viz-section-item">'; | |
| 428 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 429 | - echo '<b>', esc_html__( 'Width And Height Of Chart', 'visualizer' ), '</b>'; | |
| 430 | - | |
| 431 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 432 | - echo '<tr>'; | |
| 433 | - echo '<td class="viz-section-table-column">'; | |
| 434 | - echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">'; | |
| 435 | - echo '</td>'; | |
| 436 | - echo '<td class="viz-section-table-column">'; | |
| 437 | - echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">'; | |
| 438 | - echo '</td>'; | |
| 439 | - echo '</tr>'; | |
| 440 | - echo '</table>'; | |
| 441 | - | |
| 442 | - echo '<p class="viz-section-description">'; | |
| 443 | - esc_html_e( 'Determines the total width and height of the chart.', 'visualizer' ); | |
| 444 | - echo '</p>'; | |
| 445 | - echo '</div>'; | |
| 446 | - | |
| 447 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 448 | - | |
| 449 | - self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); | |
| 450 | - | |
| 451 | - self::_renderTextItem( | |
| 452 | - esc_html__( 'Stroke Width', 'visualizer' ), | |
| 453 | - 'backgroundColor[strokeWidth]', | |
| 454 | - isset( $this->backgroundColor['strokeWidth'] ) ? $this->backgroundColor['strokeWidth'] : null, | |
| 455 | - esc_html__( 'The chart border width in pixels.', 'visualizer' ), | |
| 456 | - '0' | |
| 457 | - ); | |
| 458 | - | |
| 459 | - self::_renderColorPickerItem( | |
| 460 | - esc_html__( 'Stroke Color', 'visualizer' ), | |
| 461 | - 'backgroundColor[stroke]', | |
| 462 | - ! empty( $this->backgroundColor['stroke'] ) ? $this->backgroundColor['stroke'] : null, | |
| 463 | - '#666' | |
| 464 | - ); | |
| 465 | - | |
| 466 | - $background_color = ! empty( $this->backgroundColor['fill'] ) ? $this->backgroundColor['fill'] : null; | |
| 467 | - self::_renderColorPickerItem( | |
| 468 | - esc_html__( 'Background Color', 'visualizer' ), | |
| 469 | - 'backgroundColor[fill]', | |
| 470 | - $background_color, | |
| 471 | - '#fff' | |
| 472 | - ); | |
| 473 | - | |
| 474 | - echo '<div class="viz-section-item">'; | |
| 475 | - echo '<label>'; | |
| 476 | - echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> '; | |
| 477 | - esc_html_e( 'Transparent background', 'visualizer' ); | |
| 478 | - echo '</label>'; | |
| 479 | - echo '</div>'; | |
| 480 | - self::_renderSectionEnd(); | |
| 481 | - | |
| 482 | - self::_renderSectionStart( esc_html__( 'Chart Area', 'visualizer' ), false ); | |
| 483 | - 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' ) ); | |
| 484 | - | |
| 485 | - echo '<div class="viz-section-item">'; | |
| 486 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 487 | - echo '<b>', esc_html__( 'Left And Top Margins', 'visualizer' ), '</b>'; | |
| 488 | - | |
| 489 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 490 | - echo '<tr>'; | |
| 491 | - echo '<td class="viz-section-table-column">'; | |
| 492 | - 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%">'; | |
| 493 | - echo '</td>'; | |
| 494 | - echo '<td class="viz-section-table-column">'; | |
| 495 | - 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%">'; | |
| 496 | - echo '</td>'; | |
| 497 | - echo '</tr>'; | |
| 498 | - echo '</table>'; | |
| 499 | - | |
| 500 | - echo '<p class="viz-section-description">'; | |
| 501 | - esc_html_e( 'Determines how far to draw the chart from the left and top borders.', 'visualizer' ); | |
| 502 | - echo '</p>'; | |
| 503 | - echo '</div>'; | |
| 504 | - | |
| 505 | - echo '<div class="viz-section-item">'; | |
| 506 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 507 | - echo '<b>', esc_html__( 'Width And Height Of Chart Area', 'visualizer' ), '</b>'; | |
| 508 | - | |
| 509 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 510 | - echo '<tr>'; | |
| 511 | - echo '<td class="viz-section-table-column">'; | |
| 512 | - echo '<input type="text" name="chartArea[width]" class="control-text" value="', ! empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; | |
| 513 | - echo '</td>'; | |
| 514 | - echo '<td class="viz-section-table-column">'; | |
| 515 | - echo '<input type="text" name="chartArea[height]" class="control-text" value="', ! empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; | |
| 516 | - echo '</td>'; | |
| 517 | - echo '</tr>'; | |
| 518 | - echo '</table>'; | |
| 519 | - | |
| 520 | - echo '<p class="viz-section-description">'; | |
| 521 | - esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); | |
| 522 | - echo '</p>'; | |
| 523 | - echo '</div>'; | |
| 524 | - self::_renderSectionEnd(); | |
| 525 | - self::_renderGroupEnd(); | |
| 526 | - } | |
| 527 | - | |
| 528 | - /** | |
| 529 | 258 | * Renders select item. |
| 530 | 259 | * |
| 531 | 260 | * @since 1.0.0 |
| 532 | 261 | * |
| @@ -552,8 +281,9 @@ | ||
| 552 | 281 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 553 | 282 | echo '<b>', $title, '</b>'; |
| 554 | 283 | echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>'; |
| 555 | 284 | foreach ( $options as $key => $label ) { |
| 285 | + // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 556 | 286 | $extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false ); |
| 557 | 287 | echo '<option value="', $key, '"', $extra, '>'; |
| 558 | 288 | echo $label; |
| 559 | 289 | echo '</option>'; |
| @@ -578,9 +308,9 @@ | ||
| 578 | 308 | protected static function _renderColorPickerItem( $title, $name, $value, $default ) { |
| 579 | 309 | echo '<div class="viz-section-item">'; |
| 580 | 310 | echo '<b>', $title, '</b>'; |
| 581 | 311 | echo '<div>'; |
| 582 | - 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, '">'; | |
| 312 | + 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, '">'; | |
| 583 | 313 | echo '</div>'; |
| 584 | 314 | echo '</div>'; |
| 585 | 315 | } |
| 586 | 316 | |
| @@ -624,10 +354,10 @@ | ||
| 624 | 354 | * @param string $title The title of this group. |
| 625 | 355 | * @param string $html Any additional HTML. |
| 626 | 356 | * @param string $class Any additional classes. |
| 627 | 357 | */ |
| 628 | - public static function _renderGroupStart( $title, $html = '', $class = '' ) { | |
| 629 | - echo '<li class="viz-group ' . $class . '">'; | |
| 358 | + public static function _renderGroupStart( $title, $html = '', $class = '', $id = '' ) { | |
| 359 | + echo '<li id="' . $id . '" class="viz-group ' . $class . '">'; | |
| 630 | 360 | echo '<h3 class="viz-group-title">', $title, '</h3>'; |
| 631 | 361 | echo $html; |
| 632 | 362 | echo '<ul class="viz-group-content">'; |
| 633 | 363 | } |
| @@ -689,11 +419,11 @@ | ||
| 689 | 419 | * @static |
| 690 | 420 | * @access public |
| 691 | 421 | * @param string $description The description text. |
| 692 | 422 | */ |
| 693 | - public static function _renderSectionDescription( $description ) { | |
| 423 | + public static function _renderSectionDescription( $description, $classes = '' ) { | |
| 694 | 424 | echo '<div class="viz-section-item">'; |
| 695 | - echo '<div class="viz-section-description">', $description, '</div>'; | |
| 425 | + echo '<div class="viz-section-description ' . $classes . '">', $description, '</div>'; | |
| 696 | 426 | echo '</div>'; |
| 697 | 427 | } |
| 698 | 428 | |
| 699 | 429 | /** |
| @@ -735,8 +465,9 @@ | ||
| 735 | 465 | protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) { |
| 736 | 466 | echo '<div class="viz-section-item">'; |
| 737 | 467 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 738 | 468 | echo '<b>', $title, '</b>'; |
| 469 | + // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison | |
| 739 | 470 | echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>'; |
| 740 | 471 | echo '<p class="viz-section-description">', $desc, '</p>'; |
| 741 | 472 | echo '</div>'; |
| 742 | 473 | } |
| @@ -765,5 +496,18 @@ | ||
| 765 | 496 | public function getLibrary() { |
| 766 | 497 | return $this->_library; |
| 767 | 498 | } |
| 768 | 499 | |
| 500 | + /** | |
| 501 | + * Loads generic libraries conditionally. | |
| 502 | + */ | |
| 503 | + protected function load_dependent_assets( $libs ) { | |
| 504 | + if ( in_array( 'moment', $libs, true ) && ! wp_script_is( 'moment', 'registered' ) ) { | |
| 505 | + wp_register_script( 'moment' ); | |
| 506 | + } | |
| 507 | + | |
| 508 | + if ( in_array( 'numeral', $libs, true ) && ! wp_script_is( 'numeral', 'registered' ) ) { | |
| 509 | + wp_register_script( 'numeral', VISUALIZER_ABSURL . 'js/lib/numeral.min.js', array(), Visualizer_Plugin::VERSION ); | |
| 510 | + } | |
| 511 | + | |
| 512 | + } | |
| 769 | 513 | } |
