| @@ -28,15 +28,8 @@ | ||
| 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 | - /** | |
| 39 | 32 | * Renders library page. |
| 40 | 33 | * |
| 41 | 34 | * @since 1.0.0 |
| 42 | 35 | * |
| @@ -46,23 +39,15 @@ | ||
| 46 | 39 | echo '<div class="wrap">'; |
| 47 | 40 | echo '<div id="visualizer-icon" class="icon32"><br></div>'; |
| 48 | 41 | echo '<h2>'; |
| 49 | 42 | esc_html_e( 'Visualizer Library', 'visualizer' ); |
| 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>'; | |
| 43 | + echo ' <a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New', 'visualizer' ), '</a>'; | |
| 57 | 44 | if ( Visualizer_Module::is_pro() ) { |
| 58 | - echo ' <a href="' . admin_url( 'options-general.php#visualizer_pro_license' ) . '" class="page-title-action">', esc_html__( 'License Settings', 'visualizer' ), '</a>'; | |
| 45 | + echo ' <a href="' . admin_url( 'options-general.php' ) . '" class="page-title-action">', esc_html__( 'License Settings', 'visualizer' ), '</a>'; | |
| 59 | 46 | } |
| 60 | - echo '</div>'; | |
| 61 | 47 | echo '</h2>'; |
| 62 | 48 | $this->_renderMessages(); |
| 63 | 49 | $this->_renderLibrary(); |
| 64 | - echo '<div id="viz-chart-builder-root"></div>'; | |
| 65 | 50 | echo '</div>'; |
| 66 | 51 | } |
| 67 | 52 | |
| 68 | 53 | /** |
| @@ -75,13 +60,9 @@ | ||
| 75 | 60 | private function _renderMessages() { |
| 76 | 61 | if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) { |
| 77 | 62 | echo '<div class="updated error">'; |
| 78 | 63 | echo '<p>'; |
| 79 | - printf( | |
| 80 | - // translators: %s - the name of the option. | |
| 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' ), | |
| 82 | - '<b>allow_url_fopen</b>' | |
| 83 | - ); | |
| 64 | + printf( 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' ), '<b>allow_url_fopen</b>' ); | |
| 84 | 65 | echo '</p>'; |
| 85 | 66 | echo '</div>'; |
| 86 | 67 | } |
| 87 | 68 | } |
| @@ -92,10 +73,8 @@ | ||
| 92 | 73 | private function getDisplayForm() { |
| 93 | 74 | echo '<div class="visualizer-library-form"> |
| 94 | 75 | <form action="' . admin_url( 'admin.php' ) . '"> |
| 95 | 76 | <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> | |
| 98 | 77 | <select class="viz-filter" name="type"> |
| 99 | 78 | '; |
| 100 | 79 | |
| 101 | 80 | echo '<option value="" selected>' . __( 'All types', 'visualizer' ) . '</option>'; |
| @@ -168,9 +147,9 @@ | ||
| 168 | 147 | unset( $sources['query_wp'] ); |
| 169 | 148 | } |
| 170 | 149 | $sources = array_filter( $sources ); |
| 171 | 150 | uasort( |
| 172 | - $sources, function ( $a, $b ) { | |
| 151 | + $sources, function( $a, $b ) { | |
| 173 | 152 | if ( $a === $b ) { |
| 174 | 153 | return 0; |
| 175 | 154 | } |
| 176 | 155 | return ( $a < $b ) ? -1 : 1; |
| @@ -226,57 +205,10 @@ | ||
| 226 | 205 | <input type="button" id="viz-lib-reset" class="viz-filter button button-secondary" value="' . __( 'Clear Filters', 'visualizer' ) . '"> |
| 227 | 206 | </form> |
| 228 | 207 | </div>'; |
| 229 | 208 | } |
| 209 | + | |
| 230 | 210 | /** |
| 231 | - * Renders pro charts blocker. | |
| 232 | - * | |
| 233 | - * @access private | |
| 234 | - */ | |
| 235 | - private function _renderProPopupBlocker() { | |
| 236 | - if ( Visualizer_Module::is_pro() ) { | |
| 237 | - return; | |
| 238 | - } | |
| 239 | - $license = get_option( 'visualizer_pro_license_data', 'free' ); | |
| 240 | - $license_key = ''; | |
| 241 | - $download_id = ''; | |
| 242 | - if ( ! empty( $license ) && is_object( $license ) ) { | |
| 243 | - $license_key = isset( $license->key ) ? $license->key : ''; | |
| 244 | - $download_id = isset( $license->download_id ) ? $license->download_id : ''; | |
| 245 | - } | |
| 246 | - $admin_license_url = admin_url( 'options-general.php#visualizer_pro_license' ); | |
| 247 | - $renew_license_url = tsdk_utmify( Visualizer_Plugin::STORE_URL . '?edd_license_key=' . $license_key . '&download_id=' . $download_id, 'visualizer_license_block' ); | |
| 248 | - echo ' | |
| 249 | - <div class="vizualizer-renew-notice-overlay" id="overlay-visualizer"></div> | |
| 250 | - <div class="vizualizer-renew-notice-popup"> | |
| 251 | - <h1 class="vizualizer-renew-notice-heading">Alert!</h1> | |
| 252 | - <p class="vizualizer-renew-notice-message">' . esc_html__( 'In order to edit premium charts, benefit from updates and support for Visualizer Premium plugin, please renew your license code or activate it.', 'visualizer' ) . '</p> | |
| 253 | - <div class="vizualizer-renew-notice-buttons-container"> | |
| 254 | - <a href="' . esc_url( $renew_license_url) . '" target="_blank"> | |
| 255 | - <button class="vizualizer-renew-notice-button vizualizer-renew-notice-renew-button"> | |
| 256 | - <span class="dashicons dashicons-cart"></span>' . esc_html__( 'Renew License', 'visualizer' ) . ' | |
| 257 | - </button> | |
| 258 | - </a> | |
| 259 | - <a href="' . esc_url( $admin_license_url ) . '"> | |
| 260 | - <button class="vizualizer-renew-notice-button vizualizer-renew-notice-activate-button"> | |
| 261 | - <span class="dashicons dashicons-unlock"></span> ' . esc_html__( 'Activate License', 'visualizer' ) . ' | |
| 262 | - </button> | |
| 263 | - </a> | |
| 264 | - <button class="vizualizer-renew-notice-button vizualizer-renew-notice-close-icon" aria-label="Close" onclick="closePopup()"> | |
| 265 | - <i class="dashicons dashicons-no"></i> | |
| 266 | - </button> | |
| 267 | - </div> | |
| 268 | - </div> | |
| 269 | - <script> | |
| 270 | - function closePopup() { | |
| 271 | - var overlay = document.getElementById("overlay-visualizer"); | |
| 272 | - var popup = document.querySelector(".vizualizer-renew-notice-popup"); | |
| 273 | - overlay.style.display = "none"; | |
| 274 | - popup.style.display = "none"; | |
| 275 | - } | |
| 276 | - </script>'; | |
| 277 | - } | |
| 278 | - /** | |
| 279 | 211 | * Renders library content. |
| 280 | 212 | * |
| 281 | 213 | * @since 1.0.0 |
| 282 | 214 | * |
| @@ -282,95 +214,53 @@ | ||
| 282 | 214 | * |
| 283 | 215 | * @access private |
| 284 | 216 | */ |
| 285 | 217 | private function _renderLibrary() { |
| 286 | - | |
| 287 | 218 | // Added by Ash/Upwork |
| 288 | - $filterBy = ! empty( $_GET['s'] ) ? sanitize_text_field( wp_unslash( $_GET['s'] ) ) : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 289 | - | |
| 219 | + $filterBy = null; | |
| 220 | + if ( isset( $_GET['s'] ) && strlen( $_GET['s'] ) > 0 ) { | |
| 221 | + $filterBy = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); | |
| 222 | + } | |
| 290 | 223 | // Added by Ash/Upwork |
| 291 | 224 | echo $this->custom_css; |
| 292 | - | |
| 293 | - $this->_renderProPopupBlocker(); | |
| 294 | - | |
| 295 | 225 | echo '<div id="visualizer-types" class="visualizer-clearfix">'; |
| 296 | 226 | echo '<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="list-icon" fill="currentColor"><path d="M8 0C3.58 0 0 3.58 0 8C0 12.42 3.58 16 8 16C12.42 16 16 12.42 16 8C16 3.58 12.42 0 8 0ZM7.385 12.66H6.045L2.805 8.12L4.146 6.87L6.715 9.27L11.856 3.339L13.196 4.279L7.385 12.66Z"/></symbol></svg>'; |
| 297 | 227 | $this->getDisplayForm(); |
| 298 | 228 | echo '</div>'; |
| 299 | 229 | echo '<div id="visualizer-content-wrapper">'; |
| 300 | - echo '<div id="tsdk_banner" class="visualizer-banner"></div>'; | |
| 301 | 230 | if ( ! empty( $this->charts ) ) { |
| 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 | - } | |
| 322 | - } | |
| 323 | - $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls ); | |
| 231 | + echo '<div id="visualizer-library" class="visualizer-clearfix">'; | |
| 232 | + $count = 0; | |
| 233 | + foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 234 | + // show the sidebar after the first 3 charts. | |
| 235 | + $count++; | |
| 236 | + if ( 3 === $count ) { | |
| 237 | + $this->_renderSidebar(); | |
| 238 | + $this->_renderChartBox( $placeholder_id, $chart['id'] ); | |
| 239 | + } else { | |
| 240 | + $this->_renderChartBox( $placeholder_id, $chart['id'] ); | |
| 324 | 241 | } |
| 325 | - echo '</tbody></table>'; | |
| 326 | - echo '</div>'; | |
| 327 | - } else { | |
| 328 | - echo '<div id="visualizer-library" class="visualizer-clearfix view-grid">'; | |
| 242 | + } | |
| 243 | + // show the sidebar if there are less than 3 charts. | |
| 244 | + if ( $count < 3 ) { | |
| 329 | 245 | $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 | - } | |
| 340 | - $this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls ); | |
| 341 | - } | |
| 342 | - echo '</div>'; | |
| 343 | 246 | } |
| 247 | + echo '</div>'; | |
| 344 | 248 | } else { |
| 345 | - echo '<div id="visualizer-library" class="visualizer-clearfix view-grid">'; | |
| 346 | - $this->_renderSidebar(); | |
| 249 | + echo '<div id="visualizer-library" class="visualizer-clearfix">'; | |
| 347 | 250 | echo '<div class="items"><div class="visualizer-chart">'; |
| 348 | 251 | echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">'; |
| 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>'; | |
| 252 | + 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>'; | |
| 358 | 253 | echo '</div>'; |
| 359 | - echo '</div>'; | |
| 360 | - echo '</h2></p></div>'; | |
| 361 | - echo '</div>'; | |
| 362 | 254 | echo '<div class="visualizer-chart-footer visualizer-clearfix">'; |
| 363 | - echo '<div class="visualizer-action-group visualizer-nochart">'; | |
| 364 | - echo '<span class="visualizer-chart-action visualizer-nochart-delete"><span class="dashicons dashicons-trash"></span></span>'; | |
| 365 | - echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"><span class="dashicons dashicons-shortcode"></span></span>'; | |
| 366 | - echo '<span class="visualizer-chart-action visualizer-nochart-image"><span class="dashicons dashicons-format-image"></span></span>'; | |
| 367 | - echo '<span class="visualizer-chart-action visualizer-nochart-export"><span class="dashicons dashicons-download"></span></span>'; | |
| 368 | - echo '<span class="visualizer-chart-action visualizer-nochart-clone"><span class="dashicons dashicons-admin-page"></span></span>'; | |
| 369 | - echo '<span class="visualizer-chart-action visualizer-nochart-edit"><span class="dashicons dashicons-edit"></span></span>'; | |
| 255 | + echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>'; | |
| 256 | + echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>'; | |
| 257 | + echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>'; | |
| 258 | + echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>'; | |
| 259 | + echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"></span>'; | |
| 370 | 260 | echo '</div>'; |
| 371 | - echo '</div>'; | |
| 372 | 261 | echo '</div></div>'; |
| 262 | + $this->_renderSidebar(); | |
| 373 | 263 | echo '</div>'; |
| 374 | 264 | } |
| 375 | 265 | echo '</div>'; |
| 376 | 266 | if ( is_array( $this->pagination ) ) { |
| @@ -391,12 +281,11 @@ | ||
| 391 | 281 | * |
| 392 | 282 | * @param string $placeholder_id The placeholder's id for the chart. |
| 393 | 283 | * @param int $chart_id The id of the chart. |
| 394 | 284 | */ |
| 395 | - private function _renderChartBox( $placeholder_id, $chart_id, $with_filter = false ) { | |
| 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; | |
| 285 | + private function _renderChartBox( $placeholder_id, $chart_id ) { | |
| 286 | + $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS ); | |
| 287 | + $title = '#' . $chart_id; | |
| 399 | 288 | if ( ! empty( $settings[0]['title'] ) ) { |
| 400 | 289 | $title = $settings[0]['title']; |
| 401 | 290 | } |
| 402 | 291 | // for ChartJS, title is an array. |
| @@ -402,11 +291,8 @@ | ||
| 402 | 291 | // for ChartJS, title is an array. |
| 403 | 292 | if ( is_array( $title ) && isset( $title['text'] ) ) { |
| 404 | 293 | $title = $title['text']; |
| 405 | 294 | } |
| 406 | - if ( ! empty( $settings[0]['backend-title'] ) ) { | |
| 407 | - $title = $settings[0]['backend-title']; | |
| 408 | - } | |
| 409 | 295 | if ( empty( $title ) ) { |
| 410 | 296 | $title = '#' . $chart_id; |
| 411 | 297 | } |
| 412 | 298 | |
| @@ -441,72 +327,29 @@ | ||
| 441 | 327 | ), |
| 442 | 328 | admin_url( 'admin-ajax.php' ) |
| 443 | 329 | ) |
| 444 | 330 | ); |
| 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 | - } | |
| 450 | 331 | |
| 451 | - $types = array( 'area', 'geo', 'column', 'bubble', 'scatter', 'gauge', 'candlestick', 'timeline', 'combo', 'polarArea', 'radar' ); | |
| 452 | - | |
| 453 | - $pro_class = ''; | |
| 454 | - | |
| 455 | - if ( ! empty( $chart_type ) && in_array( $chart_type, $types, true ) ) { | |
| 456 | - $pro_class = 'viz-is-pro-chart'; | |
| 457 | - } | |
| 458 | - | |
| 459 | 332 | $chart_status = array( 'date' => get_the_modified_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $chart_id ), 'error' => get_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR, true ), 'icon' => 'dashicons-yes-alt', 'title' => 'A-OK!' ); |
| 460 | 333 | if ( ! empty( $chart_status['error'] ) ) { |
| 461 | 334 | $chart_status['icon'] = 'error dashicons-dismiss'; |
| 462 | 335 | $chart_status['title'] = __( 'Click to view the error', 'visualizer' ); |
| 463 | 336 | } |
| 464 | - $shortcode = sprintf( '[visualizer id="%s" class=""]', $chart_id ); | |
| 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>'; | |
| 487 | - if ( Visualizer_Module::is_pro() && $with_filter ) { | |
| 488 | - echo '<div id="chart_wrapper_' . $placeholder_id . '">'; | |
| 489 | - echo '<div id="control_wrapper_' . $placeholder_id . '" class="vz-library-chart-filter"></div>'; | |
| 490 | - } | |
| 337 | + $shortcode = sprintf( '[visualizer id="%s" lazy="no" class=""]', $chart_id ); | |
| 338 | + echo '<div class="items"><div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>'; | |
| 491 | 339 | echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">'; |
| 492 | 340 | echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">'; |
| 493 | 341 | echo '</div>'; |
| 494 | - if ( Visualizer_Module::is_pro() && $with_filter ) { | |
| 495 | - echo '</div>'; | |
| 496 | - } | |
| 497 | 342 | echo '<div class="visualizer-chart-footer visualizer-clearfix">'; |
| 498 | - echo '<div class="visualizer-action-group">'; | |
| 499 | - 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>'; | |
| 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>'; | |
| 343 | + echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', 'visualizer' ), '" onclick="return showNotice.warn();"></a>'; | |
| 344 | + echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', 'visualizer' ), '"></a>'; | |
| 345 | + echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', 'visualizer' ), '" data-chart="', $chart_id, '"></a>'; | |
| 346 | + echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', 'visualizer' ), '" data-chart="', $export_link, '"></a>'; | |
| 501 | 347 | if ( $this->can_chart_have_action( 'image', $chart_id ) ) { |
| 502 | - echo '<a class="visualizer-chart-action visualizer-chart-image ' . esc_attr( $pro_class ) . '" href="javascript:;" data-chart="visualizer-', esc_attr( (string) $chart_id ), '" data-chart-title="', esc_attr( $title ), '"><span class="dashicons dashicons-format-image ' . esc_attr( $pro_class ) . '"></span><span class="tooltip-text">' . esc_html__( 'Download PNG', 'visualizer' ) . '</span></a>'; | |
| 348 | + echo '<a class="visualizer-chart-action visualizer-chart-image" href="javascript:;" title="', esc_attr__( 'Download as image', 'visualizer' ), '" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"></a>'; | |
| 503 | 349 | } |
| 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>'; | |
| 507 | - echo '</div>'; | |
| 508 | - do_action( 'visualizer_chart_languages', $chart_id ); | |
| 350 | + echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" title="', esc_attr__( 'Click to copy shortcode', 'visualizer' ), '" data-clipboard-text="', esc_attr( $shortcode ), '"></a>'; | |
| 351 | + echo '<span> </span>'; | |
| 509 | 352 | 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>'; |
| 510 | 353 | echo '</div>'; |
| 511 | 354 | echo '</div></div>'; |
| 512 | 355 | } |
| @@ -511,64 +354,38 @@ | ||
| 511 | 354 | echo '</div></div>'; |
| 512 | 355 | } |
| 513 | 356 | |
| 514 | 357 | /** |
| 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 | - /** | |
| 552 | 358 | * Render 2-col sidebar |
| 553 | 359 | */ |
| 554 | 360 | private function _renderSidebar() { |
| 555 | 361 | if ( ! Visualizer_Module::is_pro() ) { |
| 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>'; | |
| 362 | + echo '<div class="items">'; | |
| 363 | + echo '<div class="viz-pro">'; | |
| 364 | + echo '<div id="visualizer-sidebar" class="one-columns">'; | |
| 365 | + echo '<div class="visualizer-sidebar-box">'; | |
| 366 | + echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>'; | |
| 367 | + if ( Visualizer_Module_Admin::proFeaturesLocked() ) { | |
| 368 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' ); | |
| 369 | + } else { | |
| 370 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>'; | |
| 371 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Manual Data Editor', 'visualizer' ) . '</li>'; | |
| 372 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>'; | |
| 373 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>'; | |
| 374 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>'; | |
| 375 | + } | |
| 376 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>'; | |
| 377 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Import from other charts', 'visualizer' ) . '</li>'; | |
| 378 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>'; | |
| 379 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>'; | |
| 380 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>'; | |
| 381 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>'; | |
| 382 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>'; | |
| 383 | + echo '<p><a href="' . str_replace( '#pricing', '#features', Visualizer_Plugin::PRO_TEASER_URL ) . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>'; | |
| 565 | 384 | 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>'; | |
| 569 | 385 | echo '</div>'; |
| 570 | 386 | echo '</div>'; |
| 571 | 387 | echo '</div>'; |
| 572 | 388 | } |
| 573 | 389 | } |
| 390 | + | |
| 574 | 391 | } |
