From b182e66e3d39ff1990245d9b7d3404751571afab Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 24 Feb 2022 15:35:01 +0530 Subject: [PATCH 1/8] Improve upsell section design Codeinwp/visualizer-pro#314 --- classes/Visualizer/Module/Admin.php | 21 ++++ classes/Visualizer/Render/Library.php | 95 +++++++++++----- css/library.css | 151 ++++++++++++++++++++------ js/library.js | 13 ++- 4 files changed, 223 insertions(+), 57 deletions(-) diff --git a/classes/Visualizer/Module/Admin.php b/classes/Visualizer/Module/Admin.php index 49a89bd76..5314f38dd 100644 --- a/classes/Visualizer/Module/Admin.php +++ b/classes/Visualizer/Module/Admin.php @@ -686,11 +686,32 @@ public function registerAdminMenu() { 'viz-support', array( $this, 'renderSupportPage' ) ); + + if ( ! Visualizer_Module::is_pro() ) { + $get_pro_hook = add_submenu_page( + Visualizer_Plugin::NAME, + __( 'Get Visualizer Pro', 'visualizer' ), + __( 'Get Visualizer Pro', 'visualizer' ), + 'edit_posts', + 'viz-get-pro', + '__return_null' + ); + add_action( "load-{$get_pro_hook}", array( $this, 'handleGetProSubMenu' ) ); + } remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME ); add_action( "load-{$this->_libraryPage}", array( $this, 'addScreenOptions' ) ); } + /** + * Handle get pro plugin submenu. + */ + public function handleGetProSubMenu() { + // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect + wp_redirect( esc_url( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing' ) ); + exit; + } + /** * Adds the screen options for pagination. */ diff --git a/classes/Visualizer/Render/Library.php b/classes/Visualizer/Render/Library.php index 1cd3b3f6d..d75f1e5ce 100644 --- a/classes/Visualizer/Render/Library.php +++ b/classes/Visualizer/Render/Library.php @@ -223,6 +223,7 @@ private function _renderLibrary() { // Added by Ash/Upwork echo $this->custom_css; echo '
'; + echo ''; $this->getDisplayForm(); echo '
'; echo '
'; @@ -230,20 +231,25 @@ private function _renderLibrary() { echo '
'; $count = 0; foreach ( $this->charts as $placeholder_id => $chart ) { - $this->_renderChartBox( $placeholder_id, $chart['id'] ); // show the sidebar after the first 3 charts. - if ( $count++ === 2 ) { + $count++; + if ( 3 === $count ) { $this->_renderSidebar(); + $this->_renderChartBox( $placeholder_id, $chart['id'] ); + } else { + $this->_renderChartBox( $placeholder_id, $chart['id'] ); } } - // show the sidebar if there are less than 3 charts. - if ( $count < 3 ) { + // Show the 2-col sidebar if there are 1 chart. + if ( 1 === $count ) { + $this->_renderTwoColSidebar(); + } elseif ( 2 === $count ) { $this->_renderSidebar(); } echo '
'; } else { echo '
'; - echo '
'; + echo '
'; echo '
'; echo '
', esc_html__( 'No charts found', 'visualizer' ), '

', esc_html__( 'Add New', 'visualizer' ), '

'; echo '
'; @@ -254,8 +260,8 @@ private function _renderLibrary() { echo ''; echo ''; echo '
'; - echo '
'; - $this->_renderSidebar(); + echo '
'; + $this->_renderTwoColSidebar(); echo '
'; } echo ''; @@ -325,7 +331,7 @@ private function _renderChartBox( $placeholder_id, $chart_id ) { $chart_status['title'] = __( 'Click to view the error', 'visualizer' ); } $shortcode = sprintf( '[visualizer id="%s" lazy="no" class=""]', $chart_id ); - echo '
', esc_html( $title ), '
'; + echo '
', esc_html( $title ), '
'; echo '
'; echo ''; echo '
'; @@ -341,7 +347,41 @@ private function _renderChartBox( $placeholder_id, $chart_id ) { echo ' '; echo '
(' . $chart_id . '): ' . $chart_status['date'] . '
'; echo '
'; - echo '
'; + echo '
'; + } + + /** + * Render 2-col sidebar + */ + private function _renderTwoColSidebar() { + if ( ! Visualizer_Module::is_pro() ) { + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '

