Changeset 43203 for trunk/src/wp-admin/privacy.php

Timestamp:

05/09/2018 08:50:54 PM (2 years ago)

Author:

azaozz

Message:

Privacy: fixes for the privacy policy guide and suggested content:

• Separate the guide text form the suggested policy text.
• Add table of content for easier navigation.
• Move the content to tools.php (prevents the settings menu of being open).
• Add a link to the guide from the Privacy settings screen.

Props melchoyce, azaozz.
See #43980.

File:

• trunk/src/wp-admin/privacy.php (modified) (6 diffs)

trunk/src/wp-admin/privacy.php

@@ -14 +14 @@
 }
 
-if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-    require_once( ABSPATH . 'wp-admin/includes/misc.php' );
-}
-
-// "Borrow" xfn.js for now so we don't have to create new files.
-wp_enqueue_script( 'xfn' );
-
 $action = isset( $_POST['action'] ) ? $_POST['action'] : '';
 
@@ -41 +34 @@
         );
     } elseif ( 'create-privacy-page' === $action ) {
+
+        if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+            require_once( ABSPATH . 'wp-admin/includes/misc.php' );
+        }
 
         $privacy_policy_page_content = WP_Privacy_Policy_Content::get_default_content();
@@ -106 +103 @@
 ?>
 <div class="wrap">
-<?php
-
-if ( isset( $_GET['wp-suggested-policy-content'] ) ) {
-
-    ?>
-    <h1><?php _e( 'Privacy Policy Guide' ); ?></h1>
-    <div class="wp-suggested-policy-content">
-        <?php WP_Privacy_Policy_Content::privacy_policy_guide(); ?>
-    </div>
-    <?php
-
-} else {
-
-?>
     <h1><?php _e( 'Privacy Settings' ); ?></h1>
     <h2><?php _e( 'Privacy Policy page' ); ?></h2>
@@ -135 +118 @@
     </p>
     <?php
+
     if ( $privacy_policy_page_exists ) {
         $edit_href = add_query_arg(
@@ -145 +129 @@
 
         $view_href = get_permalink( $privacy_policy_page_id );
+
         ?>
         <p class="tools-privacy-edit"><strong>
             <?php
-            printf(
-                /* translators: 1: URL to edit page, 2: URL to view page */
-                __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy page content.' ),
-                $edit_href,
-                $view_href
-            );
+
+            /* translators: 1: URL to edit page, 2: URL to view page */
+            printf( __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy page content.' ), $edit_href, $view_href );
+
             ?>
         </strong></p>
+        <p>
+            <?php
+
+            printf(
+                __( 'Need help putting together your new Privacy Policy page? %s for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
+                '<a href="' . admin_url( 'tools.php?wp-privacy-policy-guide' ) . '">' . __( 'Check out our guide' ) . '</a>'
+            );
+
+            ?>
+        </p>
         <?php
     }
@@ -210 +203 @@
 </div>
 <?php
-} // End if/else isset( $_GET['wp-suggested-policy-content'] ).
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );