| @@ -21,11 +21,10 @@ | ||
| 21 | 21 | ?> |
| 22 | 22 | <div class="notice notice-info notice is-dismissible image-optimizer__notice image-optimizer__notice--pink" |
| 23 | 23 | data-notice-slug="<?php echo esc_attr( self::NOT_CONNECTED_NOTICE_SLUG ); ?>"> |
| 24 | 24 | <div class="image-optimizer__icon-block"> |
| 25 | - <svg width="32" height="32" fill="none" role="presentation"> | |
| 26 | - <rect width="32" height="32" fill="#FF7BE5" rx="16"/> | |
| 27 | - <path fill="#fff" d="M10.508 4.135a.125.125 0 0 0-.236 0l-1.183 3.42a.125.125 0 0 1-.078.078L5.553 8.8a.125.125 0 0 0 0 .237l3.458 1.166a.125.125 0 0 1 .078.078l1.183 3.42a.125.125 0 0 0 .236 0l1.182-3.42a.125.125 0 0 1 .078-.078l3.458-1.166a.125.125 0 0 0 0-.237l-3.458-1.167a.125.125 0 0 1-.078-.077l-1.182-3.421ZM17.425 12.738v3.683l-4.073 4.582L26.495 9.598a.125.125 0 0 1 .207.094v14.851a.125.125 0 0 1-.125.125H5.874a.125.125 0 0 1-.09-.212l11.427-11.805a.125.125 0 0 1 .214.087Z"/> | |
| 25 | + <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> | |
| 26 | + <path d="M12 0C5.37 0 0 5.37 0 12C0 18.63 5.37 24 12 24C18.63 24 24 18.63 24 12C24 5.37 18.63 0 12 0ZM8.4 18H6V6H8.4V18ZM18 18H10.8V15.6H18V18ZM18 13.2H10.8V10.8H18V13.2ZM18 8.4H10.8V6H18V8.4Z" fill="#ED01EE"/> | |
| 28 | 27 | </svg> |
| 29 | 28 | </div> |
| 30 | 29 | |
| 31 | 30 | <p> |
| @@ -30,15 +29,15 @@ | ||
| 30 | 29 | |
| 31 | 30 | <p> |
| 32 | 31 | <b> |
| 33 | 32 | <?php esc_html_e( |
| 34 | - 'Image Optimizer is not connected right now. To start optimizing your images, please connect your account.', | |
| 33 | + 'Image Optimization is not connected right now. To start optimizing your images, please connect your account.', | |
| 35 | 34 | 'image-optimization' |
| 36 | 35 | ); ?> |
| 37 | 36 | </b> |
| 38 | 37 | |
| 39 | 38 | <span> |
| 40 | - <a href="<?php echo admin_url( 'admin.php?page=' . \ImageOptimization\Modules\Settings\Module::SETTING_BASE_SLUG . '&action=connect' ); ?>"> | |
| 39 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=' . \ImageOptimization\Modules\Settings\Module::SETTING_BASE_SLUG . '&action=connect' ) ); ?>"> | |
| 41 | 40 | <?php esc_html_e( |
| 42 | 41 | 'Connect now', |
| 43 | 42 | 'image-optimization' |
| 44 | 43 | ); ?> |
| @@ -72,9 +71,9 @@ | ||
| 72 | 71 | .on( 'click', function ( e ) { |
| 73 | 72 | e.preventDefault(); |
| 74 | 73 | |
| 75 | 74 | onNotConnectedNoticeClose().promise().done(() => { |
| 76 | - window.open( $( this ).attr( 'href' ), '_blank' ).focus(); | |
| 75 | + window.open( $( this ).attr( 'href' ), '_self' ).focus(); | |
| 77 | 76 | |
| 78 | 77 | $closeButton.click(); |
| 79 | 78 | }); |
| 80 | 79 | }) |
| @@ -106,9 +105,9 @@ | ||
| 106 | 105 | |
| 107 | 106 | // @var ImageOptimizer/Modules/ConnectManager/Module |
| 108 | 107 | $module = Plugin::instance()->modules_manager->get_modules( 'connect-manager' ); |
| 109 | 108 | |
| 110 | - if ( $module->connect_instance->is_connected() ) { | |
| 109 | + if ( $module->connect_instance->is_connected() || ! $module->connect_instance->is_valid_home_url() ) { | |
| 111 | 110 | return; |
| 112 | 111 | } |
| 113 | 112 | |
| 114 | 113 | add_filter( 'parent_file', [ $this, 'add_media_menu_badge' ] ); |
| @@ -116,9 +115,11 @@ | ||
| 116 | 115 | if ( |
| 117 | 116 | Utils::is_media_page() || |
| 118 | 117 | Utils::is_plugin_page() || |
| 119 | 118 | Utils::is_single_attachment_page() || |
| 120 | - Utils::is_media_upload_page() | |
| 119 | + Utils::is_media_upload_page() || | |
| 120 | + Utils::is_wp_dashboard_page() || | |
| 121 | + Utils::is_wp_updates_page() | |
| 121 | 122 | ) { |
| 122 | 123 | add_action( 'admin_notices', [ $this, 'render_not_connected_notice' ] ); |
| 123 | 124 | } |
| 124 | 125 | }); |
