fix: removes admin bar traffic node

Codeinwp · Jul 10, 2019 · 0e21fe8 · 0e21fe8
1 parent 0859f70
commit 0e21fe8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 61 deletions.
diff --git a/assets/vue/components/main.vue b/assets/vue/components/main.vue
@@ -75,6 +75,7 @@
 						<li><span class="dashicons dashicons-yes"></span>{{strings.upgrade.reason_1}}</li>
 						<li><span class="dashicons dashicons-yes"></span>{{strings.upgrade.reason_2}}</li>
 						<li><span class="dashicons dashicons-yes"></span>{{strings.upgrade.reason_3}}</li>
+						<li><span class="dashicons dashicons-yes"></span>{{strings.upgrade.reason_4}}</li>
 					</ul>
 				</div>
 				<div class="card-footer  ">

diff --git a/inc/admin.php b/inc/admin.php
@@ -33,10 +33,7 @@ public function __construct() {
 		add_action( 'admin_notices', array( $this, 'add_notice' ) );
 		add_action( 'admin_notices', array( $this, 'add_notice_upgrade' ) );
 		add_filter( 'admin_body_class', array( $this, 'add_body_class' ) );
-		add_action( 'admin_head', array( $this, 'add_admin_css' ) );
-
 		add_action( 'wp_enqueue_scripts', array( $this, 'frontend_scripts' ) );
-		add_action( 'admin_bar_menu', array( $this, 'add_traffic_node' ), 9999 );
 		add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch' ), 10, 2 );
 		add_action( 'optml_daily_sync', array( $this, 'daily_sync' ) );
 		add_action( 'wp_head', array( $this, 'generator' ) );
@@ -540,9 +537,10 @@ private function get_dashboard_strings() {
 			),
 			'upgrade'                        => array(
 				'title'    => __( 'Upgrade to Pro', 'optimole-wp' ),
-				'reason_1' => __( 'Faster CDN ( 130+ locations )', 'optimole-wp' ),
+				'reason_1' => __( 'Faster CDN ( 180+ locations )', 'optimole-wp' ),
 				'reason_2' => __( 'Larger traffic bandwidth', 'optimole-wp' ),
 				'reason_3' => __( 'Optimize more images', 'optimole-wp' ),
+				'reason_4' => __( 'Custom domain', 'optimole-wp' ),
 				'cta'      => __( 'View plans', 'optimole-wp' ),
 			),
 			'options_strings'                => array(
@@ -644,61 +642,4 @@ private function get_dashboard_strings() {
 		);
 	}
 
-	/**
-	 * Add admin css
-	 */
-	public function add_admin_css() {
-		?>
-		<style type="text/css">
-			#wpadminbar .optml-meter .ab-icon {
-				float: right !important;
-				margin-left: 3px;
-			}
-
-			#wpadminbar .optml-meter .ab-icon:before {
-				content: "\f534";
-				font-size: 80%;
-				color: #D54222 !important;
-			}
-		</style>
-		<?php
-	}
-
-	/**
-	 * Add top admin bar notice of traffic quota/usage.
-	 *
-	 * @param WP_Admin_Bar $wp_admin_bar Admin bar resource.
-	 */
-	public function add_traffic_node( $wp_admin_bar ) {
-		if ( ! is_user_logged_in() ) {
-			return;
-		}
-		if ( ! $this->settings->is_connected() ) {
-			return;
-		}
-		$should_load = $this->settings->get( 'admin_bar_item' );
-
-		$service_data = $this->settings->get( 'service_data' );
-		if ( empty( $service_data ) ) {
-			return;
-		}
-		$traffic = floatval( ( $service_data['usage'] / 1000 ) );
-		$quota   = floatval( ( $service_data['quota'] / 1000 ) );
-		if ( $traffic > $quota ) {
-			$text = sprintf( __( '%sGB overage', 'optimole-wp' ), number_format( ( $traffic - $quota ), 2 ) ) . '<span class="ab-icon"></span>';
-		} else {
-			$text = sprintf( __( '%1$s of %2$sGB', 'optimole-wp' ), number_format( $traffic, 1 ), number_format( $quota, 0 ) );
-		}
-
-		$args = array(
-			'id'    => 'optml_image_quota',
-			'title' => 'Optimole' . __( ' Quota', 'optimole-wp' ) . ': ' . $text,
-			'href'  => admin_url( 'upload.php?page=optimole' ),
-			'meta'  => array(
-				'target' => '_blank',
-				'class'  => 'optml-meter ' . ( $should_load !== 'enabled' ? 'hidden' : '' ),
-			),
-		);
-		$wp_admin_bar->add_node( $args );
-	}
 }