| @@ -28,8 +28,15 @@ | ||
| 28 | 28 | */ |
| 29 | 29 | class Visualizer_Render_Library extends Visualizer_Render { |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | + * Cached result of _isListView() to avoid repeat DB reads per request. | |
| 33 | + * | |
| 34 | + * @var bool|null | |
| 35 | + */ | |
| 36 | + private $_list_view_cached = null; | |
| 37 | + | |
| 38 | + /** | |
| 32 | 39 | * Renders library page. |
| 33 | 40 | * |
| 34 | 41 | * @since 1.0.0 |
| 35 | 42 | * |
| @@ -39,15 +46,23 @@ | ||
| 39 | 46 | echo '<div class="wrap">'; |
| 40 | 47 | echo '<div id="visualizer-icon" class="icon32"><br></div>'; |
| 41 | 48 | echo '<h2>'; |
| 42 | 49 | esc_html_e( 'Visualizer Library', 'visualizer' ); |
| 43 | - echo ' <a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New', 'visualizer' ), '</a>'; | |
| 50 | + echo ' <div class="viz-add-new-group">'; | |
| 51 | + echo '<a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New Chart', 'visualizer' ), '</a>'; | |
| 52 | + echo '<button type="button" class="viz-add-new-toggle" aria-haspopup="true" aria-expanded="false"><span class="dashicons dashicons-arrow-down-alt2"></span></button>'; | |
| 53 | + echo '<div class="viz-add-new-menu" role="menu" aria-hidden="true">'; | |
| 54 | + echo '<button type="button" class="viz-add-new-item" data-viz-builder="ai">', esc_html__( 'AI Chart Builder', 'visualizer' ), '</button>'; | |
| 55 | + echo '<button type="button" class="viz-add-new-item" data-viz-builder="classic">', esc_html__( 'Classic Builder', 'visualizer' ), '</button>'; | |
| 56 | + echo '</div>'; | |
| 44 | 57 | if ( Visualizer_Module::is_pro() ) { |
| 45 | - echo ' <a href="' . admin_url( 'options-general.php' ) . '" class="page-title-action">', esc_html__( 'License Settings', 'visualizer' ), '</a>'; | |
| 58 | + echo ' <a href="' . admin_url( 'options-general.php#visualizer_pro_license' ) . '" class="page-title-action">', esc_html__( 'License Settings', 'visualizer' ), '</a>'; | |
| 46 | 59 | } |
| 60 | + echo '</div>'; | |
| 47 | 61 | echo '</h2>'; |
| 48 | 62 | $this->_renderMessages(); |
| 49 | 63 | $this->_renderLibrary(); |
| 64 | + echo '<div id="viz-chart-builder-root"></div>'; | |
| 50 | 65 | echo '</div>'; |
| 51 | 66 | } |
| 52 | 67 | |
| 53 | 68 | /** |
| @@ -62,9 +77,9 @@ | ||
| 62 | 77 | echo '<div class="updated error">'; |
| 63 | 78 | echo '<p>'; |
| 64 | 79 | printf( |
| 65 | 80 | // translators: %s - the name of the option. |
| 66 | - esc_html__( '%s option is disabled in your php.ini config. Please, enable it by change its value to 1. This option increases the speed of remote CSV uploading.', 'visualizer' ), | |
| 81 | + esc_html__( '%s option is disabled in your php.ini config. Please enable it by changing its value to 1. This option increases the speed of remote CSV uploading.', 'visualizer' ), | |
| 67 | 82 | '<b>allow_url_fopen</b>' |
| 68 | 83 | ); |
| 69 | 84 | echo '</p>'; |
| 70 | 85 | echo '</div>'; |
| @@ -77,8 +92,10 @@ | ||
| 77 | 92 | private function getDisplayForm() { |
| 78 | 93 | echo '<div class="visualizer-library-form"> |
| 79 | 94 | <form action="' . admin_url( 'admin.php' ) . '"> |
| 80 | 95 | <input type="hidden" name="page" value="' . Visualizer_Plugin::NAME . '"/> |
| 96 | + <input type="hidden" name="view" value="' . esc_attr( $this->_isListView() ? 'list' : 'grid' ) . '"/> | |
| 97 | + <span class="viz-view-toggle-group">' . $this->_getViewToggleHTML() . '</span> | |
| 81 | 98 | <select class="viz-filter" name="type"> |
| 82 | 99 | '; |
| 83 | 100 | |
| 84 | 101 | echo '<option value="" selected>' . __( 'All types', 'visualizer' ) . '</option>'; |
| @@ -151,9 +168,9 @@ | ||
| 151 | 168 | unset( $sources['query_wp'] ); |
| 152 | 169 | } |
| 153 | 170 | $sources = array_filter( $sources ); |
| 154 | 171 | uasort( |
| 155 | - $sources, function( $a, $b ) { | |
| 172 | + $sources, function ( $a, $b ) { | |
| 156 | 173 | if ( $a === $b ) { |
| 157 | 174 | return 0; |
| 158 | 175 | } |
| 159 | 176 | return ( $a < $b ) ? -1 : 1; |
| @@ -222,10 +239,10 @@ | ||
| 222 | 239 | $license = get_option( 'visualizer_pro_license_data', 'free' ); |
| 223 | 240 | $license_key = ''; |
| 224 | 241 | $download_id = ''; |
| 225 | 242 | if ( ! empty( $license ) && is_object( $license ) ) { |
| 226 | - $license_key = $license->key; | |
| 227 | - $download_id = $license->download_id; | |
| 243 | + $license_key = isset( $license->key ) ? $license->key : ''; | |
| 244 | + $download_id = isset( $license->download_id ) ? $license->download_id : ''; | |
| 228 | 245 | } |
| 229 | 246 | $admin_license_url = admin_url( 'options-general.php#visualizer_pro_license' ); |
| 230 | 247 | $renew_license_url = tsdk_utmify( Visualizer_Plugin::STORE_URL . '?edd_license_key=' . $license_key . '&download_id=' . $download_id, 'visualizer_license_block' ); |
| 231 | 248 | echo ' |
| @@ -256,9 +273,8 @@ | ||
| 256 | 273 | overlay.style.display = "none"; |
| 257 | 274 | popup.style.display = "none"; |
| 258 | 275 | } |
| 259 | 276 | </script>'; |
| 260 | - | |
| 261 | 277 | } |
| 262 | 278 | /** |
| 263 | 279 | * Renders library content. |
| 264 | 280 | * |
| @@ -282,40 +298,68 @@ | ||
| 282 | 298 | echo '</div>'; |
| 283 | 299 | echo '<div id="visualizer-content-wrapper">'; |
| 284 | 300 | echo '<div id="tsdk_banner" class="visualizer-banner"></div>'; |
| 285 | 301 | if ( ! empty( $this->charts ) ) { |
| 286 | - echo '<div id="visualizer-library" class="visualizer-clearfix">'; | |
| 287 | - $count = 0; | |
| 288 | - foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 289 | - // show the sidebar after the first 3 charts. | |
| 290 | - $count++; | |
| 291 | - $enable_controls = false; | |
| 292 | - $settings = isset( $chart['settings'] ) ? $chart['settings'] : array(); | |
| 293 | - if ( ! empty( $settings['controls']['controlType'] ) ) { | |
| 294 | - $column_index = $settings['controls']['filterColumnIndex']; | |
| 295 | - $column_label = $settings['controls']['filterColumnLabel']; | |
| 296 | - if ( 'false' !== $column_index || 'false' !== $column_label ) { | |
| 297 | - $enable_controls = true; | |
| 302 | + if ( $this->_isListView() ) { | |
| 303 | + echo '<div id="visualizer-library" class="visualizer-clearfix view-list">'; | |
| 304 | + $this->_renderSidebar(); | |
| 305 | + echo '<table class="wp-list-table widefat striped viz-charts-table">'; | |
| 306 | + echo '<thead><tr>'; | |
| 307 | + echo '<th class="col-id">' . esc_html__( 'ID', 'visualizer' ) . '</th>'; | |
| 308 | + echo '<th class="col-title">' . esc_html__( 'Title', 'visualizer' ) . '</th>'; | |
| 309 | + echo '<th class="col-type">' . esc_html__( 'Type', 'visualizer' ) . '</th>'; | |
| 310 | + echo '<th class="col-shortcode">' . esc_html__( 'Shortcode', 'visualizer' ) . '</th>'; | |
| 311 | + echo '<th class="col-actions">' . esc_html__( 'Actions', 'visualizer' ) . '</th>'; | |
| 312 | + echo '</tr></thead><tbody>'; | |
| 313 | + foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 314 | + $enable_controls = false; | |
| 315 | + $settings = isset( $chart['settings'] ) ? $chart['settings'] : array(); | |
| 316 | + if ( ! empty( $settings['controls']['controlType'] ) ) { | |
| 317 | + $column_index = $settings['controls']['filterColumnIndex']; | |
| 318 | + $column_label = $settings['controls']['filterColumnLabel']; | |
| 319 | + if ( 'false' !== $column_index || 'false' !== $column_label ) { | |
| 320 | + $enable_controls = true; | |
| 321 | + } | |
| 298 | 322 | } |
| 323 | + $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls ); | |
| 299 | 324 | } |
| 300 | - if ( 3 === $count ) { | |
| 301 | - $this->_renderSidebar(); | |
| 325 | + echo '</tbody></table>'; | |
| 326 | + echo '</div>'; | |
| 327 | + } else { | |
| 328 | + echo '<div id="visualizer-library" class="visualizer-clearfix view-grid">'; | |
| 329 | + $this->_renderSidebar(); | |
| 330 | + foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 331 | + $enable_controls = false; | |
| 332 | + $settings = isset( $chart['settings'] ) ? $chart['settings'] : array(); | |
| 333 | + if ( ! empty( $settings['controls']['controlType'] ) ) { | |
| 334 | + $column_index = $settings['controls']['filterColumnIndex']; | |
| 335 | + $column_label = $settings['controls']['filterColumnLabel']; | |
| 336 | + if ( 'false' !== $column_index || 'false' !== $column_label ) { | |
| 337 | + $enable_controls = true; | |
| 338 | + } | |
| 339 | + } | |
| 302 | 340 | $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls ); |
| 303 | - } else { | |
| 304 | - $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls ); | |
| 305 | 341 | } |
| 342 | + echo '</div>'; | |
| 306 | 343 | } |
| 307 | - // show the sidebar if there are less than 3 charts. | |
| 308 | - if ( $count < 3 ) { | |
| 309 | - $this->_renderSidebar(); | |
| 310 | - } | |
| 311 | - echo '</div>'; | |
| 312 | 344 | } else { |
| 313 | - echo '<div id="visualizer-library" class="visualizer-clearfix">'; | |
| 345 | + echo '<div id="visualizer-library" class="visualizer-clearfix view-grid">'; | |
| 346 | + $this->_renderSidebar(); | |
| 314 | 347 | echo '<div class="items"><div class="visualizer-chart">'; |
| 315 | 348 | echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">'; |
| 316 | - echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '<p><h2><a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New', 'visualizer' ), '</a></h2></p></div>'; | |
| 349 | + echo '<div class="visualizer-notfound">'; | |
| 350 | + echo esc_html__( 'No charts found. Click \'Add New Chart\' to create one.', 'visualizer' ); | |
| 351 | + echo '<p><h2>'; | |
| 352 | + echo '<div class="viz-add-new-group">'; | |
| 353 | + echo '<a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New Chart', 'visualizer' ), '</a>'; | |
| 354 | + echo '<button type="button" class="viz-add-new-toggle" aria-haspopup="true" aria-expanded="false"><span class="dashicons dashicons-arrow-down-alt2"></span></button>'; | |
| 355 | + echo '<div class="viz-add-new-menu" role="menu" aria-hidden="true">'; | |
| 356 | + echo '<button type="button" class="viz-add-new-item" data-viz-builder="ai">', esc_html__( 'AI Chart Builder', 'visualizer' ), '</button>'; | |
| 357 | + echo '<button type="button" class="viz-add-new-item" data-viz-builder="classic">', esc_html__( 'Classic Builder', 'visualizer' ), '</button>'; | |
| 317 | 358 | echo '</div>'; |
| 359 | + echo '</div>'; | |
| 360 | + echo '</h2></p></div>'; | |
| 361 | + echo '</div>'; | |
| 318 | 362 | echo '<div class="visualizer-chart-footer visualizer-clearfix">'; |
| 319 | 363 | echo '<div class="visualizer-action-group visualizer-nochart">'; |
| 320 | 364 | echo '<span class="visualizer-chart-action visualizer-nochart-delete"><span class="dashicons dashicons-trash"></span></span>'; |
| 321 | 365 | echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"><span class="dashicons dashicons-shortcode"></span></span>'; |
| @@ -321,13 +365,12 @@ | ||
| 321 | 365 | echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"><span class="dashicons dashicons-shortcode"></span></span>'; |
| 322 | 366 | echo '<span class="visualizer-chart-action visualizer-nochart-image"><span class="dashicons dashicons-format-image"></span></span>'; |
| 323 | 367 | echo '<span class="visualizer-chart-action visualizer-nochart-export"><span class="dashicons dashicons-download"></span></span>'; |
| 324 | 368 | echo '<span class="visualizer-chart-action visualizer-nochart-clone"><span class="dashicons dashicons-admin-page"></span></span>'; |
| 325 | - echo '<span class="visualizer-chart-action visualizer-nochart-edit"><span class="dashicons dashicons-admin-generic"></span></span>'; | |
| 369 | + echo '<span class="visualizer-chart-action visualizer-nochart-edit"><span class="dashicons dashicons-edit"></span></span>'; | |
| 326 | 370 | echo '</div>'; |
| 327 | 371 | echo '</div>'; |
| 328 | 372 | echo '</div></div>'; |
| 329 | - $this->_renderSidebar(); | |
| 330 | 373 | echo '</div>'; |
| 331 | 374 | } |
| 332 | 375 | echo '</div>'; |
| 333 | 376 | if ( is_array( $this->pagination ) ) { |
| @@ -349,10 +392,11 @@ | ||
| 349 | 392 | * @param string $placeholder_id The placeholder's id for the chart. |
| 350 | 393 | * @param int $chart_id The id of the chart. |
| 351 | 394 | */ |
| 352 | 395 | private function _renderChartBox( $placeholder_id, $chart_id, $with_filter = false ) { |
| 353 | - $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS ); | |
| 354 | - $title = '#' . $chart_id; | |
| 396 | + $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS ); | |
| 397 | + $chart_library = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_LIBRARY, true ); | |
| 398 | + $title = '#' . $chart_id; | |
| 355 | 399 | if ( ! empty( $settings[0]['title'] ) ) { |
| 356 | 400 | $title = $settings[0]['title']; |
| 357 | 401 | } |
| 358 | 402 | // for ChartJS, title is an array. |
| @@ -398,10 +442,14 @@ | ||
| 398 | 442 | admin_url( 'admin-ajax.php' ) |
| 399 | 443 | ) |
| 400 | 444 | ); |
| 401 | 445 | $chart_type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ); |
| 446 | + $chart_type_label = $chart_type; | |
| 447 | + if ( empty( $chart_type_label ) && 'd3' === strtolower( (string) $chart_library ) ) { | |
| 448 | + $chart_type_label = __( 'AI', 'visualizer' ); | |
| 449 | + } | |
| 402 | 450 | |
| 403 | - $types = ['area', 'geo', 'column', 'bubble', 'scatter', 'gauge', 'candlestick', 'timeline', 'combo', 'polarArea', 'radar' ]; | |
| 451 | + $types = array( 'area', 'geo', 'column', 'bubble', 'scatter', 'gauge', 'candlestick', 'timeline', 'combo', 'polarArea', 'radar' ); | |
| 404 | 452 | |
| 405 | 453 | $pro_class = ''; |
| 406 | 454 | |
| 407 | 455 | if ( ! empty( $chart_type ) && in_array( $chart_type, $types, true ) ) { |
| @@ -413,9 +461,30 @@ | ||
| 413 | 461 | $chart_status['icon'] = 'error dashicons-dismiss'; |
| 414 | 462 | $chart_status['title'] = __( 'Click to view the error', 'visualizer' ); |
| 415 | 463 | } |
| 416 | 464 | $shortcode = sprintf( '[visualizer id="%s" class=""]', $chart_id ); |
| 417 | - echo '<div class="items"><div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>'; | |
| 465 | + | |
| 466 | + if ( $this->_isListView() ) { | |
| 467 | + // ── List view: table row ── | |
| 468 | + echo '<tr class="viz-list-row">'; | |
| 469 | + echo '<td class="col-id">#' . esc_html( (string) $chart_id ) . '</td>'; | |
| 470 | + echo '<td class="col-title">' . esc_html( $title ) . '</td>'; | |
| 471 | + echo '<td class="col-type">' . ( ! empty( $chart_type_label ) ? '<span class="viz-chart-type-badge">' . esc_html( $chart_type_label ) . '</span>' : '—' ) . '</td>'; | |
| 472 | + echo '<td class="col-shortcode"><code class="viz-shortcode-display">' . esc_html( $shortcode ) . '</code></td>'; | |
| 473 | + echo '<td class="col-actions"><div class="visualizer-action-group">'; | |
| 474 | + echo '<a class="visualizer-chart-action visualizer-chart-delete" href="' . $delete_url . '" onclick="return showNotice.warn();"><span class="dashicons dashicons-trash"></span><span class="tooltip-text">' . esc_html__( 'Delete', 'visualizer' ) . '</span></a>'; | |
| 475 | + echo '<a class="visualizer-chart-action visualizer-chart-shortcode ' . esc_attr( $pro_class ) . '" href="javascript:;" data-clipboard-text="' . esc_attr( $shortcode ) . '"><span class="dashicons dashicons-shortcode ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Copy Shortcode', 'visualizer' ) . '</span></a>'; | |
| 476 | + echo '<a class="visualizer-chart-action visualizer-chart-export ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="' . $export_link . '"><span class="dashicons dashicons-download ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Export CSV', 'visualizer' ) . '</span></a>'; | |
| 477 | + echo '<a class="visualizer-chart-action visualizer-chart-clone ' . esc_attr( $pro_class ) . '" href="' . $clone_url . '"><span class="dashicons dashicons-admin-page ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Duplicate', 'visualizer' ) . '</span></a>'; | |
| 478 | + echo '<a class="visualizer-chart-action visualizer-chart-edit button button-secondary ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="' . esc_attr( (string) $chart_id ) . '" data-library="' . esc_attr( $chart_library ) . '"><span class="dashicons dashicons-edit ' . esc_attr( $pro_class ) . '"></span><span class="visualizer-action-label">' . esc_html__( 'Edit', 'visualizer' ) . '</span><span class="tooltip-text">' . esc_html__( 'Edit', 'visualizer' ) . '</span></a>'; | |
| 479 | + echo '</div></td>'; | |
| 480 | + echo '</tr>'; | |
| 481 | + return; | |
| 482 | + } | |
| 483 | + | |
| 484 | + // ── Grid view: card ── | |
| 485 | + $type_badge = ! empty( $chart_type ) ? '<span class="viz-chart-type-badge">' . esc_html( $chart_type ) . '</span>' : ''; | |
| 486 | + echo '<div class="items"><div class="visualizer-chart"><div class="visualizer-chart-title"><span>' . esc_html( $title ) . '</span>' . $type_badge . '</div>'; | |
| 418 | 487 | if ( Visualizer_Module::is_pro() && $with_filter ) { |
| 419 | 488 | echo '<div id="chart_wrapper_' . $placeholder_id . '">'; |
| 420 | 489 | echo '<div id="control_wrapper_' . $placeholder_id . '" class="vz-library-chart-filter"></div>'; |
| 421 | 490 | } |
| @@ -426,16 +495,16 @@ | ||
| 426 | 495 | echo '</div>'; |
| 427 | 496 | } |
| 428 | 497 | echo '<div class="visualizer-chart-footer visualizer-clearfix">'; |
| 429 | 498 | echo '<div class="visualizer-action-group">'; |
| 430 | - echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" onclick="return showNotice.warn();"><span class="dashicons dashicons-trash"></span><span class="tooltip-text">' . esc_attr__( 'Delete', 'visualizer' ) . '</span></a>'; | |
| 431 | - echo '<a class="visualizer-chart-action visualizer-chart-shortcode ' . esc_attr( $pro_class ) . '" href="javascript:;" data-clipboard-text="', esc_attr( $shortcode ), '"><span class="dashicons dashicons-shortcode ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_attr__( 'Copy Shortcode', 'visualizer' ) . '</span></a>'; | |
| 499 | + echo '<a class="visualizer-chart-action visualizer-chart-edit button button-secondary ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="', $chart_id, '" data-library="' . esc_attr( $chart_library ) . '"><span class="dashicons dashicons-edit ' . esc_attr( $pro_class ) . '"></span><span class="visualizer-action-label">' . esc_html__( 'Edit', 'visualizer' ) . '</span><span class="tooltip-text">' . esc_html__( 'Edit', 'visualizer' ) . '</span></a>'; | |
| 500 | + echo '<a class="visualizer-chart-action visualizer-chart-shortcode ' . esc_attr( $pro_class ) . '" href="javascript:;" data-clipboard-text="', esc_attr( $shortcode ), '"><span class="dashicons dashicons-shortcode ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Copy Shortcode', 'visualizer' ) . '</span></a>'; | |
| 432 | 501 | if ( $this->can_chart_have_action( 'image', $chart_id ) ) { |
| 433 | - echo '<a class="visualizer-chart-action visualizer-chart-image ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"><span class="dashicons dashicons-format-image ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_attr__( 'Download PNG', 'visualizer' ) . '</span></a>'; | |
| 502 | + echo '<a class="visualizer-chart-action visualizer-chart-image ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"><span class="dashicons dashicons-format-image ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Download PNG', 'visualizer' ) . '</span></a>'; | |
| 434 | 503 | } |
| 435 | - echo '<a class="visualizer-chart-action visualizer-chart-export ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="', $export_link, '"><span class="dashicons dashicons-download ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_attr__( 'Export CSV', 'visualizer' ) . '</span></a>'; | |
| 436 | - echo '<a class="visualizer-chart-action visualizer-chart-clone ' . esc_attr( $pro_class ) . '" href="', $clone_url, '"><span class="dashicons dashicons-admin-page ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_attr__( 'Duplicate', 'visualizer' ) . '</span></a>'; | |
| 437 | - echo '<a class="visualizer-chart-action visualizer-chart-edit ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="', $chart_id, '"><span class="dashicons dashicons-admin-generic ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_attr__( 'Edit', 'visualizer' ) . '</span></a>'; | |
| 504 | + echo '<a class="visualizer-chart-action visualizer-chart-export ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="', $export_link, '"><span class="dashicons dashicons-download ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Export CSV', 'visualizer' ) . '</span></a>'; | |
| 505 | + echo '<a class="visualizer-chart-action visualizer-chart-clone ' . esc_attr( $pro_class ) . '" href="', $clone_url, '"><span class="dashicons dashicons-admin-page ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Duplicate', 'visualizer' ) . '</span></a>'; | |
| 506 | + echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" onclick="return showNotice.warn();"><span class="dashicons dashicons-trash"></span><span class="tooltip-text">' . esc_html__( 'Delete', 'visualizer' ) . '</span></a>'; | |
| 438 | 507 | echo '</div>'; |
| 439 | 508 | do_action( 'visualizer_chart_languages', $chart_id ); |
| 440 | 509 | echo '<hr><div class="visualizer-chart-status"><span title="' . __( 'Chart ID', 'visualizer' ) . '">(' . $chart_id . '):</span> <span class="visualizer-date" title="' . __( 'Last Updated', 'visualizer' ) . '">' . $chart_status['date'] . '</span><span class="visualizer-error"><i class="dashicons ' . $chart_status['icon'] . '" data-viz-error="' . esc_attr( str_replace( '"', "'", $chart_status['error'] ) ) . '" title="' . esc_attr( $chart_status['title'] ) . '"></i></span></div>'; |
| 441 | 510 | echo '</div>'; |
| @@ -442,40 +511,64 @@ | ||
| 442 | 511 | echo '</div></div>'; |
| 443 | 512 | } |
| 444 | 513 | |
| 445 | 514 | /** |
| 515 | + * Returns true when the library should render in list (no-preview) mode. | |
| 516 | + * | |
| 517 | + * Priority: ?view= URL param (saves to user meta) → saved user meta → grid default. | |
| 518 | + * | |
| 519 | + * No nonce needed: this is a bookmarkable UI preference URL. A nonce would expire | |
| 520 | + * and break saved/shared links for zero real security gain — the value is allowlisted | |
| 521 | + * to 'list'|'grid' before any write happens. | |
| 522 | + */ | |
| 523 | + private function _isListView(): bool { | |
| 524 | + if ( null !== $this->_list_view_cached ) { | |
| 525 | + return $this->_list_view_cached; | |
| 526 | + } | |
| 527 | + if ( isset( $_GET['view'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 528 | + $view = sanitize_text_field( wp_unslash( $_GET['view'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 529 | + if ( in_array( $view, array( 'list', 'grid' ), true ) ) { | |
| 530 | + update_user_meta( get_current_user_id(), 'visualizer_library_view', $view ); | |
| 531 | + } | |
| 532 | + $this->_list_view_cached = ( 'list' === $view ); | |
| 533 | + } else { | |
| 534 | + $saved = get_user_meta( get_current_user_id(), 'visualizer_library_view', true ); | |
| 535 | + $this->_list_view_cached = ( 'list' === $saved ); | |
| 536 | + } | |
| 537 | + return $this->_list_view_cached; | |
| 538 | + } | |
| 539 | + | |
| 540 | + /** | |
| 541 | + * Returns the HTML for the grid/list view toggle links. | |
| 542 | + */ | |
| 543 | + private function _getViewToggleHTML(): string { | |
| 544 | + $is_list = $this->_isListView(); | |
| 545 | + $grid_url = esc_url( add_query_arg( 'view', 'grid' ) ); | |
| 546 | + $list_url = esc_url( add_query_arg( 'view', 'list' ) ); | |
| 547 | + return '<a href="' . $grid_url . '" class="viz-view-toggle' . ( ! $is_list ? ' active' : '' ) . '" title="' . esc_attr__( 'Grid View', 'visualizer' ) . '"><span class="dashicons dashicons-screenoptions"></span></a>' | |
| 548 | + . '<a href="' . $list_url . '" class="viz-view-toggle' . ( $is_list ? ' active' : '' ) . '" title="' . esc_attr__( 'List View', 'visualizer' ) . '"><span class="dashicons dashicons-list-view"></span></a>'; | |
| 549 | + } | |
| 550 | + | |
| 551 | + /** | |
| 446 | 552 | * Render 2-col sidebar |
| 447 | 553 | */ |
| 448 | 554 | private function _renderSidebar() { |
| 449 | 555 | if ( ! Visualizer_Module::is_pro() ) { |
| 450 | - echo '<div class="items">'; | |
| 451 | - echo '<div class="viz-pro">'; | |
| 452 | - echo '<div id="visualizer-sidebar" class="one-columns">'; | |
| 453 | - echo '<div class="visualizer-sidebar-box">'; | |
| 454 | - echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>'; | |
| 455 | - if ( Visualizer_Module_Admin::proFeaturesLocked() ) { | |
| 456 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' ); | |
| 457 | - } else { | |
| 458 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>'; | |
| 459 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Synchronize Data Periodically', 'visualizer' ) . '</li>'; | |
| 460 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>'; | |
| 461 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>'; | |
| 462 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>'; | |
| 463 | - } | |
| 464 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>'; | |
| 465 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Import from other charts', 'visualizer' ) . '</li>'; | |
| 466 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>'; | |
| 467 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>'; | |
| 468 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>'; | |
| 469 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>'; | |
| 470 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'WPML support for translating charts', 'visualizer' ) . '</li>'; | |
| 471 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Integration with Woocommerce Data endpoints', 'visualizer' ) . '</li>'; | |
| 472 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>'; | |
| 473 | - echo '<p class="vz-sidebar-box-action"><a href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarMenuUpgrade', 'index' ) . '#pro-features" target="_blank" class="button button-secondary">' . __( 'View more features', 'visualizer' ) . '</a><a href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarMenuUpgrade', 'index' ) . '#pricing" target="_blank" class="button button-primary">' . __( 'Upgrade Now', 'visualizer' ) . '</a></p>'; | |
| 556 | + $upgrade_url = tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarMenuUpgrade', 'index' ); | |
| 557 | + $chart_types = Visualizer_Module_Admin::proFeaturesEnabled() ? __( '6 more chart types', 'visualizer' ) : __( '11 more chart types', 'visualizer' ); | |
| 558 | + echo '<div class="items--upsell">'; | |
| 559 | + echo '<div class="viz-upsell-banner">'; | |
| 560 | + echo '<span class="dashicons dashicons-star-filled viz-upsell-banner__icon"></span>'; | |
| 561 | + echo '<div class="viz-upsell-banner__text">'; | |
| 562 | + echo '<strong>' . esc_html__( 'Unlock the full power of Visualizer PRO!', 'visualizer' ) . '</strong>'; | |
| 563 | + /* translators: %s: number of additional chart types (e.g. "11 more chart types") */ | |
| 564 | + echo '<span>' . sprintf( esc_html__( '%s, periodic data sync, database queries, frontend editor, and more.', 'visualizer' ), esc_html( $chart_types ) ) . '</span>'; | |
| 474 | 565 | echo '</div>'; |
| 566 | + echo '<div class="viz-upsell-banner__actions">'; | |
| 567 | + echo '<a href="' . esc_url( $upgrade_url . '#pro-features' ) . '" target="_blank" class="button button-secondary">' . esc_html__( 'View Features', 'visualizer' ) . '</a>'; | |
| 568 | + echo '<a href="' . esc_url( $upgrade_url . '#pricing' ) . '" target="_blank" class="button button-primary">' . esc_html__( 'Upgrade Now', 'visualizer' ) . '</a>'; | |
| 475 | 569 | echo '</div>'; |
| 476 | 570 | echo '</div>'; |
| 477 | 571 | echo '</div>'; |
| 478 | 572 | } |
| 479 | 573 | } |
| 480 | - | |
| 481 | 574 | } |
