add options page;show WP2Static active

elementor · May 9, 2020 · c657c83 · c657c83
1 parent 1f74797
commit c657c83
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -4,8 +4,6 @@
 
 class Controller {
     public function run() : void {
-        add_filter( 'wp2static_add_menu_items', [ 'WP2StaticBunnyCDN\Controller', 'addSubmenuPage' ] );
-
         add_action(
             'admin_post_wp2static_bunnycdn_save_options',
             [ $this, 'saveOptionsFromUI' ],
@@ -20,6 +18,15 @@ public function run() : void {
             1
         );
 
+        add_action(
+            'admin_menu',
+            [ $this, 'addOptionsPage' ],
+            15,
+            1
+        );
+
+        add_filter('parent_file', [ $this, 'setActiveParentMenu' ]);
+
         add_action(
             'wp2static_post_deploy_trigger',
             [ 'WP2StaticBunnyCDN\BunnyCDN', 'bunnycdn_purge_cache' ],
@@ -154,7 +161,7 @@ public static function activate_for_single_site() : void {
 
         do_action(
             'wp2static_register_addon',
-            'wp2static-addon-bunnycdn',
+            'wp2static_addon_bunnycdn',
             'deploy',
             'BunnyCDN Deployment',
             'https://wp2static.com/addons/bunnycdn/',
@@ -280,5 +287,25 @@ public static function getValue( string $name ) : string {
 
         return $option_value;
     }
+
+    public function addOptionsPage() {
+         add_submenu_page(
+             null,
+             'BunnyCDN Deployment Options',
+             'BunnyCDN Deployment Options',
+             'manage_options',
+             'wp2static_addon_bunnycdn',
+             [ $this, 'renderBunnyCDNPage' ]
+         );
+    }
+
+    // ensure WP2Static menu is active for addon
+    public function setActiveParentMenu() {
+            global $plugin_page;
+
+            if ('wp2static_addon_bunnycdn' === $plugin_page) {
+                $plugin_page = 'wp2static';
+            }
+    }
 }
 
diff --git a/views/bunnycdn-page.php b/views/bunnycdn-page.php
@@ -1,7 +1,5 @@
 <h2>BunnyCDN Deployment Options</h2>
 
-<h3>BunnyCDN</h3>
-
 <form
     name="wp2static-bunnycdn-save-options"
     method="POST"