← All changes
|
_inc/lib/admin-pages/class.jetpack-admin-page.php
+67
-78
13.9.2
→
16.3-a.1
View file →
| @@ -8,20 +8,21 @@ | ||
| 8 | 8 | use Automattic\Jetpack\Current_Plan as Jetpack_Plan; |
| 9 | 9 | use Automattic\Jetpack\Identity_Crisis; |
| 10 | 10 | use Automattic\Jetpack\Redirect; |
| 11 | 11 | use Automattic\Jetpack\Status; |
| 12 | +use Automattic\Jetpack\Status\Host; | |
| 12 | 13 | |
| 13 | 14 | /** |
| 14 | 15 | * Shared logic between Jetpack admin pages. |
| 15 | 16 | */ |
| 16 | 17 | abstract class Jetpack_Admin_Page { |
| 18 | + | |
| 17 | 19 | /** |
| 18 | - * Jetpack Object. | |
| 20 | + * Determines whether or not to hide if not active. | |
| 19 | 21 | * |
| 20 | - * @var Jetpack | |
| 21 | - * @deprecated 13.9 Use `Jetpack::init()` instead. | |
| 22 | + * @var bool | |
| 22 | 23 | */ |
| 23 | - public $jetpack; | |
| 24 | + protected $dont_show_if_not_active; | |
| 24 | 25 | |
| 25 | 26 | /** |
| 26 | 27 | * Add page specific actions given the page hook. |
| 27 | 28 | * |
| @@ -53,32 +54,8 @@ | ||
| 53 | 54 | */ |
| 54 | 55 | public function additional_styles() {} |
| 55 | 56 | |
| 56 | 57 | /** |
| 57 | - * The constructor. | |
| 58 | - */ | |
| 59 | - public function __construct() { | |
| 60 | - /** | |
| 61 | - * Keeping it for backward compatibility in case the `$jetpack` property is still in use. | |
| 62 | - * To be removed. | |
| 63 | - * | |
| 64 | - * @deprecated 13.9 | |
| 65 | - */ | |
| 66 | - add_action( 'jetpack_loaded', array( $this, 'on_jetpack_loaded' ) ); | |
| 67 | - } | |
| 68 | - | |
| 69 | - /** | |
| 70 | - * Runs on Jetpack being ready to load its packages. | |
| 71 | - * | |
| 72 | - * @deprecated 13.9 | |
| 73 | - * | |
| 74 | - * @param Jetpack $jetpack object. | |
| 75 | - */ | |
| 76 | - public function on_jetpack_loaded( $jetpack ) { | |
| 77 | - $this->jetpack = $jetpack; | |
| 78 | - } | |
| 79 | - | |
| 80 | - /** | |
| 81 | 58 | * Add common page actions and attach page-specific actions. |
| 82 | 59 | */ |
| 83 | 60 | public function add_actions() { |
| 84 | 61 | $is_offline_mode = ( new Status() )->is_offline_mode(); |
| @@ -111,8 +88,11 @@ | ||
| 111 | 88 | add_action( 'current_screen', array( $this, 'check_plan_deactivate_modules' ) ); |
| 112 | 89 | |
| 113 | 90 | // Attach page specific actions in addition to the above. |
| 114 | 91 | $this->add_page_actions( $hook ); |
| 92 | + | |
| 93 | + // Override the page title for the module list page and the debugger page. | |
| 94 | + add_action( 'current_screen', array( __CLASS__, 'override_page_title' ) ); | |
| 115 | 95 | } |
| 116 | 96 | |
| 117 | 97 | /** |
| 118 | 98 | * Render the page with a common top and bottom part, and page specific content. |
| @@ -135,9 +115,10 @@ | ||
| 135 | 115 | $args = array(); |
| 136 | 116 | |
| 137 | 117 | // phpcs:ignore WordPress.Security.NonceVerification.Recommended |
| 138 | 118 | if ( isset( $_GET['page'] ) && 'jetpack_modules' === $_GET['page'] ) { |
| 139 | - $args['is-wide'] = true; | |
| 119 | + $args['is-wide'] = true; | |
| 120 | + $args['show-nav'] = false; | |
| 140 | 121 | } |
| 141 | 122 | |
| 142 | 123 | self::wrap_ui( array( $this, 'page_render' ), $args ); |
| 143 | 124 | } |
| @@ -142,15 +123,8 @@ | ||
| 142 | 123 | self::wrap_ui( array( $this, 'page_render' ), $args ); |
| 143 | 124 | } |
| 144 | 125 | |
| 145 | 126 | /** |
| 146 | - * Doesn't do anything anymore. | |
| 147 | - * | |
| 148 | - * @deprecated 13.9 No longer used. | |
| 149 | - */ | |
| 150 | - public function admin_help() {} | |
| 151 | - | |
| 152 | - /** | |
| 153 | 127 | * Call the existing admin page events. |
| 154 | 128 | */ |
| 155 | 129 | public function admin_page_load() { |
| 156 | 130 | Jetpack::init()->admin_page_load(); |
| @@ -285,14 +259,8 @@ | ||
| 285 | 259 | $jetpack_about_url = ! $connectable |
| 286 | 260 | ? admin_url( 'admin.php?page=jetpack_about' ) |
| 287 | 261 | : Redirect::get_url( 'jetpack' ); |
| 288 | 262 | |
| 289 | - $jetpack_privacy_url = ! $connectable | |
| 290 | - ? $jetpack_admin_url . '#/privacy' | |
| 291 | - : Redirect::get_url( 'a8c-privacy' ); | |
| 292 | - | |
| 293 | - $external_link_icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="jp-footer__menu-item__icon" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg>'; | |
| 294 | - | |
| 295 | 263 | ?> |
| 296 | 264 | <div id="jp-plugin-container" class=" |
| 297 | 265 | <?php |
| 298 | 266 | if ( $args['is-wide'] ) { |
| @@ -299,17 +267,43 @@ | ||
| 299 | 267 | echo 'is-wide'; } |
| 300 | 268 | ?> |
| 301 | 269 | "> |
| 302 | 270 | |
| 303 | - <div class="jp-masthead jp-masthead-middle"> | |
| 271 | + <header class="jp-masthead"> | |
| 304 | 272 | <div class="jp-masthead__inside-container"> |
| 305 | - <div class="jp-masthead__logo-container"> | |
| 306 | - <a class="jp-masthead__logo-link" href="<?php echo esc_url( $jetpack_admin_url ); ?>"> | |
| 307 | - <svg class="jetpack-logo__masthead" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" height="40" viewBox="0 0 118 32"><path fill="#069e08" 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> | |
| 273 | + <div class="jp-masthead__title-container"> | |
| 274 | + <a class="jp-masthead__logo-link" href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/overview' ) ); ?>"> | |
| 275 | + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" height="20" aria-label="<?php esc_attr_e( 'Jetpack logo', 'jetpack' ); ?>"><path fill="#069e08" 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></svg> | |
| 308 | 276 | </a> |
| 277 | + <h2 class="jp-masthead__title"> | |
| 278 | + <?php | |
| 279 | + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- View logic only. | |
| 280 | + $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; | |
| 281 | + $is_offline_mode = ( new Status() )->is_offline_mode(); | |
| 282 | + $current_label = ''; | |
| 283 | + if ( 'jetpack_modules' === $page ) { | |
| 284 | + $current_label = __( 'Modules', 'jetpack' ); | |
| 285 | + } elseif ( 'jetpack_about' === $page ) { | |
| 286 | + $current_label = __( 'About', 'jetpack' ); | |
| 287 | + } elseif ( 'jetpack-debugger' === $page ) { | |
| 288 | + $current_label = __( 'Debug', 'jetpack' ); | |
| 289 | + } | |
| 290 | + ?> | |
| 291 | + <?php if ( $current_label ) : ?> | |
| 292 | + <a class="jp-masthead__title-link" href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/overview' ) ); ?>">Jetpack</a><?php // "Jetpack" is a product name, do not translate. ?> | |
| 293 | + <span class="jp-masthead__title-separator" aria-hidden="true">/</span> | |
| 294 | + <?php if ( $is_offline_mode ) : ?> | |
| 295 | + <span class="jp-masthead__title-offline"><?php esc_html_e( 'Offline Mode', 'jetpack' ); ?></span> | |
| 296 | + <span class="jp-masthead__title-separator" aria-hidden="true">/</span> | |
| 297 | + <?php endif; ?> | |
| 298 | + <span class="jp-masthead__title-current"><?php echo esc_html( $current_label ); ?></span> | |
| 299 | + <?php else : ?> | |
| 300 | + Jetpack<?php // "Jetpack" is a product name, do not translate. ?> | |
| 301 | + <?php endif; ?> | |
| 302 | + </h2> | |
| 309 | 303 | </div> |
| 310 | 304 | <?php |
| 311 | - if ( $args['show-nav'] ) : | |
| 305 | + if ( $args['show-nav'] && ! ( new Host() )->is_wpcom_platform() ) : | |
| 312 | 306 | ?> |
| 313 | 307 | <div class="jp-masthead__nav"> |
| 314 | 308 | <?php |
| 315 | 309 | if ( is_network_admin() ) { |
| @@ -345,9 +339,9 @@ | ||
| 345 | 339 | <?php } ?> |
| 346 | 340 | </div> |
| 347 | 341 | <?php endif; ?> |
| 348 | 342 | </div> |
| 349 | - </div> | |
| 343 | + </header> | |
| 350 | 344 | <div class="wrap"><div id="jp-admin-notices" aria-live="polite"></div></div> |
| 351 | 345 | <!-- START OF CALLBACK --> |
| 352 | 346 | <?php |
| 353 | 347 | ob_start(); |
| @@ -382,41 +376,16 @@ | ||
| 382 | 376 | <?php esc_html_e( 'Jetpack Logo', 'jetpack' ); ?> |
| 383 | 377 | </desc> |
| 384 | 378 | <path fill="#000" 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> |
| 385 | 379 | </svg> |
| 386 | - <span class="jp-footer__module-name"> | |
| 387 | - <a href="<?php echo esc_url( Redirect::get_url( 'jetpack' ) ); ?>" target="_blank" rel="noopener noreferrer" aria-label="Jetpack 12.2-a.0"> | |
| 388 | - <?php esc_html_e( 'Jetpack', 'jetpack' ); ?> | |
| 389 | - </a> | |
| 390 | - </span> | |
| 380 | + <span class="jp-footer__module-name"><?php esc_html_e( 'Jetpack', 'jetpack' ); ?></span> | |
| 391 | 381 | </div> |
| 382 | + <?php if ( ! ( new Host() )->is_wpcom_platform() ) : ?> | |
| 392 | 383 | <div class="jp-footer__menu"> |
| 393 | - <a href="<?php echo esc_url( $jetpack_about_url ); ?>" title="<?php esc_attr__( 'About Jetpack', 'jetpack' ); ?>" class="jp-footer__menu-item"> | |
| 394 | - <?php echo esc_html__( 'About', 'jetpack' ); ?> | |
| 395 | - </a> | |
| 396 | - <a href="<?php echo esc_url( $jetpack_privacy_url ); ?>" rel="noopener noreferrer" title="<?php esc_html_e( "Automattic's Privacy Policy", 'jetpack' ); ?>" class="jp-footer__menu-item <?php echo ! $connectable ? 'is-external' : ''; ?> ?>" target="<?php echo ! $connectable ? '_blank' : '_self'; ?>"> | |
| 397 | - <?php echo esc_html_x( 'Privacy', 'Navigation item', 'jetpack' ); ?> | |
| 398 | - <?php echo ! $connectable ? $external_link_icon : ''; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 399 | - </a> | |
| 400 | - <a href="<?php echo esc_url( Redirect::get_url( 'wpcom-tos' ) ); ?>" target="_blank" rel="noopener noreferrer" title="<?php esc_html__( 'WordPress.com Terms of Service', 'jetpack' ); ?>" class="jp-footer__menu-item is-external"> | |
| 401 | - <?php echo esc_html_x( 'Terms', 'Navigation item', 'jetpack' ); ?> | |
| 402 | - <?php echo $external_link_icon; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 403 | - </a> | |
| 404 | - <a href="<?php echo esc_url( Redirect::get_url( 'jetpack' ) ); ?>" target="_blank" rel="noopener noreferrer" aria-label="Jetpack 12.2-a.0" class="jp-footer__menu-item is-external"> | |
| 405 | - Version <?php echo esc_html( JETPACK__VERSION ); ?> | |
| 406 | - <?php echo $external_link_icon; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> | |
| 407 | - </a> | |
| 408 | - <?php if ( is_multisite() && current_user_can( 'jetpack_network_sites_page' ) ) { ?> | |
| 409 | - <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__menu-item"><?php echo esc_html_x( 'Network Sites', 'Navigation item', 'jetpack' ); ?></a> | |
| 410 | - <?php } ?> | |
| 411 | - <?php if ( is_multisite() && current_user_can( 'jetpack_network_settings_page' ) ) { ?> | |
| 412 | - <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__menu-item"><?php echo esc_html_x( 'Network Settings', 'Navigation item', 'jetpack' ); ?></a> | |
| 413 | - <?php } ?> | |
| 414 | - <?php if ( current_user_can( 'manage_options' ) ) { ?> | |
| 415 | - <a href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack_modules' ) ); ?>" title="<?php esc_html_e( 'Access the full list of Jetpack modules available on your site.', 'jetpack' ); ?>" class="jp-footer__menu-item"><?php echo esc_html_x( 'Modules', 'Navigation item', 'jetpack' ); ?></a> | |
| 416 | - <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__menu-item"><?php echo esc_html_x( 'Debug', 'Navigation item', 'jetpack' ); ?></a> | |
| 417 | - <?php } ?> | |
| 384 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/products' ) ); ?>" class="jp-footer__menu-item"><?php echo esc_html_x( 'Products', 'Navigation item', 'jetpack' ); ?></a> | |
| 385 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/help' ) ); ?>" class="jp-footer__menu-item"><?php echo esc_html_x( 'Help', 'Navigation item', 'jetpack' ); ?></a> | |
| 418 | 386 | </div> |
| 387 | + <?php endif; ?> | |
| 419 | 388 | <a class="jp-footer__a8c-logo" href="<?php echo esc_url( $jetpack_about_url ); ?>" aria-label="<?php echo esc_attr__( 'An Automattic Airline', 'jetpack' ); ?>"> |
| 420 | 389 | <svg role="img" x="0" y="0" viewBox="0 0 935 38.2" enable-background="new 0 0 935 38.2" aria-labelledby="jp-automattic-byline-logo-title" height="7" class="jp-automattic-byline-logo"> |
| 421 | 390 | <desc id="jp-automattic-byline-logo-title"> |
| 422 | 391 | <?php echo esc_attr__( 'An Automattic Airline', 'jetpack' ); ?> |
| @@ -436,6 +405,26 @@ | ||
| 436 | 405 | * @return bool |
| 437 | 406 | */ |
| 438 | 407 | protected function block_page_rendering_for_idc() { |
| 439 | 408 | return Jetpack::is_connection_ready() && Identity_Crisis::validate_sync_error_idc_option() && ! Jetpack_Options::get_option( 'safe_mode_confirmed' ); |
| 409 | + } | |
| 410 | + | |
| 411 | + /** | |
| 412 | + * Set a page title for both the module list page and the debugger page. | |
| 413 | + * We set these here because we do not register a page title when we register them, | |
| 414 | + * so they do not appear in the admin navigation. | |
| 415 | + * | |
| 416 | + * @since 15.4 | |
| 417 | + * | |
| 418 | + * @param WP_Screen $screen The screen object. | |
| 419 | + * | |
| 420 | + * @return void | |
| 421 | + */ | |
| 422 | + public static function override_page_title( WP_Screen $screen ) { | |
| 423 | + global $title; | |
| 424 | + if ( 'admin_page_jetpack_modules' === $screen->id ) { | |
| 425 | + $title = __( 'Jetpack Settings', 'jetpack' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- we override the title global only on this page. | |
| 426 | + } elseif ( 'admin_page_jetpack-debugger' === $screen->id ) { | |
| 427 | + $title = __( 'Debugging Center', 'jetpack' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- we override the title global only on this page. | |
| 428 | + } | |
| 440 | 429 | } |
| 441 | 430 | } |