| @@ -60,9 +60,13 @@ | ||
| 60 | 60 | private function _renderMessages() { |
| 61 | 61 | if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) { |
| 62 | 62 | echo '<div class="updated error">'; |
| 63 | 63 | echo '<p>'; |
| 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>' ); | |
| 64 | + printf( | |
| 65 | + // 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' ), | |
| 67 | + '<b>allow_url_fopen</b>' | |
| 68 | + ); | |
| 65 | 69 | echo '</p>'; |
| 66 | 70 | echo '</div>'; |
| 67 | 71 | } |
| 68 | 72 | } |
| @@ -205,9 +209,57 @@ | ||
| 205 | 209 | <input type="button" id="viz-lib-reset" class="viz-filter button button-secondary" value="' . __( 'Clear Filters', 'visualizer' ) . '"> |
| 206 | 210 | </form> |
| 207 | 211 | </div>'; |
| 208 | 212 | } |
| 213 | + /** | |
| 214 | + * Renders pro charts blocker. | |
| 215 | + * | |
| 216 | + * @access private | |
| 217 | + */ | |
| 218 | + private function _renderProPopupBlocker() { | |
| 219 | + if ( Visualizer_Module::is_pro() ) { | |
| 220 | + return; | |
| 221 | + } | |
| 222 | + $license = get_option( 'visualizer_pro_license_data', 'free' ); | |
| 223 | + $license_key = ''; | |
| 224 | + $download_id = ''; | |
| 225 | + if ( ! empty( $license ) && is_object( $license ) ) { | |
| 226 | + $license_key = $license->key; | |
| 227 | + $download_id = $license->download_id; | |
| 228 | + } | |
| 229 | + $admin_license_url = admin_url( 'options-general.php#visualizer_pro_license' ); | |
| 230 | + $renew_license_url = tsdk_utmify( Visualizer_Plugin::STORE_URL . '?edd_license_key=' . $license_key . '&download_id=' . $download_id, 'visualizer_license_block' ); | |
| 231 | + echo ' | |
| 232 | + <div class="vizualizer-renew-notice-overlay" id="overlay-visualizer"></div> | |
| 233 | + <div class="vizualizer-renew-notice-popup"> | |
| 234 | + <h1 class="vizualizer-renew-notice-heading">Alert!</h1> | |
| 235 | + <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> | |
| 236 | + <div class="vizualizer-renew-notice-buttons-container"> | |
| 237 | + <a href="' . esc_url( $renew_license_url) . '" target="_blank"> | |
| 238 | + <button class="vizualizer-renew-notice-button vizualizer-renew-notice-renew-button"> | |
| 239 | + <span class="dashicons dashicons-cart"></span>' . esc_html__( 'Renew License', 'visualizer' ) . ' | |
| 240 | + </button> | |
| 241 | + </a> | |
| 242 | + <a href="' . esc_url( $admin_license_url ) . '"> | |
| 243 | + <button class="vizualizer-renew-notice-button vizualizer-renew-notice-activate-button"> | |
| 244 | + <span class="dashicons dashicons-unlock"></span> ' . esc_html__( 'Activate License', 'visualizer' ) . ' | |
| 245 | + </button> | |
| 246 | + </a> | |
| 247 | + <button class="vizualizer-renew-notice-button vizualizer-renew-notice-close-icon" aria-label="Close" onclick="closePopup()"> | |
| 248 | + <i class="dashicons dashicons-no"></i> | |
| 249 | + </button> | |
| 250 | + </div> | |
| 251 | + </div> | |
| 252 | + <script> | |
| 253 | + function closePopup() { | |
| 254 | + var overlay = document.getElementById("overlay-visualizer"); | |
| 255 | + var popup = document.querySelector(".vizualizer-renew-notice-popup"); | |
| 256 | + overlay.style.display = "none"; | |
| 257 | + popup.style.display = "none"; | |
| 258 | + } | |
| 259 | + </script>'; | |
| 209 | 260 | |
| 261 | + } | |
| 210 | 262 | /** |
| 211 | 263 | * Renders library content. |
| 212 | 264 | * |
| 213 | 265 | * @since 1.0.0 |
| @@ -214,17 +266,23 @@ | ||
| 214 | 266 | * |
| 215 | 267 | * @access private |
| 216 | 268 | */ |
| 217 | 269 | private function _renderLibrary() { |
| 270 | + | |
| 218 | 271 | // Added by Ash/Upwork |
| 219 | 272 | $filterBy = ! empty( $_GET['s'] ) ? sanitize_text_field( wp_unslash( $_GET['s'] ) ) : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended |
| 273 | + | |
| 220 | 274 | // Added by Ash/Upwork |
| 221 | 275 | echo $this->custom_css; |
| 276 | + | |
| 277 | + $this->_renderProPopupBlocker(); | |
| 278 | + | |
| 222 | 279 | echo '<div id="visualizer-types" class="visualizer-clearfix">'; |
| 223 | 280 | 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>'; |
| 224 | 281 | $this->getDisplayForm(); |
| 225 | 282 | echo '</div>'; |
| 226 | 283 | echo '<div id="visualizer-content-wrapper">'; |
| 284 | + echo '<div id="tsdk_banner" class="visualizer-banner"></div>'; | |
| 227 | 285 | if ( ! empty( $this->charts ) ) { |
| 228 | 286 | echo '<div id="visualizer-library" class="visualizer-clearfix">'; |
| 229 | 287 | $count = 0; |
| 230 | 288 | foreach ( $this->charts as $placeholder_id => $chart ) { |
| @@ -300,8 +358,11 @@ | ||
| 300 | 358 | // for ChartJS, title is an array. |
| 301 | 359 | if ( is_array( $title ) && isset( $title['text'] ) ) { |
| 302 | 360 | $title = $title['text']; |
| 303 | 361 | } |
| 362 | + if ( ! empty( $settings[0]['backend-title'] ) ) { | |
| 363 | + $title = $settings[0]['backend-title']; | |
| 364 | + } | |
| 304 | 365 | if ( empty( $title ) ) { |
| 305 | 366 | $title = '#' . $chart_id; |
| 306 | 367 | } |
| 307 | 368 | |
| @@ -336,15 +397,24 @@ | ||
| 336 | 397 | ), |
| 337 | 398 | admin_url( 'admin-ajax.php' ) |
| 338 | 399 | ) |
| 339 | 400 | ); |
| 401 | + $chart_type = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 340 | 402 | |
| 403 | + $types = ['area', 'geo', 'column', 'bubble', 'scatter', 'gauge', 'candlestick', 'timeline', 'combo', 'polarArea', 'radar' ]; | |
| 404 | + | |
| 405 | + $pro_class = ''; | |
| 406 | + | |
| 407 | + if ( ! empty( $chart_type ) && in_array( $chart_type, $types, true ) ) { | |
| 408 | + $pro_class = 'viz-is-pro-chart'; | |
| 409 | + } | |
| 410 | + | |
| 341 | 411 | $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!' ); |
| 342 | 412 | if ( ! empty( $chart_status['error'] ) ) { |
| 343 | 413 | $chart_status['icon'] = 'error dashicons-dismiss'; |
| 344 | 414 | $chart_status['title'] = __( 'Click to view the error', 'visualizer' ); |
| 345 | 415 | } |
| 346 | - $shortcode = sprintf( '[visualizer id="%s" lazy="no" class=""]', $chart_id ); | |
| 416 | + $shortcode = sprintf( '[visualizer id="%s" class=""]', $chart_id ); | |
| 347 | 417 | echo '<div class="items"><div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>'; |
| 348 | 418 | if ( Visualizer_Module::is_pro() && $with_filter ) { |
| 349 | 419 | echo '<div id="chart_wrapper_' . $placeholder_id . '">'; |
| 350 | 420 | echo '<div id="control_wrapper_' . $placeholder_id . '" class="vz-library-chart-filter"></div>'; |
| @@ -357,15 +427,15 @@ | ||
| 357 | 427 | } |
| 358 | 428 | echo '<div class="visualizer-chart-footer visualizer-clearfix">'; |
| 359 | 429 | echo '<div class="visualizer-action-group">'; |
| 360 | 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>'; |
| 361 | - echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" data-clipboard-text="', esc_attr( $shortcode ), '"><span class="dashicons dashicons-shortcode"></span><span class="tooltip-text">' . esc_attr__( 'Copy Shortcode', '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>'; | |
| 362 | 432 | if ( $this->can_chart_have_action( 'image', $chart_id ) ) { |
| 363 | - echo '<a class="visualizer-chart-action visualizer-chart-image" href="javascript:;" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"><span class="dashicons dashicons-format-image"></span><span class="tooltip-text">' . esc_attr__( 'Download PNG', 'visualizer' ) . '</span></a>'; | |
| 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>'; | |
| 364 | 434 | } |
| 365 | - echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" data-chart="', $export_link, '"><span class="dashicons dashicons-download"></span><span class="tooltip-text">' . esc_attr__( 'Export CSV', 'visualizer' ) . '</span></a>'; | |
| 366 | - echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '"><span class="dashicons dashicons-admin-page"></span><span class="tooltip-text">' . esc_attr__( 'Duplicate', 'visualizer' ) . '</span></a>'; | |
| 367 | - echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" data-chart="', $chart_id, '"><span class="dashicons dashicons-admin-generic"></span><span class="tooltip-text">' . esc_attr__( 'Edit', 'visualizer' ) . '</span></a>'; | |
| 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>'; | |
| 368 | 438 | echo '</div>'; |
| 369 | 439 | do_action( 'visualizer_chart_languages', $chart_id ); |
| 370 | 440 | 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>'; |
| 371 | 441 | echo '</div>'; |
| @@ -385,9 +455,9 @@ | ||
| 385 | 455 | if ( Visualizer_Module_Admin::proFeaturesLocked() ) { |
| 386 | 456 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' ); |
| 387 | 457 | } else { |
| 388 | 458 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>'; |
| 389 | - echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Manual Data Editor', 'visualizer' ) . '</li>'; | |
| 459 | + echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Synchronize Data Periodically', 'visualizer' ) . '</li>'; | |
| 390 | 460 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>'; |
| 391 | 461 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>'; |
| 392 | 462 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>'; |
| 393 | 463 | } |
| @@ -399,9 +469,9 @@ | ||
| 399 | 469 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>'; |
| 400 | 470 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'WPML support for translating charts', 'visualizer' ) . '</li>'; |
| 401 | 471 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Integration with Woocommerce Data endpoints', 'visualizer' ) . '</li>'; |
| 402 | 472 | echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>'; |
| 403 | - echo '<p><a href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarupsell' ) . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>'; | |
| 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>'; | |
| 404 | 474 | echo '</div>'; |
| 405 | 475 | echo '</div>'; |
| 406 | 476 | echo '</div>'; |
| 407 | 477 | echo '</div>'; |
