Merge pull request #474 from contactashish13/test-3.3.0

Test 3.3.0

Author: contactashish13

classes/Visualizer/Module.php

@@ -600,6 +600,21 @@ protected static function hasChartType( $type ) {
 		return $q->found_posts > 0;
 	}
 
+	/**
+	 * Determines how many charts have been created.
+	 */
+	protected static function numberOfCharts() {
+		$args = array(
+			'post_type'      => Visualizer_Plugin::CPT_VISUALIZER,
+			'fields'        => 'ids',
+			'post_status'   => 'publish',
+			'posts_per_page'    => 300,
+		);
+
+		$q = new WP_Query( $args );
+		return $q->found_posts;
+	}
+
 	/**
 	 * Checks if the PRO version is active.
 	 *

classes/Visualizer/Module/Setup.php

@@ -155,7 +155,11 @@ public function onActivation( $plugin ) {
 		}
 
 		if ( $plugin === VISUALIZER_BASENAME ) {
-			wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) );
+			if ( Visualizer_Module::numberOfCharts() > 0 ) {
+				wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) );
+			} else {
+				wp_redirect( admin_url( 'admin.php?page=viz-support' ) );
+			}
 			exit();
 		}
 	}

classes/Visualizer/Render/Library.php

@@ -40,7 +40,10 @@ protected function _toHTML() {
 		echo '<div id="visualizer-icon" class="icon32"><br></div>';
 		echo '<h2>';
 		esc_html_e( 'Visualizer Library', 'visualizer' );
-		echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>';
+		echo ' <a href="javascript:;" class="add-new-h2 add-new-chart">', esc_html__( 'Add New', 'visualizer' ), '</a>';
+		if ( Visualizer_Module::is_pro() ) {
+			echo ' <a href="' . admin_url( 'options-general.php' ) . '" class="page-title-action">', esc_html__( 'License Settings', 'visualizer' ), '</a>';
+		}
 		echo '</h2>';
 		$this->_renderMessages();
 		$this->_renderLibrary();
@@ -142,7 +145,7 @@ private function _renderLibrary() {
 			echo '<div id="visualizer-library" class="visualizer-clearfix">';
 			echo '<div class="visualizer-chart">';
 			echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">';
-			echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '<p><h2><a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a></h2></p></div>';
+			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>';
 			echo '</div>';
 			echo '<div class="visualizer-chart-footer visualizer-clearfix">';
 			echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';

js/library.js

@@ -61,7 +61,7 @@
             }
         });
 
-        $('.add-new-h2, .add-new-chart').click(function () {
+        $('.add-new-chart').click(function () {
             var wnd = window,
                 view = new vmv.Chart({action: vu.create});
 

templates/docs.php

@@ -22,6 +22,8 @@
 				<?php if ( ! $is_pro ) { ?>
 				<p>We have many more features and charts, and offer email & chat support if you purchase our <a href="<?php echo Visualizer_Plugin::PRO_TEASER_URL; ?>">Pro Version</a>.</p>
 				<?php } ?>
+
+				<p>Ready to begin? Let's <a href="<?php echo admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' ); ?>">create a chart!
 			</div>
 		</div>
 	</div>