← All changes
|
_inc/lib/admin-pages/class-akismet-admin-chrome.php
+13
-6
16.3-beta
→
16.3-a.1
View file →
| @@ -25,10 +25,8 @@ | ||
| 25 | 25 | * |
| 26 | 26 | * @package automattic/jetpack |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -use Automattic\Jetpack\Plugin\Admin_Chrome_Logo; | |
| 30 | -use Automattic\Jetpack\Plugin\Footer_Links; | |
| 31 | 29 | use Automattic\Jetpack\Redirect; |
| 32 | 30 | use Automattic\Jetpack\Status; |
| 33 | 31 | use Automattic\Jetpack\Status\Host; |
| 34 | 32 | |
| @@ -41,8 +39,18 @@ | ||
| 41 | 39 | */ |
| 42 | 40 | class Akismet_Admin_Chrome { |
| 43 | 41 | |
| 44 | 42 | /** |
| 43 | + * The green Jetpack logo mark, sized via the `height` attribute by callers. | |
| 44 | + * | |
| 45 | + * @param int $height Pixel height of the logo. | |
| 46 | + * @return string SVG markup. | |
| 47 | + */ | |
| 48 | + private function jetpack_logo( $height ) { | |
| 49 | + return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" height="' . (int) $height . '" class="jp-akismet-logo" aria-hidden="true"><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>'; | |
| 50 | + } | |
| 51 | + | |
| 52 | + /** | |
| 45 | 53 | * The Akismet logo mark — the green rounded square with the white "A", taken from |
| 46 | 54 | * Akismet's own `akismet-refresh-logo.svg`. Sized via the `height` attribute by callers. |
| 47 | 55 | * |
| 48 | 56 | * @param int $height Pixel height of the logo. |
| @@ -334,15 +342,14 @@ | ||
| 334 | 342 | : Redirect::get_url( 'jetpack' ); |
| 335 | 343 | ?> |
| 336 | 344 | <footer class="jp-akismet-footer jetpack-footer" aria-label="<?php esc_attr_e( 'Jetpack', 'jetpack' ); ?>" role="contentinfo"> |
| 337 | 345 | <div class="jp-akismet-footer__logo"> |
| 338 | - <?php echo Admin_Chrome_Logo::render( 16, 'jp-akismet-logo' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static SVG. ?> | |
| 346 | + <?php echo $this->jetpack_logo( 16 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static SVG. ?> | |
| 339 | 347 | <span><?php esc_html_e( 'Jetpack', 'jetpack' ); ?></span> |
| 340 | 348 | </div> |
| 341 | - <?php if ( ! ( new Host() )->is_wpcom_platform() && Footer_Links::is_my_jetpack_available() ) : ?> | |
| 342 | - <?php $products_section = Footer_Links::get_my_jetpack_products_section(); ?> | |
| 349 | + <?php if ( ! ( new Host() )->is_wpcom_platform() ) : ?> | |
| 343 | 350 | <nav class="jp-akismet-footer__menu"> |
| 344 | - <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/' . $products_section['slug'] ) ); ?>"><?php echo esc_html( $products_section['label'] ); ?></a> | |
| 351 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/products' ) ); ?>"><?php echo esc_html_x( 'Products', 'Navigation item', 'jetpack' ); ?></a> | |
| 345 | 352 | <a href="<?php echo esc_url( admin_url( 'admin.php?page=my-jetpack#/help' ) ); ?>"><?php echo esc_html_x( 'Help', 'Navigation item', 'jetpack' ); ?></a> |
| 346 | 353 | </nav> |
| 347 | 354 | <?php endif; ?> |
| 348 | 355 | <a class="jp-akismet-footer__a8c" href="<?php echo esc_url( $a8c_url ); ?>" aria-label="<?php esc_attr_e( 'An Automattic Airline', 'jetpack' ); ?>"> |