diff options
Diffstat (limited to 'plugins/jetpack/_inc/lib/admin-pages')
3 files changed, 188 insertions, 74 deletions
diff --git a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php index ba2fefe8..d352aa56 100644 --- a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php +++ b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php @@ -92,7 +92,17 @@ abstract class Jetpack_Admin_Page { return; } - $this->page_render(); + // Check if we are looking at the main dashboard + if ( + isset( $_GET['page'] ) && + 'jetpack' === $_GET['page'] && + empty( $_GET['configure'] ) + ) + { + $this->page_render(); + return; + } + Jetpack_Admin_Page::wrap_ui( array( $this, 'page_render' ) ); } function admin_help() { @@ -104,14 +114,6 @@ abstract class Jetpack_Admin_Page { $this->jetpack->admin_page_load(); } - function admin_page_top() { - include_once( JETPACK__PLUGIN_DIR . '_inc/header.php' ); - } - - function admin_page_bottom() { - include_once( JETPACK__PLUGIN_DIR . '_inc/footer.php' ); - } - // Add page specific scripts and jetpack stats for all menu pages function admin_scripts() { $this->page_admin_scripts(); // Delegate to inheriting class @@ -219,4 +221,128 @@ abstract class Jetpack_Admin_Page { 'deactivate' => $to_deactivate ); } + + static function load_wrapper_styles( ) { + $rtl = is_rtl() ? '.rtl' : ''; + wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style{$rtl}.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); + wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min{$rtl}.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); + $custom_css = ' + #wpcontent { + padding-left: 0 !important; + } + #wpbody-content { + background-color: #f3f6f8; + } + + #jp-plugin-container .wrap { + margin: 0 auto; + max-width:45rem; + padding: 0 1.5rem; + } + #jp-plugin-container.is-wide .wrap { + max-width: 1040px; + } + .wp-admin #dolly { + float: none; + position: relative; + right: 0; + left: 0; + top: 0; + padding: .625rem; + text-align: right; + background: #fff; + font-size: .75rem; + font-style: italic; + color: #87a6bc; + border-bottom: 1px #e9eff3 solid; + } + '; + wp_add_inline_style( 'dops-css', $custom_css ); + } + + static function wrap_ui( $callback, $args = array() ) { + $defaults = array( + 'is-wide' => false, + ); + $args = wp_parse_args( $args, $defaults ); + $jetpack_admin_url = admin_url( 'admin.php?page=jetpack' ); + + ?> + <div id="jp-plugin-container" class="<?php if ( $args['is-wide'] ) { echo "is-wide"; } ?>"> + + <div class="jp-masthead"> + <div class="jp-masthead__inside-container"> + <div class="jp-masthead__logo-container"> + <a class="jp-masthead__logo-link" href="<?php echo esc_url( $jetpack_admin_url ); ?>"> + <svg class="jetpack-logo__masthead" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" height="32" viewBox="0 0 118 32"><path fill="#00BE28" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path><path d="M41.3,26.6c-0.5-0.7-0.9-1.4-1.3-2.1c2.3-1.4,3-2.5,3-4.6V8h-3V6h6v13.4C46,22.8,45,24.8,41.3,26.6z"></path><path d="M65,18.4c0,1.1,0.8,1.3,1.4,1.3c0.5,0,2-0.2,2.6-0.4v2.1c-0.9,0.3-2.5,0.5-3.7,0.5c-1.5,0-3.2-0.5-3.2-3.1V12H60v-2h2.1V7.1 H65V10h4v2h-4V18.4z"></path><path d="M71,10h3v1.3c1.1-0.8,1.9-1.3,3.3-1.3c2.5,0,4.5,1.8,4.5,5.6s-2.2,6.3-5.8,6.3c-0.9,0-1.3-0.1-2-0.3V28h-3V10z M76.5,12.3 c-0.8,0-1.6,0.4-2.5,1.2v5.9c0.6,0.1,0.9,0.2,1.8,0.2c2,0,3.2-1.3,3.2-3.9C79,13.4,78.1,12.3,76.5,12.3z"></path><path d="M93,22h-3v-1.5c-0.9,0.7-1.9,1.5-3.5,1.5c-1.5,0-3.1-1.1-3.1-3.2c0-2.9,2.5-3.4,4.2-3.7l2.4-0.3v-0.3c0-1.5-0.5-2.3-2-2.3 c-0.7,0-2.3,0.5-3.7,1.1L84,11c1.2-0.4,3-1,4.4-1c2.7,0,4.6,1.4,4.6,4.7L93,22z M90,16.4l-2.2,0.4c-0.7,0.1-1.4,0.5-1.4,1.6 c0,0.9,0.5,1.4,1.3,1.4s1.5-0.5,2.3-1V16.4z"></path><path d="M104.5,21.3c-1.1,0.4-2.2,0.6-3.5,0.6c-4.2,0-5.9-2.4-5.9-5.9c0-3.7,2.3-6,6.1-6c1.4,0,2.3,0.2,3.2,0.5V13 c-0.8-0.3-2-0.6-3.2-0.6c-1.7,0-3.2,0.9-3.2,3.6c0,2.9,1.5,3.8,3.3,3.8c0.9,0,1.9-0.2,3.2-0.7V21.3z"></path><path d="M110,15.2c0.2-0.3,0.2-0.8,3.8-5.2h3.7l-4.6,5.7l5,6.3h-3.7l-4.2-5.8V22h-3V6h3V15.2z"></path><path d="M58.5,21.3c-1.5,0.5-2.7,0.6-4.2,0.6c-3.6,0-5.8-1.8-5.8-6c0-3.1,1.9-5.9,5.5-5.9s4.9,2.5,4.9,4.9c0,0.8,0,1.5-0.1,2h-7.3 c0.1,2.5,1.5,2.8,3.6,2.8c1.1,0,2.2-0.3,3.4-0.7C58.5,19,58.5,21.3,58.5,21.3z M56,15c0-1.4-0.5-2.9-2-2.9c-1.4,0-2.3,1.3-2.4,2.9 C51.6,15,56,15,56,15z"></path></svg> + </a> + </div> + <div class="jp-masthead__nav"> + <?php if ( is_network_admin() ) { + $current_screen = get_current_screen(); + + $highlight_current_sites = ( 'toplevel_page_jetpack-network' === $current_screen->id ? 'is-primary' : '' ); + $highlight_current_settings = ( 'jetpack_page_jetpack-settings-network' === $current_screen->id ? 'is-primary' : '' ); + ?> + <span class="dops-button-group"> + <?php + if ( current_user_can( 'jetpack_network_sites_page' ) ) { + ?><a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack' ) ); ?>" type="button" class="<?php echo esc_attr( $highlight_current_sites ); ?> dops-button is-compact" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>"><?php echo esc_html_x( 'Sites', 'Navigation item', 'jetpack' ); ?></a><?php + } if ( current_user_can( 'jetpack_network_settings_page' ) ) { + ?><a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack-settings' ) ); ?>" type="button" class="<?php echo esc_attr( $highlight_current_settings ); ?> dops-button is-compact" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>"><?php echo esc_html_x( 'Network Settings', 'Navigation item', 'jetpack' ); ?></a><?php + } ?> + </span> + <?php } else { ?> + <span class="dops-button-group"> + <a href="<?php echo esc_url( $jetpack_admin_url ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Dashboard', 'jetpack' ); ?></a><?php + if ( current_user_can( 'jetpack_manage_modules' ) ) { + ?><a href="<?php echo esc_url( $jetpack_admin_url . '#/settings' ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a><?php + } ?> + </span> + <?php } ?> + </div> + </div> + </div> + <div class="wrap"><div id="jp-admin-notices" aria-live="polite"></div></div> + <!-- START OF CALLBACK --> + <?php + ob_start(); + call_user_func( $callback ); + $callback_ui = ob_get_contents(); + ob_end_clean(); + echo $callback_ui; + ?> + <!-- END OF CALLBACK --> + <div class="jp-footer"> + <div class="jp-footer__a8c-attr-container"><a href="https://automattic.com" target="_blank" rel="noopener noreferrer"><svg role="img" class="jp-footer__a8c-attr" x="0" y="0" viewBox="0 0 935 38.2" enable-background="new 0 0 935 38.2" aria-labelledby="a8c-svg-title"><title id="a8c-svg-title">An Automattic Airline</title><path d="M317.1 38.2c-12.6 0-20.7-9.1-20.7-18.5v-1.2c0-9.6 8.2-18.5 20.7-18.5 12.6 0 20.8 8.9 20.8 18.5v1.2C337.9 29.1 329.7 38.2 317.1 38.2zM331.2 18.6c0-6.9-5-13-14.1-13s-14 6.1-14 13v0.9c0 6.9 5 13.1 14 13.1s14.1-6.2 14.1-13.1V18.6zM175 36.8l-4.7-8.8h-20.9l-4.5 8.8h-7L157 1.3h5.5L182 36.8H175zM159.7 8.2L152 23.1h15.7L159.7 8.2zM212.4 38.2c-12.7 0-18.7-6.9-18.7-16.2V1.3h6.6v20.9c0 6.6 4.3 10.5 12.5 10.5 8.4 0 11.9-3.9 11.9-10.5V1.3h6.7V22C231.4 30.8 225.8 38.2 212.4 38.2zM268.6 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H268.6zM397.3 36.8V8.7l-1.8 3.1 -14.9 25h-3.3l-14.7-25 -1.8-3.1v28.1h-6.5V1.3h9.2l14 24.4 1.7 3 1.7-3 13.9-24.4h9.1v35.5H397.3zM454.4 36.8l-4.7-8.8h-20.9l-4.5 8.8h-7l19.2-35.5h5.5l19.5 35.5H454.4zM439.1 8.2l-7.7 14.9h15.7L439.1 8.2zM488.4 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H488.4zM537.3 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H537.3zM569.3 36.8V4.6c2.7 0 3.7-1.4 3.7-3.4h2.8v35.5L569.3 36.8 569.3 36.8zM628 11.3c-3.2-2.9-7.9-5.7-14.2-5.7 -9.5 0-14.8 6.5-14.8 13.3v0.7c0 6.7 5.4 13 15.3 13 5.9 0 10.8-2.8 13.9-5.7l4 4.2c-3.9 3.8-10.5 7.1-18.3 7.1 -13.4 0-21.6-8.7-21.6-18.3v-1.2c0-9.6 8.9-18.7 21.9-18.7 7.5 0 14.3 3.1 18 7.1L628 11.3zM321.5 12.4c1.2 0.8 1.5 2.4 0.8 3.6l-6.1 9.4c-0.8 1.2-2.4 1.6-3.6 0.8l0 0c-1.2-0.8-1.5-2.4-0.8-3.6l6.1-9.4C318.7 11.9 320.3 11.6 321.5 12.4L321.5 12.4z"></path><path d="M37.5 36.7l-4.7-8.9H11.7l-4.6 8.9H0L19.4 0.8H25l19.7 35.9H37.5zM22 7.8l-7.8 15.1h15.9L22 7.8zM82.8 36.7l-23.3-24 -2.3-2.5v26.6h-6.7v-36H57l22.6 24 2.3 2.6V0.8h6.7v35.9H82.8z"></path><path d="M719.9 37l-4.8-8.9H694l-4.6 8.9h-7.1l19.5-36h5.6l19.8 36H719.9zM704.4 8l-7.8 15.1h15.9L704.4 8zM733 37V1h6.8v36H733zM781 37c-1.8 0-2.6-2.5-2.9-5.8l-0.2-3.7c-0.2-3.6-1.7-5.1-8.4-5.1h-12.8V37H750V1h19.6c10.8 0 15.7 4.3 15.7 9.9 0 3.9-2 7.7-9 9 7 0.5 8.5 3.7 8.6 7.9l0.1 3c0.1 2.5 0.5 4.3 2.2 6.1V37H781zM778.5 11.8c0-2.6-2.1-5.1-7.9-5.1h-13.8v10.8h14.4c5 0 7.3-2.4 7.3-5.2V11.8zM794.8 37V1h6.8v30.4h28.2V37H794.8zM836.7 37V1h6.8v36H836.7zM886.2 37l-23.4-24.1 -2.3-2.5V37h-6.8V1h6.5l22.7 24.1 2.3 2.6V1h6.8v36H886.2zM902.3 37V1H935v5.6h-26v9.2h20v5.5h-20v10.1h26V37H902.3z"></path></svg></a></div> + <ul class="jp-footer__links"> + <li class="jp-footer__link-item"> + <a href="https://jetpack.com" target="_blank" rel="noopener noreferrer" class="jp-footer__link" title="<?php esc_html_e( 'Jetpack version', 'jetpack' ); ?>">Jetpack <?php echo JETPACK__VERSION; ?></a> + </li> + <li class="jp-footer__link-item"> + <a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer" title="<?php esc_html__( 'WordPress.com Terms of Service', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Terms', 'Navigation item', 'jetpack' ); ?></a> + </li> + <li class="jp-footer__link-item"> + <a href="<?php echo esc_url( $jetpack_admin_url . '#/privacy' ); ?>" rel="noopener noreferrer" title="<?php esc_html_e( "Automattic's Privacy Policy", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Privacy', 'Navigation item', 'jetpack' ); ?></a> + </li> + <?php if ( is_multisite() && current_user_can( 'jetpack_network_sites_page' ) ) { ?> + <li class="jp-footer__link-item"> + <a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack' ) ); ?>" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Network Sites', 'Navigation item', 'jetpack' ); ?></a> + </li> + <?php } ?> + <?php if ( is_multisite() && current_user_can( 'jetpack_network_settings_page' ) ) { ?> + <li class="jp-footer__link-item"> + <a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack-settings' ) ); ?>" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Network Settings', 'Navigation item', 'jetpack' ); ?></a> + </li> + <?php } ?> + <?php if ( current_user_can( 'manage_options' ) ) { ?> + <li class="jp-footer__link-item"> + <a href="<?php echo esc_url( admin_url() . 'admin.php?page=jetpack-debugger' ); ?>" title="<?php esc_html_e( "Test your site's compatibility with Jetpack.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Debug', 'Navigation item', 'jetpack' ); ?></a> + </li> + <?php } ?> + </ul> + </div> + </div> +<?php return; + } } diff --git a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php index 57a81a19..45f7d1e5 100644 --- a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php +++ b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php @@ -9,10 +9,8 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { protected $is_redirecting = false; function get_page_hook() { - $title = _x( 'Jetpack', 'The menu item label', 'jetpack' ); - // Add the main admin Jetpack menu - return add_menu_page( 'Jetpack', $title, 'jetpack_admin_page', 'jetpack', array( $this, 'render' ), 'div' ); + return add_menu_page( 'Jetpack', 'Jetpack', 'jetpack_admin_page', 'jetpack', array( $this, 'render' ), 'div' ); } function add_page_actions( $hook ) { @@ -109,7 +107,6 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { function render_nojs_configurable( $module_name ) { $module_name = preg_replace( '/[^\da-z\-]+/', '', $_GET['configure'] ); - include_once( JETPACK__PLUGIN_DIR . '_inc/header.php' ); echo '<div class="wrap configure-module">'; if ( Jetpack::is_module( $module_name ) && current_user_can( 'jetpack_configure_modules' ) ) { @@ -167,41 +164,27 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { } function additional_styles() { - $rtl = is_rtl() ? '.rtl' : ''; - - wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); - wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); + Jetpack_Admin_Page::load_wrapper_styles(); } function page_admin_scripts() { - if ( $this->is_redirecting ) { + if ( $this->is_redirecting || isset( $_GET['configure'] ) ) { return; // No need for scripts on a fallback page } - $is_dev_mode = Jetpack::is_development_mode(); - // Enqueue jp.js and localize it wp_enqueue_script( 'react-plugin', plugins_url( '_inc/build/admin.js', JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION, true ); - if ( ! $is_dev_mode && Jetpack::is_active() ) { + if ( ! Jetpack::is_development_mode() && Jetpack::is_active() ) { // Required for Analytics wp_enqueue_script( 'jp-tracks', '//stats.wp.com/w.js', array(), gmdate( 'YW' ), true ); } - // Collecting roles that can view site stats. - $stats_roles = array(); - $enabled_roles = function_exists( 'stats_get_option' ) ? stats_get_option( 'roles' ) : array( 'administrator' ); - - if ( ! function_exists( 'get_editable_roles' ) ) { - require_once ABSPATH . 'wp-admin/includes/user.php'; - } - foreach ( get_editable_roles() as $slug => $role ) { - $stats_roles[ $slug ] = array( - 'name' => translate_user_role( $role['name'] ), - 'canView' => is_array( $enabled_roles ) ? in_array( $slug, $enabled_roles, true ) : false, - ); - } + // Add objects to be passed to the initial state of the app + wp_localize_script( 'react-plugin', 'Initial_State', $this->get_initial_state() ); + } + function get_initial_state() { // Load API endpoint base classes and endpoints for getting the module list fed into the JS Admin Page require_once JETPACK__PLUGIN_DIR . '_inc/lib/core-api/class.jetpack-core-api-xmlrpc-consumer-endpoint.php'; require_once JETPACK__PLUGIN_DIR . '_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php'; @@ -217,11 +200,19 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { $modules[ $slug ]['long_description'] = html_entity_decode( $data['long_description'] ); } - // Get last post, to build the link to Customizer in the Related Posts module. - $last_post = get_posts( array( 'posts_per_page' => 1 ) ); - $last_post = isset( $last_post[0] ) && $last_post[0] instanceof WP_Post - ? get_permalink( $last_post[0]->ID ) - : get_home_url(); + // Collecting roles that can view site stats. + $stats_roles = array(); + $enabled_roles = function_exists( 'stats_get_option' ) ? stats_get_option( 'roles' ) : array( 'administrator' ); + + if ( ! function_exists( 'get_editable_roles' ) ) { + require_once ABSPATH . 'wp-admin/includes/user.php'; + } + foreach ( get_editable_roles() as $slug => $role ) { + $stats_roles[ $slug ] = array( + 'name' => translate_user_role( $role['name'] ), + 'canView' => is_array( $enabled_roles ) ? in_array( $slug, $enabled_roles, true ) : false, + ); + } // Get information about current theme. $current_theme = wp_get_theme(); @@ -234,8 +225,13 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { } } - // Add objects to be passed to the initial state of the app - wp_localize_script( 'react-plugin', 'Initial_State', array( + // Get last post, to build the link to Customizer in the Related Posts module. + $last_post = get_posts( array( 'posts_per_page' => 1 ) ); + $last_post = isset( $last_post[0] ) && $last_post[0] instanceof WP_Post + ? get_permalink( $last_post[0]->ID ) + : get_home_url(); + + return array( 'WP_API_root' => esc_url_raw( rest_url() ), 'WP_API_nonce' => wp_create_nonce( 'wp_rest' ), 'pluginBaseUrl' => plugins_url( '', JETPACK__PLUGIN_FILE ), @@ -243,18 +239,20 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { 'isActive' => Jetpack::is_active(), 'isStaging' => Jetpack::is_staging_site(), 'devMode' => array( - 'isActive' => $is_dev_mode, + 'isActive' => Jetpack::is_development_mode(), 'constant' => defined( 'JETPACK_DEV_DEBUG' ) && JETPACK_DEV_DEBUG, 'url' => site_url() && false === strpos( site_url(), '.' ), 'filter' => apply_filters( 'jetpack_development_mode', false ), ), 'isPublic' => '1' == get_option( 'blog_public' ), 'isInIdentityCrisis' => Jetpack::validate_sync_error_idc_option(), + 'sandboxDomain' => JETPACK__SANDBOX_DOMAIN, ), 'connectUrl' => Jetpack::init()->build_connect_url( true, false, false ), 'dismissedNotices' => $this->get_dismissed_jetpack_notices(), 'isDevVersion' => Jetpack::is_development_version(), 'currentVersion' => JETPACK__VERSION, + 'is_gutenberg_available' => Jetpack_Gutenberg::is_gutenberg_available(), 'getModules' => $modules, 'showJumpstart' => jetpack_show_jumpstart(), 'rawUrl' => Jetpack::build_raw_urls( get_home_url() ), @@ -289,6 +287,7 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { 'showPromotions' => apply_filters( 'jetpack_show_promotions', true ), 'isAtomicSite' => jetpack_is_atomic_site(), 'plan' => Jetpack::get_active_plan(), + 'showBackups' => Jetpack::show_backups_ui(), ), 'themeData' => array( 'name' => $current_theme->get( 'Name' ), @@ -298,7 +297,7 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { ), ), 'locale' => Jetpack::get_i18n_data_json(), - 'localeSlug' => join( '-', explode( '_', jetpack_get_user_locale() ) ), + 'localeSlug' => join( '-', explode( '_', get_user_locale() ) ), 'jetpackStateNotices' => array( 'messageCode' => Jetpack::state( 'message' ), 'errorCode' => Jetpack::state( 'error' ), @@ -307,7 +306,17 @@ class Jetpack_React_Page extends Jetpack_Admin_Page { 'tracksUserData' => Jetpack_Tracks_Client::get_connected_user_tracks_identity(), 'currentIp' => function_exists( 'jetpack_protect_get_ip' ) ? jetpack_protect_get_ip() : false, 'lastPostUrl' => esc_url( $last_post ), - ) ); + 'externalServicesConnectUrls' => $this->get_external_services_connect_urls() + ); + } + + function get_external_services_connect_urls() { + $connect_urls = array(); + jetpack_require_lib( 'class.jetpack-keyring-service-helper' ); + foreach ( Jetpack_Keyring_Service_Helper::$SERVICES as $service_name => $service_info ) { + $connect_urls[ $service_name ] = Jetpack_Keyring_Service_Helper::connect_url( $service_name, $service_info[ 'for' ] ); + } + return $connect_urls; } /** diff --git a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php index 3934a27d..13854cc7 100644 --- a/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php +++ b/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php @@ -12,7 +12,14 @@ class Jetpack_Settings_Page extends Jetpack_Admin_Page { // Adds the Settings sub menu function get_page_hook() { - return add_submenu_page( null, __( 'Jetpack Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_manage_modules', 'jetpack_modules', array( $this, 'render' ) ); + return add_submenu_page( + null, + __( 'Jetpack Settings', 'jetpack' ), + __( 'Settings', 'jetpack' ), + 'jetpack_manage_modules', + 'jetpack_modules', + array( $this, 'render' ) + ); } // Renders the module list table where you can use bulk action or row @@ -20,17 +27,6 @@ class Jetpack_Settings_Page extends Jetpack_Admin_Page { function page_render() { $list_table = new Jetpack_Modules_List_Table; - $static_html = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static.html' ); - - // If static.html isn't there, there's nothing else we can do. - if ( false === $static_html ) { - echo '<p>'; - esc_html_e( 'Error fetching static.html. Try running: ', 'jetpack' ); - echo '<code>yarn distclean && yarn build</code>'; - echo '</p>'; - return; - } - // We have static.html so let's continue trying to fetch the others $noscript_notice = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static-noscript-notice.html' ); $version_notice = $rest_api_notice = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static-version-notice.html' ); @@ -80,10 +76,6 @@ class Jetpack_Settings_Page extends Jetpack_Admin_Page { $ie_notice ); - ob_start(); - - $this->admin_page_top(); - if ( $this->is_wp_version_too_old() ) { echo $version_notice; } @@ -152,17 +144,6 @@ class Jetpack_Settings_Page extends Jetpack_Admin_Page { </div><!-- /.content --> <?php - $this->admin_page_bottom(); - - $page_content = ob_get_contents(); - ob_end_clean(); - - echo str_replace( - '<div class="jp-loading-placeholder"><span class="dashicons dashicons-wordpress-alt"></span></div>', - $page_content, - $static_html - ); - JetpackTracking::record_user_event( 'wpa_page_view', array( 'path' => 'old_settings' ) ); } @@ -172,9 +153,7 @@ class Jetpack_Settings_Page extends Jetpack_Admin_Page { * @since 4.3.0 */ function additional_styles() { - $rtl = is_rtl() ? '.rtl' : ''; - wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); - wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION ); + Jetpack_Admin_Page::load_wrapper_styles(); } // Javascript logic specific to the list table |