diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-content/plugins/akismet/views/start.php
--- a/wp/wp-content/plugins/akismet/views/start.php	Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-content/plugins/akismet/views/start.php	Mon Oct 14 17:39:30 2019 +0200
@@ -1,95 +1,102 @@
-<div class="no-key config-wrap"><?php
-	if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
-		if ( $akismet_user->status == 'missing' ) :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. Register your email address below to get started.', 'akismet'); ?></p>
-<div class="activate-highlight activate-option">
-	<div class="option-description">
-		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
-		<?php echo esc_attr( $akismet_user->user_email ); ?>
-	</div>
-	<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
-		<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
-		<input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
-		<input type="hidden" name="redirect" value="plugin-signup"/>
-		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register Akismet' , 'akismet'); ?>"/>
-	</form>
-</div>
-<?php elseif ( $akismet_user->status == 'cancelled' ) :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
-<div class="activate-highlight activate-option">
-	<div class="option-description" style="width:75%;">
-		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
-		<?php printf( esc_html__( 'Your subscription for %s is cancelled' , 'akismet'), $akismet_user->user_email ); ?>
-	</div>
-	<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
-		<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
-		<input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
-		<input type="hidden" name="redirect" value="upgrade"/>
-		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
-	</form>
-</div>
-<?php elseif ( $akismet_user->status == 'suspended' ) : ?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
-<div class="activate-highlight centered activate-option">
-	<strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
-	<h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
-	<p><?php esc_html_e('No worries! Get in touch and we&#8217;ll help sort this out.', 'akismet'); ?></p>
-	<a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
-</div>
-<?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
-<p style="margin-right:10px"><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
-<div class="activate-highlight activate-option">
-	<div class="option-description">
-		<strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
-		<?php echo esc_attr( $akismet_user->user_email ); ?>
+<div id="akismet-plugin-container">
+	<div class="akismet-masthead">
+		<div class="akismet-masthead__inside-container">
+			<div class="akismet-masthead__logo-container">
+				<img class="akismet-masthead__logo" src="<?php echo esc_url( plugins_url( '../_inc/img/logo-full-2x.png', __FILE__ ) ); ?>" alt="Akismet" />
+			</div>
+		</div>
 	</div>
