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