Skip to content

Commit a13042f

Browse files
HardeepAsraniHardeepAsrani
committed
chore fix: qa
1 parent 5a9a746 commit a13042f

1 file changed

Lines changed: 17 additions & 56 deletions

File tree

‎classes/Visualizer/Render/Library.php‎

Lines changed: 17 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,8 @@ private function _renderLibrary() {
318318
echo '</div>';
319319
} else {
320320
echo '<div id="visualizer-library" class="visualizer-clearfix view-grid">';
321-
$count = 0;
321+
$this->_renderSidebar();
322322
foreach ( $this->charts as $placeholder_id => $chart ) {
323-
// show the sidebar after the first 3 charts.
324-
++$count;
325323
$enable_controls = false;
326324
$settings = isset( $chart['settings'] ) ? $chart['settings'] : array();
327325
if ( ! empty( $settings['controls']['controlType'] ) ) {
@@ -331,14 +329,8 @@ private function _renderLibrary() {
331329
$enable_controls = true;
332330
}
333331
}
334-
if ( 3 === $count ) {
335-
$this->_renderSidebar();
336-
}
337332
$this->_renderChartBox( $placeholder_id, $chart['id'], $enable_controls );
338333
}
339-
if ( $count < 3 ) {
340-
$this->_renderSidebar();
341-
}
342334
echo '</div>';
343335
}
344336
} else {
@@ -537,53 +529,22 @@ private function _getViewToggleHTML(): string {
537529
*/
538530
private function _renderSidebar() {
539531
if ( ! Visualizer_Module::is_pro() ) {
540-
if ( $this->_isListView() ) {
541-
$upgrade_url = tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarMenuUpgrade', 'index' );
542-
$chart_types = Visualizer_Module_Admin::proFeaturesEnabled() ? __( '6 more chart types', 'visualizer' ) : __( '11 more chart types', 'visualizer' );
543-
echo '<div class="items--upsell">';
544-
echo '<div class="viz-upsell-banner">';
545-
echo '<span class="dashicons dashicons-star-filled viz-upsell-banner__icon"></span>';
546-
echo '<div class="viz-upsell-banner__text">';
547-
echo '<strong>' . esc_html__( 'Unlock the full power of Visualizer PRO!', 'visualizer' ) . '</strong>';
548-
/* translators: %s: number of additional chart types (e.g. "11 more chart types") */
549-
echo '<span>' . sprintf( esc_html__( '%s, periodic data sync, database queries, frontend editor, and more.', 'visualizer' ), esc_html( $chart_types ) ) . '</span>';
550-
echo '</div>';
551-
echo '<div class="viz-upsell-banner__actions">';
552-
echo '<a href="' . esc_url( $upgrade_url . '#pro-features' ) . '" target="_blank" class="button button-secondary">' . esc_html__( 'View Features', 'visualizer' ) . '</a>';
553-
echo '<a href="' . esc_url( $upgrade_url . '#pricing' ) . '" target="_blank" class="button button-primary">' . esc_html__( 'Upgrade Now', 'visualizer' ) . '</a>';
554-
echo '</div>';
555-
echo '</div>';
556-
echo '</div>';
557-
} else {
558-
echo '<div class="items">';
559-
echo '<div class="viz-pro">';
560-
echo '<div id="visualizer-sidebar" class="one-columns">';
561-
echo '<div class="visualizer-sidebar-box">';
562-
echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>';
563-
if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
564-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' );
565-
} else {
566-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>';
567-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Synchronize Data Periodically', 'visualizer' ) . '</li>';
568-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>';
569-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>';
570-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>';
571-
}
572-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>';
573-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Import from other charts', 'visualizer' ) . '</li>';
574-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>';
575-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>';
576-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
577-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>';
578-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'WPML support for translating charts', 'visualizer' ) . '</li>';
579-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Integration with Woocommerce Data endpoints', 'visualizer' ) . '</li>';
580-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>';
581-
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>';
582-
echo '</div>';
583-
echo '</div>';
584-
echo '</div>';
585-
echo '</div>';
586-
}
532+
$upgrade_url = tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarMenuUpgrade', 'index' );
533+
$chart_types = Visualizer_Module_Admin::proFeaturesEnabled() ? __( '6 more chart types', 'visualizer' ) : __( '11 more chart types', 'visualizer' );
534+
echo '<div class="items--upsell">';
535+
echo '<div class="viz-upsell-banner">';
536+
echo '<span class="dashicons dashicons-star-filled viz-upsell-banner__icon"></span>';
537+
echo '<div class="viz-upsell-banner__text">';
538+
echo '<strong>' . esc_html__( 'Unlock the full power of Visualizer PRO!', 'visualizer' ) . '</strong>';
539+
/* translators: %s: number of additional chart types (e.g. "11 more chart types") */
540+
echo '<span>' . sprintf( esc_html__( '%s, periodic data sync, database queries, frontend editor, and more.', 'visualizer' ), esc_html( $chart_types ) ) . '</span>';
541+
echo '</div>';
542+
echo '<div class="viz-upsell-banner__actions">';
543+
echo '<a href="' . esc_url( $upgrade_url . '#pro-features' ) . '" target="_blank" class="button button-secondary">' . esc_html__( 'View Features', 'visualizer' ) . '</a>';
544+
echo '<a href="' . esc_url( $upgrade_url . '#pricing' ) . '" target="_blank" class="button button-primary">' . esc_html__( 'Upgrade Now', 'visualizer' ) . '</a>';
545+
echo '</div>';
546+
echo '</div>';
547+
echo '</div>';
587548
}
588549
}
589550
}

0 commit comments

Comments
 (0)