-	<form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
-		<input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
-		<input type="hidden" name="action" value="enter-key">
-		<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
-		<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this Akismet account' , 'akismet'); ?>"/>
-	</form>
-</div>
-<?php endif;?>
-<div class="activate-highlight secondary activate-option">
-	<div class="option-description">
-		<strong><?php esc_html_e('Create a new API key with a different email address', 'akismet'); ?></strong>
-		<p><?php esc_html_e('Use this option if you want to setup a new Akismet account.', 'akismet'); ?></p>
-	</div>
-	<?php Akismet::view( 'get', array( 'text' => __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
-</div>
-<div class="activate-highlight secondary activate-option">
-	<div class="option-description">
-		<strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
-		<p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+	<div class="akismet-lower">
+		<?php Akismet_Admin::display_status(); ?>
+		
+		<div class="akismet-box">
+			<h2><?php esc_html_e( 'Eliminate spam from your site', 'akismet' ); ?></h2>
+			<p><?php esc_html_e( 'Select one of the options below to get started.', 'akismet' ); ?></p>
+		</div>
+		<div class="akismet-boxes">
+			<?php if ( ! Akismet::predefined_api_key() ) { ?>
+				<?php if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { ?>
+					<?php if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) { ?>
+						<div class="akismet-box">
+							<h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3>
+							<p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p>
+							<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank">
+								<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+								<input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/>
+								<input type="hidden" name="auto-connect" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/>
+								<input type="hidden" name="redirect" value="plugin-signup"/>
+								<input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/>
+							</form>
+							<?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?>
+							<p><?php echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); ?><br /><span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span></p>
+						</div>
+					<?php } elseif ( $akismet_user->status == 'cancelled' ) { ?>
+						<div class="akismet-box">
+							<h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3>
+							<form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="akismet-right" target="_blank">
+								<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+								<input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/>
+								<input type="hidden" name="user_id" value="<?php echo esc_attr( $akismet_user->ID ); ?>"/>
+								<input type="hidden" name="redirect" value="upgrade"/>
+								<input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet' ); ?>"/>
+							</form>
+							<p><?php echo esc_html( sprintf( __( 'Your subscription for %s is cancelled.' , 'akismet' ), $akismet_user->user_email ) ); ?></p>
+						</div>
+					<?php } elseif ( $akismet_user->status == 'suspended' ) { ?>
+						<div class="centered akismet-box">
+							<h3><?php esc_html_e( 'Connected via Jetpack' , 'akismet' ); ?></h3>
+							<p class="akismet-alert-text"><?php echo esc_html( sprintf( __( 'Your subscription for %s is suspended.' , 'akismet' ), $akismet_user->user_email ) ); ?></p>
+							<p><?php esc_html_e( 'No worries! Get in touch and we&#8217;ll sort this out.', 'akismet' ); ?></p>
+							<p><a href="https://akismet.com/contact" class="akismet-button akismet-is-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet' ); ?></a></p>
+						</div>
+					<?php } else { // ask do they want to use akismet account found using jetpack wpcom connection ?>
+						<div class="akismet-box">
+							<h3><?php esc_html_e( 'Connect via Jetpack', 'akismet' ); ?></h3>
+							<p><?php esc_html_e( 'Use your Jetpack connection to activate Akismet.', 'akismet' ); ?></p>
+							<form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="akismet-right">
+								<input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
+								<input type="hidden" name="action" value="enter-key">
+								<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+								<input type="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e( 'Connect with Jetpack' , 'akismet' ); ?>"/>
+							</form>
+							<?php echo get_avatar( $akismet_user->user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?>
+							<p><?php echo sprintf( esc_html( __( 'You are connected as %s.', 'akismet' ) ), '<b>' . esc_html( $akismet_user->user_login ) . '</b>' ); ?><br /><span class="akismet-jetpack-email"><?php echo esc_html( $akismet_user->user_email ); ?></span></p>
+						</div>
+					<?php } ?>
+					<div class="akismet-box">
+						<h3><?php esc_html_e( 'Or sign up with a different email address', 'akismet' ); ?></h3>
+						<div class="akismet-right">
+							<?php Akismet::view( 'get', array( 'text' => __( 'Sign up with a different email address' , 'akismet' ), 'classes' => array( 'akismet-button' ) ) ); ?>
+						</div>
+						<p><?php esc_html_e( 'Choose this option to use Akismet independently of your Jetpack connection.', 'akismet' ); ?></p>
+					</div>
+				<?php } else { ?>
+					<div class="akismet-box">
+						<h3><?php esc_html_e( 'Activate Akismet' , 'akismet' );?></h3>
+						<div class="akismet-right">
+							<?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?>
+						</div>
+						<p><?php esc_html_e( 'Log in or sign up now.', 'akismet' ); ?></p>
+					</div>
+				<?php } ?>
+				<div class="akismet-box">
+					<h3><?php esc_html_e( 'Or enter an API key', 'akismet' ); ?></h3>
+					<p><?php esc_html_e( 'Already have your key? Enter it here.', 'akismet' ); ?> <a href="https://docs.akismet.com/getting-started/api-key/" target="_blank"><?php esc_html_e( '(What is an API key?)', 'akismet' ); ?></a></p>
+					<form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post">
+						<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+						<input type="hidden" name="action" value="enter-key">
+						<p style="width: 100%; display: flex; flex-wrap: nowrap; box-sizing: border-box;">
+							<input id="key" name="key" type="text" size="15" value="" class="regular-text code" style="flex-grow: 1; margin-right: 1rem;">
+							<input type="submit" name="submit" id="submit" class="akismet-button" value="<?php esc_attr_e( 'Connect with API key', 'akismet' );?>">
+						</p>
+					</form>
+				</div>
+			<?php } else { ?>
+				<div class="akismet-box">
+					<h2><?php esc_html_e( 'Manual Configuration', 'akismet' ); ?></h2>
+					<p><?php echo sprintf( esc_html__( 'An Akismet API key has been defined in the %s file for this site.', 'akismet' ), '<code>wp-config.php</code>' ); ?></p>
+				</div>
+			<?php } ?>
+		</div>
 	</div>
-	<form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
-		<input id="key" name="key" type="text" size="15" value="" class="regular-text code">
-		<input type="hidden" name="action" value="enter-key">
-		<?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
-		<input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
-	</form>
-</div>
-<?php else :?>
-<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
-<div class="activate-highlight activate-option">
-	<div class="option-description">
-		<strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
-		<p><?php esc_html_e('Log in or create an account to get your API key.', 'akismet'); ?></p>
-	</div>
-	<?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
-</div>
-<div class="activate-highlight secondary activate-option">
-	<div class="option-description">
-		<strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
-		<p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
-	</div>
-	<form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
-		<input id="key" name="key" type="text" size="15" value="" class="regular-text code">
-		<input type="hidden" name="action" value="enter-key">
-		<?php wp_nonce_field( Akismet_Admin::NONCE ); ?>
-		<input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
-	</form>
-</div><?php
-	endif;?>
 </div>
\ No newline at end of file