<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50161] trunk/src: Privacy: Redesign the Privacy settings pages.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50161">50161</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50161","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>TimothyBlynJacobs</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-02-02 20:12:39 +0000 (Tue, 02 Feb 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Privacy: Redesign the Privacy settings pages.
The Privacy settings pages now use the same design patterns as the Site Health screen. Additionally, each privacy policy guide is now contained in an accordion to make the page easier to navigate when multiple plugins are in use.
Props xkon, hedgefield, garrett-eclipse, hellofromTonya, paaljoachim, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/49264">#49264</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminprivacytoolsjs">trunk/src/js/_enqueues/admin/privacy-tools.js</a></li>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminoptionsprivacyphp">trunk/src/wp-admin/options-privacy.php</a></li>
<li><a href="#trunksrcwpadminprivacypolicyguidephp">trunk/src/wp-admin/privacy-policy-guide.php</a></li>
<li><a href="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminprivacytoolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/privacy-tools.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/privacy-tools.js 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/js/_enqueues/admin/privacy-tools.js 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Privacy Policy page, copy action.
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).on( 'click', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $parent,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $container,
</del><span class="cx" style="display: block; padding: 0 10px"> range,
</span><span class="cx" style="display: block; padding: 0 10px"> $target = $( event.target ),
</span><span class="cx" style="display: block; padding: 0 10px"> copiedNotice = $target.siblings( '.success' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,14 +282,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clearTimeout( copiedNoticeTimeout );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $target.is( 'button.privacy-text-copy' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $target.parent().parent();
- $container = $parent.find( 'div.wp-suggested-text' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = $target.closest( '.privacy-settings-accordion-panel' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $container.length ) {
- $container = $parent.find( 'div.policy-text' );
- }
-
- if ( $container.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> var documentPosition = document.documentElement.scrollTop,
</span><span class="cx" style="display: block; padding: 0 10px"> bodyPosition = document.body.scrollTop;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,15 +294,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide tutorial content to remove from copied content.
</span><span class="cx" style="display: block; padding: 0 10px"> range = document.createRange();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $container.addClass( 'hide-privacy-policy-tutorial' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent.addClass( 'hide-privacy-policy-tutorial' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- range.selectNodeContents( $container[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ range.selectNodeContents( $parent[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> window.getSelection().addRange( range );
</span><span class="cx" style="display: block; padding: 0 10px"> document.execCommand( 'copy' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset section.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $container.removeClass( 'hide-privacy-policy-tutorial' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent.removeClass( 'hide-privacy-policy-tutorial' );
</ins><span class="cx" style="display: block; padding: 0 10px"> window.getSelection().removeAllRanges();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Return scroll position - see #49540.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Display and speak notice to indicate action complete.
</span><span class="cx" style="display: block; padding: 0 10px"> copiedNotice.addClass( 'visible' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.a11y.speak( __( 'The section has been copied to your clipboard.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.a11y.speak( __( 'The suggested policy text has been copied to your clipboard.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delay notice dismissal.
</span><span class="cx" style="display: block; padding: 0 10px"> copiedNoticeTimeout = setTimeout( function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,4 +324,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Label handling to focus the create page button on Privacy settings page.
+ $( 'body.options-privacy-php label[for=create-page]' ).on( 'click', function( e ) {
+ e.preventDefault();
+ $( 'input#create-page' ).focus();
+ } );
+
+ // Accordion handling in various new Privacy settings pages.
+ $( '.privacy-settings-accordion' ).on( 'click', '.privacy-settings-accordion-trigger', function() {
+ var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) );
+
+ if ( isExpanded ) {
+ $( this ).attr( 'aria-expanded', 'false' );
+ $( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', true );
+ } else {
+ $( this ).attr( 'aria-expanded', 'true' );
+ $( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', false );
+ }
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/wp-admin/css/edit.css 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,158 +695,283 @@
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 1.6923em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* Suggested text for privacy policy */
-.wp-privacy-policy-guide {
- max-width: 1000px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+* Privacy Settings section
+*/
+
+/* General */
+.privacy-settings #wpcontent,
+.privacy-settings.auto-fold #wpcontent {
+ padding-left: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-box {
- width: calc(100% - 260px);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-header h1 {
+ display: inline-block;
+ font-weight: 600;
+ margin: 0 0.8rem 1rem;
+ font-size: 23px;
+ padding: 9px 0 4px 0;
+ line-height: 1.3;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-box-toc {
- float: right;
- width: 250px;
- background-color: #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Header */
+.privacy-settings-header {
+ text-align: center;
+ margin: 0 0 1rem;
+ background: #fff;
+ border-bottom: 1px solid #e2e4e7;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-box-toc p {
- margin: 0;
- padding: 0.7em 1em;
- border-bottom: 1px solid #f0f0f1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-title-section {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ clear: both;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-box-toc ol {
- margin-left: 2em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tabs-wrapper {
+ /* IE 11 */
+ display: -ms-inline-grid;
+ -ms-grid-columns: 1fr 1fr;
+ vertical-align: top;
+ /* modern browsers */
+ display: inline-grid;
+ grid-template-columns: 1fr 1fr;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-privacy-policy-guide h3 {
- font-size: 1.2em;
- margin: 1em 0 0.5em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tab {
+ display: block; /* IE 11 */
+ text-decoration: none;
+ color: inherit;
+ padding: 0.5rem 1rem 1rem;
+ margin: 0 1rem;
+ transition: box-shadow 0.5s ease-in-out;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-section .privacy-text-copy {
- float: right;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tab:nth-child(1) {
+ -ms-grid-column: 1; /* IE 11 */
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-section {
- position: relative;
- border-top: 1px solid #dcdcde;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tab:nth-child(2) {
+ -ms-grid-column: 2; /* IE 11 */
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-box-head,
-.privacy-text-section.text-removed {
- padding-bottom: 12px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tab:focus {
+ color: #191e23;
+ outline: 1px solid #6c7781;
+ box-shadow: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.text-removed .policy-text {
- color: #646970;
- font-weight: 300;
- padding-left: 1em;
- border-left: 3px solid #dba617;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-tab.active {
+ box-shadow: inset 0 -3px #007cba;
+ font-weight: 600;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.text-removed .policy-text h1,
-.text-removed .policy-text h2,
-.text-removed .policy-text h3,
-.text-removed .policy-text h4,
-.text-removed .policy-text h5,
-.text-removed .policy-text h6 {
- color: #3c434a;
- font-weight: 500;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Body */
+.privacy-settings-body {
+ max-width: 800px;
+ margin: 0 auto;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-actions {
- display: inline-block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.tools-privacy-policy-page th {
+ min-width: 230px;
+}
+
+.hr-separator {
+ margin-top: 20px;
+ margin-bottom: 15px;
+}
+
+/* Accordions */
+.privacy-settings-accordion {
+ border: 1px solid #ccd0d4;
+}
+
+.privacy-settings-accordion-heading {
+ margin: 0;
+ border-top: 1px solid #ccd0d4;
+ font-size: inherit;
+ line-height: inherit;
+ font-weight: 600;
+ color: inherit;
+}
+
+.privacy-settings-accordion-heading:first-child {
+ border-top: none;
+}
+
+.privacy-settings-accordion-trigger {
+ background: #fff;
+ border: 0;
+ color: #32373c;
+ cursor: pointer;
+ display: flex;
+ font-weight: 400;
+ margin: 0;
+ padding: 1em 3.5em 1em 1.5em;
+ min-height: 46px;
+ position: relative;
+ text-align: left;
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: 32px;
- line-height: 2.46153846;
- padding-bottom: 6px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ align-items: center;
+ justify-content: space-between;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-actions .success {
- display: none;
- color: #008a20;
- float: right;
- padding-right: 1em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger:hover,
+.privacy-settings-accordion-trigger:active {
+ background: #f8f9f9;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-actions .success.visible {
- display: inline-block;
- height: 32px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger:focus {
+ color: #191e23;
+ border: none;
+ box-shadow: none;
+ outline-offset: -1px;
+ outline: 2px solid #0071a1;
+ background-color: #f8f9f9;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-privacy-policy-guide .policy-text h2 {
- margin: 1.2em 0 1em;
- padding: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .title {
+ pointer-events: none;
+ font-weight: 600;
+ flex-grow: 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.suggested-policy-content {
- font-style: italic;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .icon,
+.privacy-settings-view-read .icon {
+ border: solid #555d66;
+ border-width: 0 2px 2px 0;
+ height: 0.5rem;
+ pointer-events: none;
+ position: absolute;
+ right: 1.5em;
+ top: 50%;
+ transform: translateY(-70%) rotate(45deg);
+ width: 0.5rem;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.privacy-text-section .return-to-top {
- float: right;
- margin-right: -250px;
- margin-top: 6px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge {
+ padding: 0.1rem 0.5rem 0.15rem;
+ color: #32373c;
+ font-weight: 600;
+ margin-left: 0.5rem;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpbody:target:before {
- content: "";
- display: block;
- padding-top: 50px;
- margin-top: -50px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge.blue {
+ border: 1px solid #bfe7f3;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.hide-privacy-policy-tutorial {
- background-color: #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge.orange {
+ border: 1px solid #ffb900;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.hide-privacy-policy-tutorial .wp-policy-help, /* For back-compat, see #49282 */
-.hide-privacy-policy-tutorial .privacy-policy-tutorial {
- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge.red {
+ border: 1px solid #dc3232;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.policy-text {
- margin-bottom: 1em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge.green {
+ border: 1px solid #46b450;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
-.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
- background-color: #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-trigger .badge.purple {
+ border: 1px solid #826eb4;
+}
+
+.privacy-settings-accordion-trigger .badge.gray {
+ border: 1px solid #ccd0d4;
+}
+
+.privacy-settings-accordion-trigger[aria-expanded="true"] .icon,
+.privacy-settings-view-passed[aria-expanded="true"] .icon {
+ transform: translateY(-30%) rotate(-135deg)
+}
+
+.privacy-settings-accordion-panel {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 1em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 1em 1.5em;
+ background: #fff;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help),
-.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
- padding-top: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-panel[hidden] {
+ display: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.hide-privacy-policy-tutorial > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) {
- margin: 1em 0;
- padding: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-panel a .dashicons {
+ text-decoration: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.policy-text ul li,
-.policy-text ol li {
- margin-left: 2em;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-actions {
+ text-align: right;
+ display: block;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.policy-text ul {
- list-style: disc;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-actions .success {
+ display: none;
+ color: #40860a;
+ padding-right: 1em;
+ padding-top: 6px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-strong.wp-policy-help, /* For back-compat, see #49282 */
-strong.privacy-policy-tutorial {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-actions .success.visible {
+ display: inline-block;
+}
+
+/* Suggested text for privacy policy */
+.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .wp-policy-help, /* For back-compat, see #49282 */
+.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .privacy-policy-tutorial,
+.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .privacy-text-copy {
+ display: none;
+}
+
+.privacy-settings-accordion-panel strong.wp-policy-help, /* For back-compat, see #49282 */
+.privacy-settings-accordion-panel strong.privacy-policy-tutorial {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 0 1em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.notice.wp-pp-notice {
- margin: 15px 0 3px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-settings-accordion-panel .wp-suggested-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success),
+.privacy-settings-accordion-panel .wp-suggested-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success),
+.privacy-settings-accordion-panel > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success),
+.privacy-settings-accordion-panel div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success) {
+ margin: 0;
+ padding: 1em;
+ border-left: 2px solid gray;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Media queries */
+@media screen and (max-width: 782px) {
+
+ .privacy-settings-body {
+ margin: 0 12px;
+ width: auto;
+ }
+
+ .privacy-settings .notice {
+ margin: 5px 10px 15px;
+ }
+
+ .privacy-settings .update-nag {
+ margin-right: 10px;
+ margin-left: 10px;
+ }
+
+ input#create-page {
+ margin-top: 10px;
+ }
+}
+
+@media only screen and (max-width: 1004px) {
+
+ .privacy-settings-body {
+ margin: 0 22px;
+ width: auto;
+ }
+}
+
+/**
+* End Privacy Settings section
+*/
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> 11.1 - Custom Fields
</span><span class="cx" style="display: block; padding: 0 10px"> ------------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Privacy Policy Guide URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( admin_url( 'privacy-policy-guide.php' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( admin_url( 'privacy-policy-guide.php?tab=policyguide' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Need help putting together your new Privacy Policy page? Check out our guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = esc_url( admin_url( 'privacy-policy-guide.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $label = __( 'View Privacy Policy Guide.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_current_screen()->is_block_editor() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_array = self::get_suggested_policy_text();
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
</del><span class="cx" style="display: block; padding: 0 10px"> $date_format = __( 'F j, Y' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $content_array as $section ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,79 +383,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $section['removed'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = 'text-removed';
- $date = date_i18n( $date_format, $section['removed'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $badge_class = ' red';
+ $date = date_i18n( $date_format, $section['removed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Date of plugin deactivation. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Removed %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $badge_title = sprintf( __( 'Removed %s.' ), $date );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Date of plugin deactivation. */
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = '<div class="notice notice-info inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $section['updated'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = 'text-updated';
- $date = date_i18n( $date_format, $section['updated'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $badge_class = ' blue';
+ $date = date_i18n( $date_format, $section['updated'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Date of privacy policy text update. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Updated %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $badge_title = sprintf( __( 'Updated %s.' ), $date );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $meta ) {
- $meta = '<br><span class="privacy-text-meta">' . $meta . '</span>';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $plugin_name = esc_html( $section['plugin_name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
- $toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<div class="privacy-text-section ' . $class . '">';
- $content .= '<a id="' . $toc_id . '"> </a>';
- /* translators: %s: Plugin name. */
- $content .= '<h2>' . sprintf( __( 'Source: %s' ), $plugin_name ) . '</h2>';
- $content .= $removed;
-
- $content .= '<div class="policy-text">' . $section['policy_text'] . '</div>';
-
- if ( empty( $section['removed'] ) ) {
- $content .= '<div class="privacy-text-actions">';
- $content .= '<button type="button" class="privacy-text-copy button">';
- $content .= __( 'Copy this section to clipboard' );
- $content .= '</button>';
- $content .= '<span class="success" aria-hidden="true">' . __( 'Copied!' ) . '</span>';
- $content .= '</div>';
- }
-
- $content .= '<a href="#wpbody" class="return-to-top"><span aria-hidden="true">↑ </span> ' . __( 'Go to top' ) . '</a>';
-
- $content .= '</div>'; // End of .privacy-text-section.
- }
-
- if ( count( $toc ) > 2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sanitized_policy_name = sanitize_title_with_dashes( $plugin_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="privacy-text-box-toc">
- <p><?php _e( 'Table of Contents' ); ?></p>
- <ol>
- <?php echo implode( $toc ); ?>
- </ol>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4 class="privacy-settings-accordion-heading">
+ <button aria-expanded="false" class="privacy-settings-accordion-trigger" aria-controls="privacy-settings-accordion-block-<?php echo $sanitized_policy_name; ?>" type="button">
+ <span class="title"><?php echo $plugin_name; ?></span>
+ <?php if ( ! empty( $section['removed'] ) || ! empty( $section['updated'] ) ) : ?>
+ <span class="badge <?php echo $badge_class; ?>"> <?php echo $badge_title; ?></span>
+ <?php endif; ?>
+ <span class="icon"></span>
+ </button>
+ </h4>
+ <div id="privacy-settings-accordion-block-<?php echo $sanitized_policy_name; ?>" class="privacy-settings-accordion-panel privacy-text-box-body" hidden="hidden">
+ <?php
+ echo $removed;
+ echo $section['policy_text'];
+ ?>
+ <?php if ( empty( $section['removed'] ) ) : ?>
+ <div class="privacy-settings-accordion-actions">
+ <span class="success" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
+ <button type="button" class="privacy-text-copy button">
+ <?php _e( 'Copy suggested policy text to clipboard' ); ?>
+ <span class="screen-reader-text">
+ <?php
+ /* translators: %s: Plugin name. */
+ sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name );
+ ?>
+ </span>
+ </button>
+ </div>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- ?>
- <div class="privacy-text-box">
- <div class="privacy-text-box-head">
- <a id="wp-privacy-policy-guide-introduction"> </a>
- <h2><?php _e( 'Introduction' ); ?></h2>
- <p><?php _e( 'Hello,' ); ?></p>
- <p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
- <p><?php _e( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
- <p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
- <p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
- </div>
-
- <div class="privacy-text-box-body">
- <?php echo $content; ?>
- </div>
- </div>
- <?php
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The default policy content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_default_content( $description = false, $blocks = true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suggested_text = $description ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suggested_text = '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $strings = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,15 +463,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. %s: Site URL. */
+ $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. %s: Site URL. */
- $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>';
-
- /* translators: Default privacy policy heading. */
- $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,65 +484,65 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h3>' . __( 'Comments' ) . '</h3>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2>' . __( 'Comments' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $strings[] = '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '</p>';
+ /* translators: Default privacy policy text. */
+ $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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $strings[] = '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '</p>';
- /* translators: Default privacy policy text. */
- $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>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h3>' . __( 'Media' ) . '</h3>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2>' . __( 'Media' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $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>';
-
- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'Contact forms' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Contact forms' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h3>' . __( 'Cookies' ) . '</h3>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2>' . __( 'Cookies' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $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>';
+ /* translators: Default privacy policy text. */
+ $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>';
+ /* translators: Default privacy policy text. */
+ $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 "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
+ /* translators: Default privacy policy text. */
+ $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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $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>';
- /* translators: Default privacy policy text. */
- $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>';
- /* translators: Default privacy policy text. */
- $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 "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
- /* translators: Default privacy policy text. */
- $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>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $description ) {
+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Embedded content from other websites' ) . '</h2>';
+ /* translators: Default privacy policy text. */
+ $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>';
+ /* translators: Default privacy policy text. */
+ $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>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'Embedded content from other websites' ) . '</h3>';
- /* translators: Default privacy policy text. */
- $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>';
- /* translators: Default privacy policy text. */
- $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>';
-
- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'Analytics' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Analytics' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider’s privacy policy, if any.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,11 +557,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $strings[] = '<p>' . $suggested_text . __( 'If you request a password reset, your IP address will be included in the reset email.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $strings[] = '<p>' . $suggested_text . __( 'If you request a password reset, your IP address will be included in the reset email.' ) . '</p>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,13 +568,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $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>';
+ /* translators: Default privacy policy text. */
+ $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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $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>';
- /* translators: Default privacy policy text. */
- $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>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,11 +581,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $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>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $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>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,63 +594,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Default privacy policy text. */
+ $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy text. */
- $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
-
- /* translators: Default privacy policy heading. */
- $strings[] = '<h2>' . __( 'Contact information' ) . '</h2>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Contact information' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h2>' . __( 'Additional information' ) . '</h2>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Additional information' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'How we protect your data' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'How we protect your data' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users’ data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'What data breach procedures we have in place' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'What third parties we receive data from' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Default privacy policy heading. */
- $strings[] = '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Default privacy policy heading. */
+ $strings[] = '<h2>' . __( 'Industry regulatory disclosure requirements' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '</div>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,10 +658,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $string, '<h2>' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[ $key ] = '<!-- wp:heading -->' . $string . '<!-- /wp:heading -->';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( 0 === strpos( $string, '<h3>' ) ) {
- $strings[ $key ] = '<!-- wp:heading {"level":3} -->' . $string . '<!-- /wp:heading -->';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,12 +670,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0 Added the `$strings`, `$description`, and `$blocks` parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.7.0 This filter has been deprecated.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $content The default policy content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $strings An array of privacy policy content strings.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $description Whether policy descriptions should be included.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $blocks Whether the content should be formatted for the block editor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'wp_get_default_privacy_policy_content', $content, $strings, $description, $blocks );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters_deprecated( 'wp_get_default_privacy_policy_content', array( $content, $strings, $description, $blocks ), '5.7.0', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function add_suggested_content() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = self::get_default_content( true, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = self::get_default_content( false, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_add_privacy_policy_content( __( 'WordPress' ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-privacy.php 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/wp-admin/options-privacy.php 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to manage privacy options on this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['tab'] ) && 'policyguide' === $_GET['tab'] ) {
+ require_once( dirname( __FILE__ ) . '/privacy-policy-guide.php' );
+ return;
+}
+
+add_filter(
+ 'admin_body_class',
+ function( $body_class ) {
+ $body_class .= ' privacy-settings ';
+
+ return $body_class;
+ }
+);
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_POST['action'] ) ? $_POST['action'] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $action ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,15 +126,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$title = __( 'Privacy Settings' );
</del><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_script( 'privacy-tools' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="wrap">
- <h1><?php echo $title; ?></h1>
- <h2><?php _e( 'Privacy Policy Page' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="privacy-settings-header">
+ <div class="privacy-settings-title-section">
+ <h1>
+ <?php _e( 'Privacy' ); ?>
+ </h1>
+ </div>
+
+ <nav class="privacy-settings-tabs-wrapper hide-if-no-js" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+ <a href="<?php echo esc_url( admin_url( 'options-privacy.php' ) ); ?>" class="privacy-settings-tab active" aria-current="true">
+ <?php
+ /* translators: Tab heading for Site Health Status page. */
+ _ex( 'Settings', 'Privacy Settings' );
+ ?>
+ </a>
+
+ <a href="<?php echo esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ); ?>" class="privacy-settings-tab">
+ <?php
+ /* translators: Tab heading for Site Health Status page. */
+ _ex( 'Policy Guide', 'Privacy Settings' );
+ ?>
+ </a>
+ </nav>
+</div>
+
+<hr class="wp-header-end">
+
+<div class="notice notice-error hide-if-js">
+ <p><?php _e( 'The Privacy Settings require JavaScript.' ); ?></p>
+</div>
+
+<div class="privacy-settings-body hide-if-no-js">
+ <h2><?php _e( 'Privacy Settings' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a Privacy Policy.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you already have a Privacy Policy page, please select it below. If not, please create one.' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,57 +177,87 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
-
- if ( $privacy_policy_page_exists ) {
- $edit_href = add_query_arg(
- array(
- 'post' => $privacy_policy_page_id,
- 'action' => 'edit',
- ),
- admin_url( 'post.php' )
- );
-
- $view_href = get_permalink( $privacy_policy_page_id );
- ?>
- <p class="tools-privacy-edit"><strong>
- <?php
- if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
- printf(
- /* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page. */
- __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your Privacy Policy page content.' ),
- esc_url( $edit_href ),
- esc_url( $view_href )
- );
- } else {
- printf(
- /* translators: 1: URL to edit Privacy Policy page, 2: URL to preview Privacy Policy page. */
- __( '<a href="%1$s">Edit</a> or <a href="%2$s">preview</a> your Privacy Policy page content.' ),
- esc_url( $edit_href ),
- esc_url( $view_href )
- );
- }
- ?>
- </strong></p>
- <?php
- }
- ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $privacy_policy_page_exists ) {
+ $edit_href = add_query_arg(
+ array(
+ 'post' => $privacy_policy_page_id,
+ 'action' => 'edit',
+ ),
+ admin_url( 'post.php' )
+ );
+ $view_href = get_permalink( $privacy_policy_page_id );
+ ?>
+ <strong>
+ <?php
+ if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
+ printf(
+ /* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page. */
+ __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your Privacy Policy page content.' ),
+ esc_url( $edit_href ),
+ esc_url( $view_href )
+ );
+ } else {
+ printf(
+ /* translators: 1: URL to edit Privacy Policy page, 2: URL to preview Privacy Policy page. */
+ __( '<a href="%1$s">Edit</a> or <a href="%2$s">preview</a> your Privacy Policy page content.' ),
+ esc_url( $edit_href ),
+ esc_url( $view_href )
+ );
+ }
+ ?>
+ </strong>
+ <?php
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Privacy Policy guide URL, 2: Additional link attributes, 3: Accessibility text. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
- esc_url( admin_url( 'privacy-policy-guide.php' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our Privacy Policy guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
+ esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> ''
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> <hr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $has_pages = (bool) get_posts(
+ array(
+ 'post_type' => 'page',
+ 'posts_per_page' => 1,
+ 'post_status' => array(
+ 'publish',
+ 'draft',
+ ),
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table tools-privacy-policy-page" role="presentation">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="create-page">
+ <?php
+ if ( $has_pages ) {
+ _e( 'Create a new Privacy Policy Page' );
+ } else {
+ _e( 'There are no pages.' );
+ }
+ ?>
+ </label>
+ </th>
+ <td>
+ <form class="wp-create-privacy-page" method="post" action="">
+ <input type="hidden" name="action" value="create-privacy-page" />
+ <?php
+ wp_nonce_field( 'create-privacy-page' );
+ submit_button( __( 'Create' ), 'secondary', 'submit', false, array( 'id' => 'create-page' ) );
+ ?>
+ </form>
+ </td>
+ </tr>
+ <?php if ( $has_pages ) : ?>
+ <tr>
+ <th scope="row">
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="page_for_privacy_policy">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $privacy_policy_page_exists ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,59 +269,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $has_pages = (bool) get_posts(
- array(
- 'post_type' => 'page',
- 'posts_per_page' => 1,
- 'post_status' => array(
- 'publish',
- 'draft',
- ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form method="post" action="">
+ <input type="hidden" name="action" value="set-privacy-page" />
+ <?php
+ wp_dropdown_pages(
+ array(
+ 'name' => 'page_for_privacy_policy',
+ 'show_option_none' => __( '— Select —' ),
+ 'option_none_value' => '0',
+ 'selected' => $privacy_policy_page_id,
+ 'post_status' => array( 'draft', 'publish' ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $has_pages ) :
- ?>
- <form method="post" action="">
- <input type="hidden" name="action" value="set-privacy-page" />
- <?php
- wp_dropdown_pages(
- array(
- 'name' => 'page_for_privacy_policy',
- 'show_option_none' => __( '— Select —' ),
- 'option_none_value' => '0',
- 'selected' => $privacy_policy_page_id,
- 'post_status' => array( 'draft', 'publish' ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_nonce_field( 'set-privacy-page' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_nonce_field( 'set-privacy-page' );
-
- submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) );
- ?>
- </form>
- <?php endif; ?>
-
- <form class="wp-create-privacy-page" method="post" action="">
- <input type="hidden" name="action" value="create-privacy-page" />
- <span>
- <?php
- if ( $has_pages ) {
- _e( 'Or' );
- } else {
- _e( 'There are no pages.' );
- }
- ?>
- </span>
- <?php
- wp_nonce_field( 'create-privacy-page' );
-
- submit_button( __( 'Create New Page' ), 'primary', 'submit', false, array( 'id' => 'create-page' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminprivacypolicyguidephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/privacy-policy-guide.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy-policy-guide.php 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/wp-admin/privacy-policy-guide.php 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,17 +17,74 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$title = __( 'Privacy Policy Guide' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter(
+ 'admin_body_class',
+ function( $body_class ) {
+ $body_class .= ' privacy-settings ';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $body_class;
+ }
+);
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'privacy-tools' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="wrap">
- <h1><?php echo esc_html( $title ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="privacy-settings-header">
+ <div class="privacy-settings-title-section">
+ <h1>
+ <?php _e( 'Privacy' ); ?>
+ </h1>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="wp-privacy-policy-guide">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <nav class="privacy-settings-tabs-wrapper hide-if-no-js" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+ <a href="<?php echo esc_url( admin_url( 'options-privacy.php' ) ); ?>" class="privacy-settings-tab">
+ <?php
+ /* translators: Tab heading for Site Health Status page. */
+ _ex( 'Settings', 'Privacy Settings' );
+ ?>
+ </a>
+
+ <a href="<?php echo esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ); ?>" class="privacy-settings-tab active" aria-current="true">
+ <?php
+ /* translators: Tab heading for Site Health Status page. */
+ _ex( 'Policy Guide', 'Privacy Settings' );
+ ?>
+ </a>
+ </nav>
+</div>
+
+<hr class="wp-header-end">
+
+<div class="notice notice-error hide-if-js">
+ <p><?php _e( 'The Privacy Settings require JavaScript.' ); ?></p>
+</div>
+
+<div class="privacy-settings-body hide-if-no-js">
+ <h2><?php _e( 'Privacy Policy Guide' ); ?></h2>
+ <h3 class="section-title"><?php _e( 'Introduction' ); ?></h3>
+ <p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
+ <p><?php _e( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
+ <p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
+ <p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
+ <div class="privacy-settings-accordion">
+ <h4 class="privacy-settings-accordion-heading">
+ <button aria-expanded="false" class="privacy-settings-accordion-trigger" aria-controls="privacy-settings-accordion-block-privacy-policy-guide" type="button">
+ <span class="title"><?php _e( 'Privacy Policy Guide' ); ?></span>
+ <span class="icon"></span>
+ </button>
+ </h4>
+ <div id="privacy-settings-accordion-block-privacy-policy-guide" class="privacy-settings-accordion-panel" hidden="hidden">
+ <?php
+ $content = WP_Privacy_Policy_Content::get_default_content( true, false );
+ echo $content;
+ ?>
+ </div>
+ </div>
+ <hr class="hr-separator">
+ <h3 class="section-title"><?php _e( 'Policies' ); ?></h3>
+ <div class="privacy-settings-accordion wp-privacy-policy-guide">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php WP_Privacy_Policy_Content::privacy_policy_guide(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadmintoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/tools.php 2021-02-02 19:59:51 UTC (rev 50160)
+++ trunk/src/wp-admin/tools.php 2021-02-02 20:12:39 UTC (rev 50161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The privacy policy guide used to be outputted from here. Since WP 5.3 it is in wp-admin/privacy-policy-guide.php.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['wp-privacy-policy-guide'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname( __DIR__ ) . '/wp-load.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( admin_url( 'privacy-policy-guide.php' ), 301 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( admin_url( 'options-privacy.php?tab=policyguide' ), 301 );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['page'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // These were also moved to files in WP 5.3.
</span></span></pre>
</div>
</div>
</body>
</html>