Merge pull request #9 from socketlabs/usr/matt.soler/bugfixes

Usr/matt.soler/bugfixes

Author: BernardHarrison

admin/class-socketlabs-admin.php

@@ -93,20 +93,21 @@ public function enqueue_scripts() {
 		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/socketlabs-admin.js', array( 'jquery' ), $this->version, false );
 	}
 
-	/**
-	 * Add the admin submenu options.
-	 *
-	 * @since    1.0.0
-	 */
-	public function admin_menu() {
-		add_submenu_page(
-			get_admin_page_parent(), 
-			'SocketLabs Options', 
-			'SocketLabs', 
-			'administrator', 
-			$this->plugin_name, 
-			array($this, 'create_admin_page') );
-	}
+    /**
+     * Register a custom menu page.
+     */
+    public function admin_menu() {
+        add_menu_page(
+            __( 'SocketLabs', 'textdomain' ),                           //page_title
+            'SocketLabs',                                               //menu_title
+            'administrator',                                            //capability
+            'socketlabs/admin/partials/socketlabs-admin-display.php',   //menu_slug
+            '',                                                         //callback
+            plugins_url( 'socketlabs/admin/images/logo-wp-icon.png' ),  //icon_url
+            ''                                                          //position
+            );
+    }
+    //add_action( 'admin_menu', 'register_socketlabs_menu' );
 
 	/**
 	 * Create the admin UI.

admin/css/socketlabs-admin.css

@@ -1,6 +1,7 @@
-#wpcontent{
-    /*padding-left:0;*/
+#wpcontent:has(#sl-plugin-container){
+    padding-left:0;
 }
+
 .sl-right {
 	float: right;
 }
@@ -186,7 +187,7 @@
 }
 
 .sl-masthead__inside-container {
-	padding:.375rem 0;
+	padding:1rem 0;
 	margin:0 auto;
 	width:100%;
 	max-width:45rem;
@@ -196,7 +197,7 @@
 	padding:.3125rem 0 0
 }
 .sl-masthead__logo {
-	height:1.8125rem;
+	height:1.5rem;
 }
 .sl-masthead__logo-link {
 	display:inline-block;
@@ -426,4 +427,4 @@
 
 .sl-section-header__actions {
 	line-height: 1.75rem;
-}
+}

admin/images/logo-wp-icon.png

@@ -16,7 +16,7 @@
     <div class="sl-masthead">
         <div class="sl-masthead__inside-container">
             <div class="sl-masthead__logo-container">
-                <img class="sl-masthead__logo" src="https://www.socketlabs.com/assets/socketlabs-logo1.png" alt="SocketLabs">
+                <img class="sl-masthead__logo" src="<?php echo plugins_url( 'socketlabs/admin/images/logo-wp.svg' ) ?>" alt="SocketLabs">
             </div>
         </div>
     </div>

admin/images/logo-wp.svg

@@ -16,7 +16,7 @@
  * Plugin Name:       SocketLabs
  * Plugin URI:        https://github.com/socketlabs/wordpress
  * Description:       Send emails using your SocketLabs account.
- * Version:           1.1.0
+ * Version:           1.1.1
  * Author:            SocketLabs
  * Author URI:        https://socketlabs.com/
  * License:           GPL-2.0+
@@ -52,7 +52,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define('SOCKETLABS_VERSION', '1.1.0');
+define('SOCKETLABS_VERSION', '1.1.1');
 define("SOCKETLABS_OPTION_GROUP", 'socketlabs');
 define("SOCKETLABS_API_KEY", 'socketlabs_api_key');
 define("SOCKETLABS_SERVER_ID", 'socketlabs_server_id');