' . __( 'Discover the power of PRO!', 'visualizer' ) . '

    '; + if ( Visualizer_Module_Admin::proFeaturesLocked() ) { + echo '
  • ' . __( '6 more chart types', 'visualizer' ) . '
'; + } else { + echo '
  • ' . __( '11 more chart types', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Manual Data Editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'ChartJS Charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Table Google chart', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '
    • '; + } + echo '
  • ' . __( 'Spreadsheet like editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Import from other charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Use database query to create charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Create charts from WordPress tables', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Frontend editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Private charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Auto-sync with online files', 'visualizer' ) . '
    • '; + echo '

    ' . __( 'View more features', 'visualizer' ) . '

    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + } } /** @@ -349,28 +389,33 @@ private function _renderChartBox( $placeholder_id, $chart_id ) { */ private function _renderSidebar() { if ( ! Visualizer_Module::is_pro() ) { - echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; echo '
    '; echo '

    ' . __( 'Discover the power of PRO!', 'visualizer' ) . '

      '; - echo '
    • ' . __( 'Spreadsheet like editor', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Import from other charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Use database query to create charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Create charts from WordPress tables', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Frontend editor', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Private charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Auto-sync with online files', 'visualizer' ) . '
      • '; if ( Visualizer_Module_Admin::proFeaturesLocked() ) { - echo '
    • ' . __( '6 more chart types', 'visualizer' ) . '
    '; + echo '
  • ' . __( '6 more chart types', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Manual Data Editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'ChartJS Charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Table Google chart', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Spreadsheet like editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Import from other charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Use database query to create charts', 'visualizer' ) . '
    • '; } else { - echo '
  • ' . __( '11 more chart types', 'visualizer' ) . '
    • '; - echo '
  • ' . __( 'Manual Data Editor', 'visualizer' ) . '
    • '; - echo '
  • ' . __( 'ChartJS Charts', 'visualizer' ) . '
    • '; - echo '
  • ' . __( 'Table Google chart', 'visualizer' ) . '
    • '; - echo '
  • ' . __( 'Frontend Actions(Print Chart, Export to CSV, Export to Excel, Copy, Download Chart Image)', 'visualizer' ) . '
    • '; + echo '
  • ' . __( '11 more chart types', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Private charts', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Auto-sync with online files', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Frontend editor', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Create charts from WordPress tables', 'visualizer' ) . '
    • '; + echo '
  • ' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '
    • '; } + echo ''; echo '

    ' . __( 'View more features', 'visualizer' ) . '

    '; - echo '

    ' . __( 'We offer a 30-day no-questions-asked money back guarantee!', 'visualizer' ) . '

    '; - echo '

    ' . __( 'Don\'t see the features you need? Help us improve!', 'visualizer' ) . '

    '; + echo '

    ' . __( 'We offer a 30-day money-back guarantee!', 'visualizer' ) . '

    '; + echo '

    ' . __( 'Don\'t see the features you need? Help us improve!', 'visualizer' ) . '

    '; + echo '
    '; + echo '
    '; echo '
    '; echo '
    '; } diff --git a/css/library.css b/css/library.css index fdd2d0f14..93e1c9db5 100644 --- a/css/library.css +++ b/css/library.css @@ -1,3 +1,10 @@ + +*, +*::before, +*::after { + box-sizing: border-box; +} + #visualizer-icon { background-image: url("../images/icon.png"); } @@ -24,11 +31,21 @@ .visualizer-list-item .visualizer-pro-only { text-decoration: line-through; } - +#visualizer-content-wrapper { + padding: 0; +} #visualizer-library { - display: table-cell; + /*display: table-cell;*/ width: auto; - margin: 20px 0; + margin: 20px -10px; + display: flex; + flex-wrap: wrap; + align-items: flex-start; +} + +#visualizer-library.visualizer-clearfix:before, +#visualizer-library.visualizer-clearfix:after { + display: none; } #visualizer-content-wrapper { @@ -42,11 +59,13 @@ margin-top: -16px; margin-left: -16px; } +#visualizer-library .items { + padding: 0 10px; + width: 33.3333%; +} .visualizer-chart { - display: none; - float: left; - margin: 0 24px 24px 0; + margin: 0 0px 24px 0; padding: 5px; border: 1px solid #ddd; background-color: #efefef; @@ -131,6 +150,7 @@ .visualizer-chart-footer { margin-top: 4px; + width: 100%; } .visualizer-chart-shortcode { @@ -163,36 +183,86 @@ text-align: right; } -#visualizer-sidebar { - clear: both; - margin: 20px 0px; - width: 96%; +.visualizer-sidebar-box { + display: block; + padding: 30px 34px; + background: white; } -.visualizer-sidebar-box ul li { - margin: 4px 0; - color: #23282d; - float: left; - width: 25%; +.visualizer-sidebar-box h3{ + padding: 0; + margin: 0 0 20px; + display: block; + width: 100%; + font-size: 24px; + font-weight: 600; + line-height: 1.3; } .visualizer-sidebar-box ul { - margin-left: 40px; - text-align: left; - list-style-type: disc; + padding: 0; + margin: 0; + list-style: none; + display: flex; + flex-wrap: wrap; } -.visualizer-sidebar-box { - display: block; - padding-top: 10px; - padding-bottom: 15px; - border-top: 5px solid #0073aa; - border-bottom: 5px solid #0073aa; - color: #0073aa; - background: white; - text-align: center; +.visualizer-sidebar-box ul li { + color: #000; + list-style: none; + padding: 0; + margin: 0; + font-size: 16px; + line-height: 1.8; + position: relative; + padding-left: 26px; +} + +.visualizer-sidebar-box ul li .icon{ + color: #00AA63; + width: 16px; + height: 16px; + margin-top: 3px; + position: absolute; + left: 0; + top: 0; +} +.visualizer-sidebar-box .button { + width: 155px; + height: 39px; + background: #007CBA; + border-radius: 4px; + display: flex; + align-items: center; + text-align: center; + color: #FFFFFF; + justify-content: center; +} +.visualizer-sidebar-box .we-offer{ + background-color: transparent; + color: #007CBA; + font-weight: 400; + padding: 0px; + font-size: 14px; + font-style: italic; + margin-bottom: 0; +} +.visualizer-sidebar-box .help-us-improve{ + display: none; +} +.visualizer-chart.viz-pro { + padding: 0; +} +.visualizer-chart.viz-pro .two-columns{ + padding: 0; + border: 1px solid #DDDDDD; + border: 5px solid #007CBA; +} +#visualizer-library .items.two-col { + width: 66.6666%; } + /* The switch - the box around the slider */ .visualizer-switch { display: inline-block; @@ -286,13 +356,20 @@ input:checked + .visualizer-slider:before { margin-top: 0; } +#visualizer-sidebar.two-columns .visualizer-sidebar-box ul li { + width: calc(50% - 26px) +} +#visualizer-sidebar.one-columns .visualizer-sidebar-box ul li { + width: 100%; +} +#visualizer-sidebar.one-columns .visualizer-sidebar-box p { + margin-top: 8px; +} #visualizer-sidebar .visualizer-sidebar-box p { margin-bottom: 0; } - -#visualizer-sidebar .visualizer-sidebar-box { - padding-top: 20px; - padding-bottom: 20px; +#visualizer-sidebar.one-columns { + border-top: 5px solid #007CBA; } .visualizer-chart-title { @@ -349,3 +426,15 @@ div#visualizer-types ul, div#visualizer-types form p { color: red; cursor: pointer; } +#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li { + background: #FF7E65; + font-size: 14px; + font-weight: 600; + color: #fff; +} +#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a { + color: #fff; +} +#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover { + box-shadow: inherit; +} diff --git a/js/library.js b/js/library.js index ffd76f422..7e702c5d8 100644 --- a/js/library.js +++ b/js/library.js @@ -43,7 +43,18 @@ width *= 0.305; $(this).prev( '.visualizer-chart-title' ).width(width - 14); - $(this).width(width - 14).height(width * 0.75).parent().css('margin-right', margin + 'px').css('margin-bottom', margin + 'px'); + var sideBarHeight = width * 0.82; + var ChartHeight = width * 0.93; + if ( $( '.visualizer-nochart-canvas' ).length === 0 ) { + sideBarHeight = width * 0.82; + ChartHeight = width * 0.75; + if ( $( '#visualizer-sidebar' ).hasClass('one-columns') ) { + sideBarHeight = width * 0.98; + ChartHeight = width * 0.89; + } + } + $(this).width(width).height( ChartHeight ); + $('#visualizer-sidebar').find('.visualizer-sidebar-box').height( sideBarHeight ); }); }; From 46672f9798453a604bd74a4d2da66faf821c41c2 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 24 Feb 2022 15:52:53 +0530 Subject: [PATCH 2/8] Fix e2e testcase Codeinwp/visualizer-pro#314 --- classes/Visualizer/Render/Library.php | 2 +- css/library.css | 2 +- js/library.js | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/classes/Visualizer/Render/Library.php b/classes/Visualizer/Render/Library.php index d75f1e5ce..39fd8e82b 100644 --- a/classes/Visualizer/Render/Library.php +++ b/classes/Visualizer/Render/Library.php @@ -356,7 +356,7 @@ private function _renderChartBox( $placeholder_id, $chart_id ) { private function _renderTwoColSidebar() { if ( ! Visualizer_Module::is_pro() ) { echo '
    '; - echo '
    '; + echo '
    '; echo '
    '; echo '
    '; echo '

    ' . __( 'Discover the power of PRO!', 'visualizer' ) . '

      '; diff --git a/css/library.css b/css/library.css index 93e1c9db5..19bd9a87e 100644 --- a/css/library.css +++ b/css/library.css @@ -253,7 +253,7 @@ .visualizer-chart.viz-pro { padding: 0; } -.visualizer-chart.viz-pro .two-columns{ +.two-col .viz-pro .two-columns{ padding: 0; border: 1px solid #DDDDDD; border: 5px solid #007CBA; diff --git a/js/library.js b/js/library.js index 7e702c5d8..503fbc110 100644 --- a/js/library.js +++ b/js/library.js @@ -43,18 +43,14 @@ width *= 0.305; $(this).prev( '.visualizer-chart-title' ).width(width - 14); - var sideBarHeight = width * 0.82; var ChartHeight = width * 0.93; if ( $( '.visualizer-nochart-canvas' ).length === 0 ) { - sideBarHeight = width * 0.82; - ChartHeight = width * 0.75; + ChartHeight = width * 0.78; if ( $( '#visualizer-sidebar' ).hasClass('one-columns') ) { - sideBarHeight = width * 0.98; - ChartHeight = width * 0.89; + ChartHeight = width * 0.92; } } $(this).width(width).height( ChartHeight ); - $('#visualizer-sidebar').find('.visualizer-sidebar-box').height( sideBarHeight ); }); }; From 6aa5c2b918d98c6d24a85325dee6c66b47183657 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 24 Feb 2022 16:02:09 +0530 Subject: [PATCH 3/8] Remove common class [e2e] Codeinwp/visualizer-pro#314 --- classes/Visualizer/Render/Library.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Visualizer/Render/Library.php b/classes/Visualizer/Render/Library.php index 39fd8e82b..191fedaa5 100644 --- a/classes/Visualizer/Render/Library.php +++ b/classes/Visualizer/Render/Library.php @@ -390,7 +390,7 @@ private function _renderTwoColSidebar() { private function _renderSidebar() { if ( ! Visualizer_Module::is_pro() ) { echo '
      '; - echo '
      '; + echo '
      '; echo '
      '; echo '
      '; echo '

      ' . __( 'Discover the power of PRO!', 'visualizer' ) . '

        '; From 5ad666ef4667973e065586e1913d190c1a392981 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Wed, 2 Mar 2022 16:11:30 +0530 Subject: [PATCH 4/8] Fix chart box card issue Codeinwp/visualizer-pro#314 --- css/library.css | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/css/library.css b/css/library.css index 19bd9a87e..c6e76b266 100644 --- a/css/library.css +++ b/css/library.css @@ -35,12 +35,10 @@ padding: 0; } #visualizer-library { - /*display: table-cell;*/ width: auto; margin: 20px -10px; display: flex; flex-wrap: wrap; - align-items: flex-start; } #visualizer-library.visualizer-clearfix:before, @@ -225,7 +223,7 @@ margin-top: 3px; position: absolute; left: 0; - top: 0; + top: 3px; } .visualizer-sidebar-box .button { width: 155px; @@ -433,8 +431,21 @@ div#visualizer-types ul, div#visualizer-types form p { color: #fff; } #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a { - color: #fff; + color: #fff !important; } #toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover { box-shadow: inherit; } +#visualizer-library .items .viz-pro{ + height: 100%; + padding-bottom: 24px; +} +#visualizer-library .items .viz-pro .one-columns{ + height: 100%; +} +#visualizer-library .items .viz-pro .visualizer-sidebar-box{ + height: 100%; +} +#visualizer-library .items .viz-pro.two-columns{ + padding-bottom: 0; +} \ No newline at end of file From b34f990f8ca3a6b41bb7cc332600b58af77e02ac Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 3 Mar 2022 11:14:32 +0530 Subject: [PATCH 5/8] Set 1-column upsell notice Codeinwp/visualizer-pro#314 --- classes/Visualizer/Module/Admin.php | 31 +++++++++++++--- classes/Visualizer/Render/Library.php | 53 ++++----------------------- css/library.css | 44 ++++++++++------------ 3 files changed, 53 insertions(+), 75 deletions(-) diff --git a/classes/Visualizer/Module/Admin.php b/classes/Visualizer/Module/Admin.php index 5314f38dd..1e9a9e7a1 100644 --- a/classes/Visualizer/Module/Admin.php +++ b/classes/Visualizer/Module/Admin.php @@ -688,7 +688,7 @@ public function registerAdminMenu() { ); if ( ! Visualizer_Module::is_pro() ) { - $get_pro_hook = add_submenu_page( + add_submenu_page( Visualizer_Plugin::NAME, __( 'Get Visualizer Pro', 'visualizer' ), __( 'Get Visualizer Pro', 'visualizer' ), @@ -696,7 +696,7 @@ public function registerAdminMenu() { 'viz-get-pro', '__return_null' ); - add_action( "load-{$get_pro_hook}", array( $this, 'handleGetProSubMenu' ) ); + add_action( 'admin_footer', array( $this, 'handleGetProSubMenu' ) ); } remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME ); @@ -707,9 +707,30 @@ public function registerAdminMenu() { * Handle get pro plugin submenu. */ public function handleGetProSubMenu() { - // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect - wp_redirect( esc_url( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing' ) ); - exit; + ?> + + + _renderChartBox( $placeholder_id, $chart['id'] ); } } - // Show the 2-col sidebar if there are 1 chart. - if ( 1 === $count ) { - $this->_renderTwoColSidebar(); - } elseif ( 2 === $count ) { + // show the sidebar if there are less than 3 charts. + if ( $count < 3 ) { $this->_renderSidebar(); } echo '
      '; @@ -261,7 +259,7 @@ private function _renderLibrary() { echo ''; echo '
      '; echo '
      '; - $this->_renderTwoColSidebar(); + $this->_renderSidebar(); echo '
      '; } echo '
    '; @@ -353,11 +351,11 @@ private function _renderChartBox( $placeholder_id, $chart_id ) { /** * Render 2-col sidebar */ - private function _renderTwoColSidebar() { + private function _renderSidebar() { if ( ! Visualizer_Module::is_pro() ) { - echo '
    '; + echo '
    '; echo '
    '; - echo '
    '; + echo '
    '; echo '
    '; echo '

    ' . __( 'Discover the power of PRO!', 'visualizer' ) . '

      '; if ( Visualizer_Module_Admin::proFeaturesLocked() ) { @@ -376,44 +374,7 @@ private function _renderTwoColSidebar() { echo '
    • ' . __( 'Frontend editor', 'visualizer' ) . '
      • '; echo '
    • ' . __( 'Private charts', 'visualizer' ) . '
      • '; echo '
    • ' . __( 'Auto-sync with online files', 'visualizer' ) . '
    '; - echo '

    ' . __( 'View more features', 'visualizer' ) . '

    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - } - } - - /** - * Render sidebar. - */ - private function _renderSidebar() { - if ( ! Visualizer_Module::is_pro() ) { - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '

    ' . __( 'Discover the power of PRO!', 'visualizer' ) . '

      '; - if ( Visualizer_Module_Admin::proFeaturesLocked() ) { - echo '
    • ' . __( '6 more chart types', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Manual Data Editor', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'ChartJS Charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Table Google chart', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Spreadsheet like editor', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Import from other charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Use database query to create charts', 'visualizer' ) . '
      • '; - } else { - echo '
    • ' . __( '11 more chart types', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Private charts', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Auto-sync with online files', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Frontend editor', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Create charts from WordPress tables', 'visualizer' ) . '
      • '; - echo '
    • ' . __( 'Frontend Actions(Print, Export, Copy, Download)', 'visualizer' ) . '
      • '; - } - echo '
    '; - echo '

    ' . __( 'View more features', 'visualizer' ) . '

    '; - echo '

    ' . __( 'We offer a 30-day money-back guarantee!', 'visualizer' ) . '

    '; - echo '

    ' . __( 'Don\'t see the features you need? Help us improve!', 'visualizer' ) . '

    '; + echo '

    ' . __( 'View more features', 'visualizer' ) . '

    '; echo '
    '; echo '
    '; echo '
    '; diff --git a/css/library.css b/css/library.css index c6e76b266..b089f2422 100644 --- a/css/library.css +++ b/css/library.css @@ -424,28 +424,24 @@ div#visualizer-types ul, div#visualizer-types form p { color: red; cursor: pointer; } -#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li { - background: #FF7E65; - font-size: 14px; - font-weight: 600; - color: #fff; -} -#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a { - color: #fff !important; -} -#toplevel_page_visualizer ul.wp-submenu li.wp-first-item + li + li + li > a:hover { - box-shadow: inherit; -} -#visualizer-library .items .viz-pro{ - height: 100%; - padding-bottom: 24px; -} -#visualizer-library .items .viz-pro .one-columns{ - height: 100%; -} -#visualizer-library .items .viz-pro .visualizer-sidebar-box{ - height: 100%; +@media (max-width: 1400px) { + #visualizer-library .items .viz-pro{ + height: 100%; + padding-bottom: 24px; + } + #visualizer-library .items .viz-pro .one-columns{ + height: 100%; + } + #visualizer-library .items .viz-pro .visualizer-sidebar-box{ + height: 100%; + } + #visualizer-library .items .viz-pro.two-columns{ + padding-bottom: 0; + } + #visualizer-sidebar.one-columns .visualizer-sidebar-box ul li:nth-child(+n+7) { + display: none; + } + .visualizer-chart{ + height: calc(100% - 24px); + } } -#visualizer-library .items .viz-pro.two-columns{ - padding-bottom: 0; -} \ No newline at end of file From 201b923cebd71e975acc3c52f12d45ee8bde7152 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Fri, 4 Mar 2022 12:51:24 +0530 Subject: [PATCH 6/8] Fix upsell section issue in smaller screen Codeinwp/visualizer-pro#314 --- css/library.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/library.css b/css/library.css index b089f2422..34d68308a 100644 --- a/css/library.css +++ b/css/library.css @@ -424,7 +424,12 @@ div#visualizer-types ul, div#visualizer-types form p { color: red; cursor: pointer; } -@media (max-width: 1400px) { +@media (-webkit-min-device-pixel-ratio: 2) and (min-width: 1000px) and (max-width: 1600px) { + #visualizer-sidebar.one-columns .visualizer-sidebar-box ul li:nth-child(+n+7) { + display: none; + } +} +@media (max-width: 1500px) { #visualizer-library .items .viz-pro{ height: 100%; padding-bottom: 24px; From a042525a12693058e4e9901aa79e0b4d43991020 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Mon, 14 Mar 2022 17:17:35 +0530 Subject: [PATCH 7/8] Fix display long haxis text issue Codeinwp/visualizer-pro#331 --- classes/Visualizer/Render/Sidebar/Graph.php | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/classes/Visualizer/Render/Sidebar/Graph.php b/classes/Visualizer/Render/Sidebar/Graph.php index 8f56c59b4..45e92a3f7 100644 --- a/classes/Visualizer/Render/Sidebar/Graph.php +++ b/classes/Visualizer/Render/Sidebar/Graph.php @@ -149,6 +149,31 @@ protected function _renderHorizontalAxisGeneralSettings() { esc_html__( 'The title of the horizontal axis.', 'visualizer' ) ); + self::_renderSelectItem( + esc_html__( 'Slanted Text', 'visualizer' ), + 'hAxis[slantedText]', + isset( $this->hAxis['slantedText'] ) ? $this->hAxis['slantedText'] : false, + array( + false => 'False', + true => 'True', + ), + '', + false + ); + + self::_renderTextItem( + esc_html__( 'Slanted Text Angle', 'visualizer' ), + 'hAxis[slantedTextAngle]', + isset( $this->hAxis['slantedTextAngle'] ) ? $this->hAxis['slantedTextAngle'] : 45, + '', + 45, + 'number', + array( + 'min' => 1, + 'step' => 15, + ) + ); + self::_renderSelectItem( esc_html__( 'Text Position', 'visualizer' ), 'hAxis[textPosition]', From fcdaba613d1df8d5b13544c9fbbfb3abe175bd8c Mon Sep 17 00:00:00 2001 From: "themeisle[bot]" <> Date: Thu, 17 Mar 2022 15:59:19 +0000 Subject: [PATCH 8/8] chore(release): 3.7.5 ##### [Version 3.7.5](https://github.com/Codeinwp/visualizer/compare/v3.7.4...v3.7.5) (2022-03-17) - Fix display long hAxis text issue - Improve features discoverability. --- CHANGELOG.md | 5 +++++ classes/Visualizer/Plugin.php | 2 +- css/media.css | 2 +- index.php | 2 +- package.json | 2 +- readme.txt | 8 ++++++++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0cf1c14c..04c2c5b33 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +##### [Version 3.7.5](https://github.com/Codeinwp/visualizer/compare/v3.7.4...v3.7.5) (2022-03-17) + +- Fix display long hAxis text issue +- Improve features discoverability. + ##### [Version 3.7.4](https://github.com/Codeinwp/visualizer/compare/v3.7.3...v3.7.4) (2022-02-07) - Fix multiple lazy load charts issue diff --git a/classes/Visualizer/Plugin.php b/classes/Visualizer/Plugin.php index 4006b64b8..910daf6b0 100644 --- a/classes/Visualizer/Plugin.php +++ b/classes/Visualizer/Plugin.php @@ -28,7 +28,7 @@ class Visualizer_Plugin { const NAME = 'visualizer'; - const VERSION = '3.7.4'; + const VERSION = '3.7.5'; // custom post types const CPT_VISUALIZER = 'visualizer'; diff --git a/css/media.css b/css/media.css index 7e3b1d873..3dc23cc27 100644 --- a/css/media.css +++ b/css/media.css @@ -1,5 +1,5 @@ /* - Version: 3.7.4 + Version: 3.7.5 */ #visualizer-library-view { padding: 30px 10px 10px 30px; diff --git a/index.php b/index.php index 5b3d0488b..7021d1919 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ Plugin Name: Visualizer: Tables and Charts for WordPress Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/ Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases. - Version: 3.7.4 + Version: 3.7.5 Author: Themeisle Author URI: http://themeisle.com Requires at least: 3.5 diff --git a/package.json b/package.json index 73d6d92af..8ee4e476b 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "visualizer", - "version": "3.7.4", + "version": "3.7.5", "description": "Visualizer Lite", "repository": { "type": "git", diff --git a/readme.txt b/readme.txt index d5355e4ce..7a3b7f11a 100755 --- a/readme.txt +++ b/readme.txt @@ -163,6 +163,14 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have ` == Changelog == +##### [Version 3.7.5](https://github.com/Codeinwp/visualizer/compare/v3.7.4...v3.7.5) (2022-03-17) + +- Fix display long hAxis text issue +- Improve features discoverability. + + + + ##### [Version 3.7.4](https://github.com/Codeinwp/visualizer/compare/v3.7.3...v3.7.4) (2022-02-07) - Fix multiple lazy load charts issue