Merge pull request #471 from contactashish13/issue-464

Create main menu with support page

Author: contactashish13

classes/Visualizer/Module/Admin.php

@@ -582,9 +582,33 @@ public function setupVisualizerTab( $tabs ) {
 	 * @access public
 	 */
 	public function registerAdminMenu() {
-		$title              = esc_html__( 'Visualizer Library', 'visualizer' );
-		$callback           = array( $this, 'renderLibraryPage' );
-		$this->_libraryPage = add_submenu_page( 'upload.php', $title, $title, 'edit_posts', Visualizer_Plugin::NAME, $callback );
+		$svg_base64_icon = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzdweCIgaGVpZ2h0PSI3N3B4IiB2aWV3Qm94PSIwIDAgNzcgNzciIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5Db21iaW5lZCBTaGFwZTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxnIGlkPSJQcm9kdWN0LVBhZ2UiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJXb3JkUHJlc3MtcGx1Z2lucyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE5MC4wMDAwMDAsIC00MzUuMDAwMDAwKSIgZmlsbD0iIzM5QzNEMiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0yMjguNSw1MTIgQzIwNy4yMzcwMzcsNTEyIDE5MCw0OTQuNzYyOTYzIDE5MCw0NzMuNSBDMTkwLDQ1Mi4yMzcwMzcgMjA3LjIzNzAzNyw0MzUgMjI4LjUsNDM1IEMyNDkuNzYyOTYzLDQzNSAyNjcsNDUyLjIzNzAzNyAyNjcsNDczLjUgQzI2Nyw0OTQuNzYyOTYzIDI0OS43NjI5NjMsNTEyIDIyOC41LDUxMiBaIE0yNDYuODQzNzUsNDgzLjU5MjA1OSBMMjE1LjYyNSw0ODMuNTkyMDU5IEwyMTUuNjI1LDQ2MC44MjY1NDQgQzIxNS42MjUsNDYwLjE2NDU0NyAyMTUuMTA3NTc4LDQ1OS42MjgzNTkgMjE0LjQ2ODc1LDQ1OS42MjgzNTkgTDIxMi4xNTYyNSw0NTkuNjI4MzU5IEMyMTEuNTE3NDIyLDQ1OS42MjgzNTkgMjExLDQ2MC4xNjQ1NDcgMjExLDQ2MC44MjY1NDQgTDIxMSw0ODUuOTg4NDI5IEMyMTEsNDg3LjMxMTY3NCAyMTIuMDM1NTY2LDQ4OC4zODQ3OTggMjEzLjMxMjUsNDg4LjM4NDc5OCBMMjQ2Ljg0Mzc1LDQ4OC4zODQ3OTggQzI0Ny40ODI1NzgsNDg4LjM4NDc5OCAyNDgsNDg3Ljg0ODYxMSAyNDgsNDg3LjE4NjYxMyBMMjQ4LDQ4NC43OTAyNDQgQzI0OCw0ODQuMTI4MjQ2IDI0Ny40ODI1NzgsNDgzLjU5MjA1OSAyNDYuODQzNzUsNDgzLjU5MjA1OSBaIE0yNDQuNTMxMjUsNDYyLjAyNDcyOSBMMjM1Ljk5OTU3LDQ2Mi4wMjQ3MjkgQzIzNC40NTQ1MzEsNDYyLjAyNDcyOSAyMzMuNjgwNTY2LDQ2My45NjA1NDcgMjM0Ljc3MzIyMyw0NjUuMDkyODMyIEwyMzcuMTE0NjI5LDQ2Ny41MTkxNTYgTDIzMS44MTI1LDQ3My4wMTQzMzIgTDIyNi41MTAzNzEsNDY3LjUxOTkwNSBDMjI1LjYwNzA1MSw0NjYuNTgzODIzIDIyNC4xNDI5NDksNDY2LjU4MzgyMyAyMjMuMjQwMzUyLDQ2Ny41MTk5MDUgTDIxOC4yNzY0MjYsNDcyLjY2Mzg2MyBDMjE3LjgyNDc2Niw0NzMuMTMxOTA0IDIxNy44MjQ3NjYsNDczLjg5MDUwNSAyMTguMjc2NDI2LDQ3NC4zNTg1NDYgTDIxOS45MTEwNzQsNDc2LjA1MjQ4IEMyMjAuMzYyNzM0LDQ3Ni41MjA1MjEgMjIxLjA5NDc4NSw0NzYuNTIwNTIxIDIyMS41NDY0NDUsNDc2LjA1MjQ4IEwyMjQuODc1LDQ3Mi42MDI0NTYgTDIzMC4xNzcxMjksNDc4LjA5Njg4MyBDMjMxLjA4MDQ0OSw0NzkuMDMyOTY1IDIzMi41NDQ1NTEsNDc5LjAzMjk2NSAyMzMuNDQ3MTQ4LDQ3OC4wOTY4ODMgTDI0MC4zODQ2NDgsNDcwLjkwNzc3MyBMMjQyLjcyNjA1NSw0NzMuMzM0MDk4IEMyNDMuODE4NzExLDQ3NC40NjYzODIgMjQ1LjY4Njc3Nyw0NzMuNjY0MzQ3IDI0NS42ODY3NzcsNDcyLjA2MzI3MyBMMjQ1LjY4Njc3Nyw0NjMuMjIyOTE0IEMyNDUuNjg3NSw0NjIuNTYwOTE3IDI0NS4xNzAwNzgsNDYyLjAyNDcyOSAyNDQuNTMxMjUsNDYyLjAyNDcyOSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiPjwvcGF0aD4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==';
+
+		$this->_libraryPage = add_menu_page( __( 'Visualizer', 'visualizer' ), __( 'Visualizer', 'visualizer' ), 'edit_posts', Visualizer_Plugin::NAME, array( $this, 'renderLibraryPage' ), $svg_base64_icon, 99.7666 );
+
+		add_submenu_page(
+			Visualizer_Plugin::NAME,
+			__( 'Chart Library', 'visualizer' ),
+			__( 'Chart Library', 'visualizer' ),
+			'edit_posts',
+			admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME )
+		);
+		add_submenu_page(
+			Visualizer_Plugin::NAME,
+			__( 'Add New Chart', 'visualizer' ),
+			__( 'Add New Chart', 'visualizer' ),
+			'edit_posts',
+			admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME . '&vaction=addnew' )
+		);
+		add_submenu_page(
+			Visualizer_Plugin::NAME,
+			__( 'Support', 'visualizer' ),
+			__( 'Support', 'visualizer' ) . '<span class="dashicons dashicons-editor-help more-features-icon" style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;"></span>',
+			'edit_posts',
+			'viz-support',
+			array( $this, 'renderSupportPage' )
+		);
+		remove_submenu_page( Visualizer_Plugin::NAME, Visualizer_Plugin::NAME );
 	}
 
 	/**
@@ -643,6 +667,18 @@ private function getQuery() {
 		return $q;
 	}
 
+	/**
+	 * Renders support page.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @access public
+	 */
+	public function renderSupportPage() {
+		wp_enqueue_style( 'visualizer-upsell', VISUALIZER_ABSURL . 'css/upsell.css', array(), Visualizer_Plugin::VERSION );
+		include_once VISUALIZER_ABSPATH . '/templates/support.php';
+	}
+
 	/**
 	 * Renders visualizer library page.
 	 *
@@ -724,20 +760,22 @@ public function renderLibraryPage() {
 				'map_api_key' => get_option( 'visualizer-map-api-key' ),
 				'charts' => $charts,
 				'urls'   => array(
-					'base'   => add_query_arg( 'vpage', false ),
+					'base'   => add_query_arg( array( 'vpage' => false, 'vaction' => false ) ),
 					'create' => add_query_arg(
 						array(
 							'action'  => Visualizer_Plugin::ACTION_CREATE_CHART,
 							'library' => 'yes',
 							'type'      => isset( $_GET['type'] ) ? $_GET['type'] : '',
 							'chart-library'      => isset( $_GET['chart-library'] ) ? $_GET['chart-library'] : '',
+							'vaction' => false,
 						),
 						$ajaxurl
 					),
 					'edit'   => add_query_arg(
 						array(
 							'action'  => Visualizer_Plugin::ACTION_EDIT_CHART,
 							'library' => 'yes',
+							'vaction' => false,
 						),
 						$ajaxurl
 					),
@@ -754,7 +792,7 @@ public function renderLibraryPage() {
 		$render->custom_css     = $css;
 		$render->pagination = paginate_links(
 			array(
-				'base'    => add_query_arg( 'vpage', '%#%' ),
+				'base'    => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ),
 				'format'  => '',
 				'current' => $page,
 				'total'   => $query->max_num_pages,
@@ -782,7 +820,7 @@ public function getPluginActionLinks( $links, $file ) {
 				$links,
 				sprintf(
 					'<a href="%s">%s</a>',
-					admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ),
+					admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ),
 					esc_html__( 'Library', 'visualizer' )
 				)
 			);
@@ -807,7 +845,7 @@ public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
 		if ( $plugin_file === plugin_basename( VISUALIZER_BASEFILE ) ) {
 			// knowledge base link
 			$plugin_meta[] = sprintf(
-				'<a href="https://docs.themeisle.com/category/657-visualizer" target="_blank">%s</a>',
+				'<a href="' . VISUALIZER_MAIN_DOC . '" target="_blank">%s</a>',
 				esc_html__( 'Docs', 'visualizer' )
 			);
 			// flattr link

classes/Visualizer/Module/Chart.php

@@ -380,7 +380,7 @@ public function deleteChart() {
 				)
 			);
 		}
-		wp_redirect( wp_get_referer() );
+		wp_redirect( remove_query_arg( 'vaction', wp_get_referer() ) );
 		exit;
 	}
 
@@ -1040,7 +1040,7 @@ public function cloneChart() {
 				$success = $chart && $chart->post_type === Visualizer_Plugin::CPT_VISUALIZER;
 			}
 		}
-		$redirect = wp_get_referer();
+		$redirect = remove_query_arg( 'vaction', wp_get_referer() );
 		if ( $success ) {
 			$new_chart_id = wp_insert_post(
 				array(
@@ -1061,8 +1061,9 @@ public function cloneChart() {
 					array(
 						'page' => 'visualizer',
 						'type' => filter_input( INPUT_GET, 'type' ),
+						'vaction' => false,
 					),
-					admin_url( 'upload.php' )
+					admin_url( 'admin.php' )
 				);
 			}
 		}

classes/Visualizer/Module/Setup.php

@@ -155,7 +155,7 @@ public function onActivation( $plugin ) {
 		}
 
 		if ( $plugin === VISUALIZER_BASENAME ) {
-			wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) );
+			wp_redirect( admin_url( 'admin.php?page=' . Visualizer_Plugin::NAME ) );
 			exit();
 		}
 	}

classes/Visualizer/Render/Library.php

@@ -82,7 +82,7 @@ private function _renderLibrary() {
 		echo '<div id="visualizer-types" class="visualizer-clearfix">';
 		echo '<ul class="subsubsub">';
 		// All tab.
-		echo '<li class="visualizer-list-item all"><a class="' . ( ! isset( $_GET['type'] ) || empty( $_GET['type'] ) ? 'current' : '' ) . '" href="', esc_url( add_query_arg( array( 'vpage' => false, 'type' => false, 's' => false ) ) ), '">' . __( 'All', 'visualizer' ) . '</a> | </li>';
+		echo '<li class="visualizer-list-item all"><a class="' . ( ! isset( $_GET['type'] ) || empty( $_GET['type'] ) ? 'current' : '' ) . '" href="', esc_url( add_query_arg( array( 'vpage' => false, 'type' => false, 'vaction' => false, 's' => false ) ) ), '">' . __( 'All', 'visualizer' ) . '</a> | </li>';
 		foreach ( $this->types as $type => $array ) {
 			if ( ! is_array( $array ) ) {
 				// support for old pro
@@ -94,6 +94,7 @@ private function _renderLibrary() {
 					array(
 						'type'  => $type,
 						'vpage' => false,
+						'vaction' => false,
 						's' => false,
 					)
 				)

classes/Visualizer/Render/Page/Data.php

@@ -440,7 +440,7 @@ class="dashicons dashicons-lock"></span></h2>
 			</li>
 
 			<li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-docs">
-				<h2><span class="dashicons dashicons-editor-help"></span><a href="https://docs.themeisle.com/category/657-visualizer" target="_blank"><?php _e( 'Docs', 'visualizer' ); ?></a></h2>
+				<h2><span class="dashicons dashicons-editor-help"></span><a href="<?php echo VISUALIZER_MAIN_DOC; ?>" target="_blank"><?php _e( 'Docs', 'visualizer' ); ?></a></h2>
 			</li>
 
 			<?php $this->getPermissionsLink( $this->chart->ID ); ?>

classes/Visualizer/Render/Page/Types.php

@@ -129,6 +129,7 @@ protected function _renderToolbar() {
 		}
 		?>
 		<input type="submit" class="button button-primary button-large push-right" value="<?php esc_attr_e( 'Next', 'visualizer' ); ?>">
+		<input type="button" class="button button-secondary button-large push-left viz-abort" value="<?php esc_attr_e( 'Cancel', 'visualizer' ); ?>">
 		<?php
 	}
 }

css/upsell.css

@@ -0,0 +1,176 @@
+#viz-features .pro-features-header {
+	padding: 20px 10px;
+	border-top: 5px solid #252b37;
+	background: #fff;
+}
+
+#viz-features .logo {
+	display: inline-block;
+	margin: 0 0 0 20px;
+	padding: 0 0 0 70px;
+	color: #3c3c3c;
+	background: url(../img/wppr-logo.png) no-repeat left center;
+	font-family: "Open Sans", sans-serif;
+	font-size: 2em;
+	font-weight: 700;
+	line-height: 60px;
+	letter-spacing: -1px;
+}
+
+#viz-features .slogan {
+	display: inline-block;
+	margin: 0 0 0 5px;
+	padding: 0;
+	color: #858585;
+	font-family: "Open Sans", sans-serif;
+	font-size: 17px;
+	line-height: 3.5;
+}
+
+#viz-features .slogan a {
+	color: #858585;
+	font-weight: 600;
+	font-style: italic;
+	text-decoration: none;
+	transition: all 0.250s ease-in-out;
+}
+
+#viz-features .slogan a:hover {
+	color: #ff6160;
+}
+
+#viz-features .slogan a:focus {
+	outline: none;
+	box-shadow: none;
+}
+
+#viz-features .header-btns {
+	float: right;
+	margin: 7px 20px;
+	text-align: right;
+}
+
+#viz-features .header-btns .buy-now {
+	display: inline-block;
+	margin-top: 2px;
+	margin-right: 5px;
+	padding: 15px 25px;
+	border-radius: 3px;
+	border-radius: 3px;
+	color: #fff;
+	background: #e33b3f;
+	font-family: "Open Sans", sans-serif;
+	font-size: 18px;
+	font-weight: bold;
+	text-decoration: none;
+	text-transform: uppercase;
+	transition: all 0.250s ease-in-out;
+}
+
+#viz-features .header-btns .buy-now:hover {
+	background: #252b37;
+}
+
+#viz-features .header-btns .buy-now .dashicons {
+	padding-right: 3px;
+}
+
+#viz-features .pro-features-header,
+#viz-features .pro-feature {
+	display: block;
+	margin: 10px;
+	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+}
+
+#viz-features .pro-feature .pro-feature-features,
+#viz-features .pro-feature .pro-feature-image {
+	display: table-cell;
+	margin: 0;
+	vertical-align: middle;
+}
+
+#viz-features .pro-feature .pro-feature-features {
+	box-sizing: border-box;
+	padding: 30px;
+}
+
+#viz-features .pro-feature .pro-feature-image {
+	width: 470px;
+}
+
+#viz-features .pro-feature .pro-feature-features h2 {
+	margin: 0 0 20px;
+	font-size: 28px;
+}
+
+#viz-features .pro-feature .pro-feature-features h4 {
+	margin: 0 0 10px;
+	font-size: 20px;
+}
+
+#viz-features .pro-feature .pro-feature-features p {
+	margin: 0 0 15px;
+	font-size: 16px;
+	line-height: 1.5;
+}
+
+#viz-features .pro-feature .pro-feature-image img {
+	width: 100%;
+	height: auto;
+}
+
+@media screen and (max-width: 1200px) {
+	#viz-features .pro-feature .pro-feature-features,
+	#viz-features .pro-feature .pro-feature-image {
+		display: block;
+	}
+
+	#viz-features .pro-feature .pro-feature-image {
+		width: 470px;
+		margin: 0 auto 20px;
+		text-align: center;
+	}
+
+	#viz-features .slogan {
+		display: none;
+	}
+}
+
+@media screen and (max-width: 1100px) {
+	#viz-features {
+		text-align: center;
+	}
+
+	#viz-features .logo {
+		margin-left: 0;
+	}
+
+	#viz-features .header-btns {
+		display: block;
+		float: none;
+		margin: 0 0 10px 0;
+		text-align: center;
+	}
+}
+
+@media screen and (max-width: 782px) {
+	#cwp_form #header .button {
+		padding: 0 4px 1px !important;
+		font-size: 11px !important;
+	}
+
+	#cwp_form #header .logo h2 {
+		margin: 0 !important;
+		padding: 0 !important;
+	}
+
+	#viz-features .pro-feature .pro-feature-image {
+		width: 100%;
+	}
+}
+
+#viz-features .pro-feature .pro-feature-inner {
+	display: table;
+	width: 100%;
+	background: #fff;
+}