Skip to content

Commit b34f990

Browse files
girishpanchal30girishpanchal30
committed
Set 1-column upsell notice Codeinwp/visualizer-pro#314 
1 parent 5ad666e commit b34f990

File tree

3 files changed

+53
-75
lines changed

3 files changed

+53
-75
lines changed

‎classes/Visualizer/Module/Admin.php

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -688,15 +688,15 @@ public function registerAdminMenu() {
688688
);
689689

690690
if ( ! Visualizer_Module::is_pro() ) {
691-
$get_pro_hook = add_submenu_page(
691+
add_submenu_page(
692692
Visualizer_Plugin::NAME,
693693
__( 'Get Visualizer Pro', 'visualizer' ),
694694
__( 'Get Visualizer Pro', 'visualizer' ),
695695
'edit_posts',
696696
'viz-get-pro',
697697
'__return_null'
698698
);
699-
add_action( "load-{$get_pro_hook}", array( $this, 'handleGetProSubMenu' ) );
699+
add_action( 'admin_footer', array( $this, 'handleGetProSubMenu' ) );
700700
}
701701
remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
702702

@@ -707,9 +707,30 @@ public function registerAdminMenu() {
707707
* Handle get pro plugin submenu.
708708
*/
709709
public function handleGetProSubMenu() {
710-
// phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
711-
wp_redirect( esc_url( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing' ) );
712-
exit;
710+
?>
711+
<style type="text/css">
712+
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li {
713+
background: #FF7E65;
714+
font-size: 14px;
715+
font-weight: 600;
716+
color: #fff;
717+
}
718+
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a {
719+
color: #fff !important;
720+
}
721+
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover {
722+
box-shadow: inherit;
723+
}
724+
</style>
725+
<script type="text/javascript">
726+
jQuery( document ).ready( function() {
727+
jQuery( '#toplevel_page_visualizer' ).on( 'click', 'li:not(.wp-submenu-head, .wp-first-item):eq(2)', function( e ) {
728+
e.preventDefault();
729+
window.open( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing', '_blank' );
730+
} );
731+
} );
732+
</script>
733+
<?php
713734
}
714735

715736
/**

‎classes/Visualizer/Render/Library.php

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,8 @@ private function _renderLibrary() {
240240
$this->_renderChartBox( $placeholder_id, $chart['id'] );
241241
}
242242
}
243-
// Show the 2-col sidebar if there are 1 chart.
244-
if ( 1 === $count ) {
245-
$this->_renderTwoColSidebar();
246-
} elseif ( 2 === $count ) {
243+
// show the sidebar if there are less than 3 charts.
244+
if ( $count < 3 ) {
247245
$this->_renderSidebar();
248246
}
249247
echo '</div>';
@@ -261,7 +259,7 @@ private function _renderLibrary() {
261259
echo '<span class="visualizer-chart-action visualizer-nochart-shortcode"></span>';
262260
echo '</div>';
263261
echo '</div></div>';
264-
$this->_renderTwoColSidebar();
262+
$this->_renderSidebar();
265263
echo '</div>';
266264
}
267265
echo '</div>';
@@ -353,11 +351,11 @@ private function _renderChartBox( $placeholder_id, $chart_id ) {
353351
/**
354352
* Render 2-col sidebar
355353
*/
356-
private function _renderTwoColSidebar() {
354+
private function _renderSidebar() {
357355
if ( ! Visualizer_Module::is_pro() ) {
358-
echo '<div class="items two-col">';
356+
echo '<div class="items">';
359357
echo '<div class="viz-pro">';
360-
echo '<div id="visualizer-sidebar" class="viz-pro two-columns">';
358+
echo '<div id="visualizer-sidebar" class="one-columns">';
361359
echo '<div class="visualizer-sidebar-box">';
362360
echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>';
363361
if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
@@ -376,44 +374,7 @@ private function _renderTwoColSidebar() {
376374
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
377375
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>';
378376
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>';
379-
echo '<p><a href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
380-
echo '</div>';
381-
echo '</div>';
382-
echo '</div>';
383-
echo '</div>';
384-
}
385-
}
386-
387-
/**
388-
* Render sidebar.
389-
*/
390-
private function _renderSidebar() {
391-
if ( ! Visualizer_Module::is_pro() ) {
392-
echo '<div class="items">';
393-
echo '<div class="viz-pro">';
394-
echo '<div id="visualizer-sidebar" class="one-columns">';
395-
echo '<div class="visualizer-sidebar-box">';
396-
echo '<h3>' . __( 'Discover the power of PRO!', 'visualizer' ) . '</h3><ul>';
397-
if ( Visualizer_Module_Admin::proFeaturesLocked() ) {
398-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '6 more chart types', 'visualizer' ) . '</li>';
399-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Manual Data Editor', 'visualizer' ) . '</li>';
400-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'ChartJS Charts', 'visualizer' ) . '</li>';
401-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Table Google chart', 'visualizer' ) . '</li>';
402-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>';
403-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Import from other charts', 'visualizer' ) . '</li>';
404-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Use database query to create charts', 'visualizer' ) . '</li>';
405-
} else {
406-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( '11 more chart types', 'visualizer' ) . '</li>';
407-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>';
408-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li>';
409-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
410-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Create charts from WordPress tables', 'visualizer' ) . '</li>';
411-
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '</li>';
412-
}
413-
echo '</ul>';
414-
echo '<p><a href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
415-
echo '<p class="we-offer">' . __( 'We offer a 30-day money-back guarantee!', 'visualizer' ) . '</p>';
416-
echo '<p class="help-us-improve"><a href="' . VISUALIZER_SURVEY . '" target="_blank" class="">' . __( 'Don\'t see the features you need? Help us improve!', 'visualizer' ) . '</a></p>';
377+
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>';
417378
echo '</div>';
418379
echo '</div>';
419380
echo '</div>';

‎css/library.css

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -424,28 +424,24 @@ div#visualizer-types ul, div#visualizer-types form p {
424424
color: red;
425425
cursor: pointer;
426426
}
427-
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li {
428-
background: #FF7E65;
429-
font-size: 14px;
430-
font-weight: 600;
431-
color: #fff;
432-
}
433-
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a {
434-
color: #fff !important;
435-
}
436-
#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover {
437-
box-shadow: inherit;
438-
}
439-
#visualizer-library .items .viz-pro{
440-
height: 100%;
441-
padding-bottom: 24px;
442-
}
443-
#visualizer-library .items .viz-pro .one-columns{
444-
height: 100%;
445-
}
446-
#visualizer-library .items .viz-pro .visualizer-sidebar-box{
447-
height: 100%;
427+
@media (max-width: 1400px) {
428+
#visualizer-library .items .viz-pro{
429+
height: 100%;
430+
padding-bottom: 24px;
431+
}
432+
#visualizer-library .items .viz-pro .one-columns{
433+
height: 100%;
434+
}
435+
#visualizer-library .items .viz-pro .visualizer-sidebar-box{
436+
height: 100%;
437+
}
438+
#visualizer-library .items .viz-pro.two-columns{
439+
padding-bottom: 0;
440+
}
441+
#visualizer-sidebar.one-columns .visualizer-sidebar-box ul li:nth-child(+n+7) {
442+
display: none;
443+
}
444+
.visualizer-chart{
445+
height: calc(100% - 24px);
446+
}
448447
}
449-
#visualizer-library .items .viz-pro.two-columns{
450-
padding-bottom: 0;
451-
}

0 commit comments

Comments
 (0)