| @@ -18,8 +18,9 @@ | ||
| 18 | 18 | use Automattic\Jetpack\Admin_UI\Admin_Menu; |
| 19 | 19 | use Automattic\Jetpack\Connection\Manager as Connection_Manager; |
| 20 | 20 | use Automattic\Jetpack\Connection\XMLRPC_Async_Call; |
| 21 | 21 | use Automattic\Jetpack\Newsletter\Settings as Newsletter_Settings; |
| 22 | +use Automattic\Jetpack\Newsletter\Urls as Newsletter_Urls; | |
| 22 | 23 | use Automattic\Jetpack\Redirect; |
| 23 | 24 | use Automattic\Jetpack\Status; |
| 24 | 25 | use Automattic\Jetpack\Status\Host; |
| 25 | 26 | |
| @@ -149,9 +150,9 @@ | ||
| 149 | 150 | // Customize the configuration URL to lead to the Subscriptions settings. |
| 150 | 151 | add_filter( |
| 151 | 152 | 'jetpack_module_configuration_url_subscriptions', |
| 152 | 153 | function () { |
| 153 | - return Jetpack::admin_url( array( 'page' => 'jetpack#/newsletter' ) ); | |
| 154 | + return Newsletter_Urls::get_newsletter_settings_url(); | |
| 154 | 155 | } |
| 155 | 156 | ); |
| 156 | 157 | |
| 157 | 158 | // Track categories created through the category editor page |
| @@ -1076,8 +1077,10 @@ | ||
| 1076 | 1077 | 'jetpack-menu-jetpack-manage-subscribers', |
| 1077 | 1078 | array( 'site' => $blog_id ? $blog_id : $status->get_site_suffix() ) |
| 1078 | 1079 | ); |
| 1079 | 1080 | |
| 1081 | + $position = defined( Admin_Menu::class . '::POSITION_EXTERNAL' ) ? Admin_Menu::POSITION_EXTERNAL : 100; | |
| 1082 | + | |
| 1080 | 1083 | Admin_Menu::add_menu( |
| 1081 | 1084 | __( 'Subscribers', 'jetpack' ), |
| 1082 | 1085 | __( 'Subscribers', 'jetpack' ) . ' <span aria-hidden="true">↗</span>', |
| 1083 | 1086 | 'manage_options', |
| @@ -1082,9 +1085,10 @@ | ||
| 1082 | 1085 | __( 'Subscribers', 'jetpack' ) . ' <span aria-hidden="true">↗</span>', |
| 1083 | 1086 | 'manage_options', |
| 1084 | 1087 | esc_url( $link ), |
| 1085 | 1088 | null, |
| 1086 | - 15 | |
| 1089 | + $position, | |
| 1090 | + array( 'key' => 'jetpack-subscribers' ) | |
| 1087 | 1091 | ); |
| 1088 | 1092 | } |
| 1089 | 1093 | |
| 1090 | 1094 | /** |
| @@ -1124,7 +1128,8 @@ | ||
| 1124 | 1128 | require __DIR__ . '/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php'; |
| 1125 | 1129 | require __DIR__ . '/subscriptions/subscribe-overlay/class-jetpack-subscribe-overlay.php'; |
| 1126 | 1130 | require __DIR__ . '/subscriptions/subscribe-floating-button/class-jetpack-subscribe-floating-button.php'; |
| 1127 | 1131 | require __DIR__ . '/subscriptions/newsletter-widget/class-jetpack-newsletter-dashboard-widget.php'; |
| 1132 | +require_once __DIR__ . '/subscriptions/email-design-editor/class-jetpack-email-design-editor.php'; | |
| 1128 | 1133 | |
| 1129 | 1134 | require_once __DIR__ . '/subscriptions/abilities/class-newsletter-abilities.php'; |
| 1130 | 1135 | \Automattic\Jetpack\Plugin\Abilities\Newsletter_Abilities::init(); |
