WordPress.org
Get WordPress

Make WordPress Core

Ticket #44621: 44621.2.diff

File 44621.2.diff, 10.6 KB (added by xkon, 5 years ago)

  • src/wp-admin/css/edit.css 

    diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 090f3eee94..54dfacf6e1 100644
    a b form#tags-filter { 
    733733        visibility: hidden;
    734734}
    735735
    736 .wp-suggested-text p {
    737         font-style: italic;
    738 }
    739 
    740736.wp-suggested-text p.privacy-policy-tutorial {
    741737        font-style: normal;
    742738}
    743739
     740.wp-suggested-text div.privacy-policy-suggested-text {
     741        padding: 0 .75em;
     742        border: 1px solid #ccd0d4;
     743        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
     744        background: #fff;
     745}
     746
    744747.notice.wp-pp-notice {
    745748        margin: 15px 0 3px;
    746749}

  • src/wp-admin/includes/class-wp-privacy-policy-content.php 

    diff --git a/src/wp-admin/includes/class-wp-privacy-policy-content.php b/src/wp-admin/includes/class-wp-privacy-policy-content.php
index 65f27470a3..ca3b626ab4 100644
    a b final class WP_Privacy_Policy_Content { 
    492492                }
    493493
    494494                /* translators: Default privacy policy text. %s: Site URL. */
    495                 $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>';
     495                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p></div>';
    496496
    497497                /* translators: Default privacy policy heading. */
    498498                $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
    … … final class WP_Privacy_Policy_Content { 
    519519                }
    520520
    521521                /* translators: Default privacy policy text. */
    522                 $strings[] = '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>';
     522                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>';
    523523                /* translators: Default privacy policy text. */
    524                 $strings[] = '<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>';
     524                $strings[] = '<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p></div>';
    525525
    526526                /* translators: Default privacy policy heading. */
    527527                $strings[] = '<h3>' . __( 'Media' ) . '</h3>';
    … … final class WP_Privacy_Policy_Content { 
    532532                }
    533533
    534534                /* translators: Default privacy policy text. */
    535                 $strings[] = '<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>';
     535                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p></div>';
    536536
    537537                /* translators: Default privacy policy heading. */
    538538                $strings[] = '<h3>' . __( 'Contact forms' ) . '</h3>';
    … … final class WP_Privacy_Policy_Content { 
    551551                }
    552552
    553553                /* translators: Default privacy policy text. */
    554                 $strings[] = '<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>';
     554                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>';
    555555                /* translators: Default privacy policy text. */
    556556                $strings[] = '<p>' . __( 'If you visit our login page, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>';
    557557                /* translators: Default privacy policy text. */
    558558                $strings[] = '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
    559559                /* translators: Default privacy policy text. */
    560                 $strings[] = '<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p>';
     560                $strings[] = '<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p></div>';
    561561
    562562                /* translators: Default privacy policy heading. */
    563563                $strings[] = '<h3>' . __( 'Embedded content from other websites' ) . '</h3>';
    564564                /* translators: Default privacy policy text. */
    565                 $strings[] = '<p>' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '</p>';
     565                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '</p>';
    566566                /* translators: Default privacy policy text. */
    567                 $strings[] = '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>';
     567                $strings[] = '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p></div>';
    568568
    569569                /* translators: Default privacy policy heading. */
    570570                $strings[] = '<h3>' . __( 'Analytics' ) . '</h3>';
    … … final class WP_Privacy_Policy_Content { 
    595595                }
    596596
    597597                /* translators: Default privacy policy text. */
    598                 $strings[] = '<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>';
     598                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>';
    599599                /* translators: Default privacy policy text. */
    600                 $strings[] = '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>';
     600                $strings[] = '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p></div>';
    601601
    602602                /* translators: Default privacy policy heading. */
    603603                $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
    … … final class WP_Privacy_Policy_Content { 
    608608                }
    609609
    610610                /* translators: Default privacy policy text. */
    611                 $strings[] = '<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>';
     611                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p></div>';
    612612
    613613                /* translators: Default privacy policy heading. */
    614614                $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
    … … final class WP_Privacy_Policy_Content { 
    621621                }
    622622
    623623                /* translators: Default privacy policy text. */
    624                 $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
     624                $strings[] = '<div class="privacy-policy-suggested-text"><p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p></div>';
    625625
    626626                /* translators: Default privacy policy heading. */
    627627                $strings[] = '<h2>' . __( 'Your contact information' ) . '</h2>';