summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/jetpack/views/admin')
-rw-r--r--plugins/jetpack/views/admin/network-admin-alert.php15
-rw-r--r--plugins/jetpack/views/admin/network-admin-footer.php36
-rw-r--r--plugins/jetpack/views/admin/network-admin-header.php18
-rw-r--r--plugins/jetpack/views/admin/network-settings.php4
4 files changed, 18 insertions, 55 deletions
diff --git a/plugins/jetpack/views/admin/network-admin-alert.php b/plugins/jetpack/views/admin/network-admin-alert.php
index 2d14d209..434b80f1 100644
--- a/plugins/jetpack/views/admin/network-admin-alert.php
+++ b/plugins/jetpack/views/admin/network-admin-alert.php
@@ -1,9 +1,6 @@
-<div id="message" class="updated jetpack-message jp-connect" style="display:block !important;">
- <div class="jetpack-wrap-container">
- <div class="jetpack-text-container">
- <h2>
- <?php echo $data['notice']; ?>
- </h2>
- </div>
- </div>
-</div>
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */ \ No newline at end of file
diff --git a/plugins/jetpack/views/admin/network-admin-footer.php b/plugins/jetpack/views/admin/network-admin-footer.php
index 3229f00e..434b80f1 100644
--- a/plugins/jetpack/views/admin/network-admin-footer.php
+++ b/plugins/jetpack/views/admin/network-admin-footer.php
@@ -1,30 +1,6 @@
- <div id="survey" class="jp-survey">
- <div class="jp-survey-container">
- <div class="jp-survey-text">
- <h4><?php _e( 'Have feedback on Jetpack?', 'jetpack' ); ?></h4>
- <br />
- <?php _e( 'Answer a short survey to let us know how we&#8217;re doing and what to add in the future.', 'jetpack' ); ?>
- </div>
- <div class="jp-survey-button-container">
- <p class="submit">
- <a id="jp-survey-button" class="button-primary" target="_blank" rel="noopener noreferrer" href="https://jetpack.com/survey/?rel=<?php echo esc_attr( JETPACK__VERSION ); ?>">
- <?php _e( 'Take Survey', 'jetpack' ); ?>
- </a>
- </p>
- </div>
- </div>
- </div>
-
- <div id="jp-footer">
- <p class="automattic"><?php _e( 'An <span>Automattic</span> Airline', 'jetpack' ) ?></p>
- <p class="small">
- <a href="https://jetpack.com/" target="_blank" rel="noopener noreferrer">Jetpack <?php echo esc_html( JETPACK__VERSION ); ?></a> |
- <a href="https://automattic.com/privacy/" target="_blank" rel="noopener noreferrer"><?php _e( 'Privacy Policy', 'jetpack' ); ?></a> |
- <a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer"><?php _e( 'Terms of Service', 'jetpack' ); ?></a> |
-<?php if ( current_user_can( 'manage_options' ) ) : ?>
- <a href="<?php echo Jetpack::admin_url( array( 'page' => 'jetpack-debugger' ) ); ?>"><?php _e( 'Debug', 'jetpack' ); ?></a> |
-<?php endif; ?>
- <a href="https://jetpack.com/support/" target="_blank" rel="noopener noreferrer"><?php _e( 'Support', 'jetpack' ); ?></a>
- </p>
- </div>
- </div>
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */ \ No newline at end of file
diff --git a/plugins/jetpack/views/admin/network-admin-header.php b/plugins/jetpack/views/admin/network-admin-header.php
index 8782ed74..2bbe4cf9 100644
--- a/plugins/jetpack/views/admin/network-admin-header.php
+++ b/plugins/jetpack/views/admin/network-admin-header.php
@@ -1,14 +1,4 @@
- <div class="wrap" id="jetpack-settings">
-
- <div id="jp-header"<?php if ( $data['is_connected'] ) : ?> class="small"<?php endif; ?>>
- <div id="jp-clouds">
- <h3><?php _e( 'Jetpack by WordPress.com', 'jetpack' ) ?></h3>
- </div>
- </div>
-
- <h2 style="display: none"></h2> <!-- For WP JS message relocation -->
-
- <?php
- Jetpack::init()->load_view( 'admin/network-activated-notice.php' );
- /** This action is already documented in views/admin/admin-page.php */
- do_action( 'jetpack_notices' );
+<?php
+ Jetpack::init()->load_view( 'admin/network-activated-notice.php' );
+ /** This action is already documented in views/admin/admin-page.php */
+ do_action( 'jetpack_notices' );
diff --git a/plugins/jetpack/views/admin/network-settings.php b/plugins/jetpack/views/admin/network-settings.php
index f353c64d..00d23ba4 100644
--- a/plugins/jetpack/views/admin/network-settings.php
+++ b/plugins/jetpack/views/admin/network-settings.php
@@ -1,11 +1,11 @@
<?php extract( $data ); ?>
<?php if ( isset( $_GET['updated'] ) && 'true' == $_GET['updated'] ) : ?>
- <div class="updated"><?php esc_html_e( 'Jetpack Network Settings Updated!', 'jetpack' ); ?></div>
+ <div class="updated"><p><?php esc_html_e( 'Jetpack Network Settings Updated!', 'jetpack' ); ?></p></div>
<?php endif; ?>
<?php if ( isset( $_GET['error'] ) && 'jetpack_protect_whitelist' == $_GET['error'] ) : ?>
- <div class="error"><?php esc_html_e( 'One of your IP addresses was not valid.', 'jetpack' ); ?></div>
+ <div class="error"><p><?php esc_html_e( 'One of your IP addresses was not valid.', 'jetpack' ); ?></p></div>
<?php endif; ?>
<div class="wrap">