- Improves menu expansion code

::

lib/Config/Menu.php

@@ -113,7 +113,7 @@ class Menu {
       )
     );
     add_submenu_page(
-      true,
+      'admin.php?page=mailpoet-subscribers',
       $this->setPageTitle( __('Import')),
       __('Import'),
       'manage_options',
@@ -123,6 +123,7 @@ class Menu {
         'import'
       )
     );
+
     add_submenu_page(
       true,
       $this->setPageTitle(__('Export')),
@@ -393,12 +394,14 @@ class Menu {
   function import() {
     $import = new BootStrapMenu('import');
     $data = $import->bootstrap();
+    $data['sub_menu'] = 'mailpoet-subscribers';
     echo $this->renderer->render('subscribers/importExport/import.html', $data);
   }
 
   function export() {
     $export = new BootStrapMenu('export');
     $data = $export->bootstrap();
+    $data['sub_menu'] = 'mailpoet-subscribers';
     echo $this->renderer->render('subscribers/importExport/export.html', $data);
   }
 
@@ -416,7 +419,8 @@ class Menu {
       'styles' => FormRenderer::getStyles($form),
       'date_types' => Block\Date::getDateTypes(),
       'date_formats' => Block\Date::getDateFormats(),
-      'month_names' => Block\Date::getMonthNames()
+      'month_names' => Block\Date::getMonthNames(),
+      'sub_menu' => 'mailpoet-forms'
     );
 
     echo $this->renderer->render('form/editor.html', $data);

views/form/editor.html

@@ -212,13 +212,6 @@
   )%>
 
   <script type="text/javascript">
-    jQuery('#toplevel_page_mailpoet')
-      .addClass('wp-has-current-submenu')
-      .find('a[href$="mailpoet-forms"]')
-      .addClass('current')
-      .parent()
-      .addClass('current');
-
     var mailpoet_segments = <%= json_encode(segments) %>;
 
     var mailpoet_default_fields = [

views/layout.html

@@ -1,3 +1,14 @@
+<% if sub_menu %>
+<script type="text/javascript">
+jQuery('#toplevel_page_mailpoet')
+  .addClass('wp-has-current-submenu')
+  .find('a[href$="<%= sub_menu %>"]')
+  .addClass('current')
+  .parent()
+  .addClass('current');
+</script>
+<% endif %>
+
 <!-- system notices -->
 <div id="mailpoet_notice_system" class="mailpoet_notice" style="display:none;"></div>
 

views/subscribers/importExport/export.html

@@ -108,12 +108,6 @@
 <%= stylesheet('importExport.css') %>
 
 <script type="text/javascript">
-  jQuery('#toplevel_page_mailpoet')
-    .addClass('wp-has-current-submenu')
-    .find('a[href$="mailpoet-subscribers"]')
-    .addClass('current')
-    .parent()
-    .addClass('current');
   var
     segments = <%= segments|raw %>,
     segmentsWithConfirmedSubscribers =

views/subscribers/importExport/import.html

@@ -18,12 +18,6 @@
 <%= stylesheet('importExport.css') %>
 
 <script type="text/javascript">
-  jQuery('#toplevel_page_mailpoet')
-   .addClass('wp-has-current-submenu')
-   .find('a[href$="mailpoet-subscribers"]')
-   .addClass('current')
-   .parent()
-   .addClass('current');
   var
     maxPostSize = '<%= maxPostSize %>',
     maxPostSizeBytes = '<%= maxPostSizeBytes %>',