<!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>[43100] branches/4.9/src/wp-admin/privacy.php: Privacy: improve the screen for setting a privacy policy page.</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/43100">43100</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/43100","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-02 02:49:55 +0000 (Wed, 02 May 2018)</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: improve the screen for setting a privacy policy page.
Props melchoyce, xkon, azaozz.
Merges <a href="https://core.trac.wordpress.org/changeset/42978">[42978]</a> and <a href="https://core.trac.wordpress.org/changeset/43091">[43091]</a> to the 4.9 branch.
See <a href="https://core.trac.wordpress.org/ticket/43435">#43435</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadmincssformscss">branches/4.9/src/wp-admin/css/forms.css</a></li>
<li><a href="#branches49srcwpadminprivacyphp">branches/4.9/src/wp-admin/privacy.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.9 2018-05-02 02:47:23 UTC (rev 43099)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2018-05-02 02:49:55 UTC (rev 43100)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42687,42711,42713,42719,42722,42739-42740,42744,42758,42791-42792,42801,42814,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889,42892-42894,42930,42964,42967,42971-42972,42977,42986
-42987,42989,42994,42998,43001,43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43045-43047,43056-43059,43062-43063,43065,43081,43089
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42687,42711,42713,42719,42722,42739-42740,42744,42758,42791-42792,42801,42814,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889,42892-42894,42930,42964,42967,42971-42972,42977-42978
,42986-42987,42989,42994,42998,43001,43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43045-43047,43056-43059,43062-43063,43065,43081,43089,43091
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpadmincssformscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/css/forms.css 2018-05-02 02:47:23 UTC (rev 43099)
+++ branches/4.9/src/wp-admin/css/forms.css 2018-05-02 02:49:55 UTC (rev 43100)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,7 +1076,120 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</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">+/*------------------------------------------------------------------------------
+ Privacy Policy settings screen
+------------------------------------------------------------------------------*/
+.tools-privacy-policy-page form {
+ margin-bottom: 1.3em;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.tools-privacy-policy-page input.button,
+.tools-privacy-policy-page select {
+ margin-left: 6px;
+}
+
+.tools-privacy-edit {
+ margin: 2.3em 0;
+}
+
+.tools-privacy-policy-page span {
+ line-height: 2em;
+}
+
+.privacy_requests .column-email {
+ width: 40%;
+}
+
+.privacy_requests .column-type {
+ text-align: center;
+}
+
+.privacy_requests thead td:first-child,
+.privacy_requests tfoot td:first-child {
+ border-left: 4px solid #fff;
+}
+
+.privacy_requests tbody th {
+ border-left: 4px solid #fff;
+ background: #fff;
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+}
+
+.privacy_requests tbody td {
+ background: #fff;
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+}
+
+.privacy_requests .status-request-confirmed th,
+.privacy_requests .status-request-confirmed td {
+ background-color: #f7fcfe;
+ border-left-color: #00a0d2;
+}
+
+.privacy_requests .status-request-failed th,
+.privacy_requests .status-request-failed td {
+ background-color: #fef7f1;
+ border-left-color: #d64d21;
+}
+
+.status-label {
+ font-weight: bold;
+}
+
+.status-label.status-request-pending {
+ font-weight: normal;
+ font-style: italic;
+ color: #6c7781;
+}
+
+.status-label.status-request-failed {
+ color: #aa0000;
+ font-weight: bold;
+}
+
+.wp-privacy-request-form {
+ clear: both;
+}
+
+.wp-privacy-request-form-field {
+ margin: 1.5em 0;
+}
+
+.wp-privacy-request-form label {
+ font-weight: bold;
+ line-height: 1.5;
+ padding-bottom: .5em;
+ display: block;
+}
+
+.wp-privacy-request-form input {
+ line-height: 1.5;
+ margin: 0;
+}
+
+.email-personal-data::before {
+ display: inline-block;
+ font: normal 20px/1 dashicons;
+ margin: 3px 5px 0 -2px;
+ speak: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ vertical-align: top;
+}
+
+.email-personal-data--sending::before {
+ color: #f56e28;
+ content: "\f463";
+ -webkit-animation: rotation 2s infinite linear;
+ animation: rotation 2s infinite linear;
+}
+
+.email-personal-data--sent::before {
+ color: #79ba49;
+ content: "\f147";
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* =Media Queries
</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">@@ -1404,85 +1517,6 @@
</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">-
-/* Privacy */
-
-.privacy_requests .column-email {
- width: 40%;
-}
-.privacy_requests .column-type {
- text-align: center;
-}
-.privacy_requests thead td:first-child,
-.privacy_requests tfoot td:first-child {
- border-left: 4px solid #fff;
-}
-.privacy_requests tbody th {
- border-left: 4px solid #fff;
- background: #fff;
- box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-.privacy_requests tbody td {
- background: #fff;
- box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-.privacy_requests .status-request-confirmed th,
-.privacy_requests .status-request-confirmed td {
- background-color: #f7fcfe;
- border-left-color: #00a0d2;
-}
-.privacy_requests .status-request-failed th,
-.privacy_requests .status-request-failed td {
- background-color: #fef7f1;
- border-left-color: #d64d21;
-}
-.status-label {
- font-weight: bold;
-}
-.status-label.status-request-pending {
- font-weight: normal;
- font-style: italic;
- color: #6c7781;
-}
-.status-label.status-request-failed {
- color: #aa0000;
- font-weight: bold;
-}
-.wp-privacy-request-form {
- clear: both;
-}
-.wp-privacy-request-form-field {
- margin: 1.5em 0;
-}
-.wp-privacy-request-form label {
- font-weight: bold;
- line-height: 1.5;
- padding-bottom: .5em;
- display: block;
-}
-.wp-privacy-request-form input {
- line-height: 1.5;
- margin: 0;
-}
-.email-personal-data::before {
- display: inline-block;
- font: normal 20px/1 dashicons;
- margin: 3px 5px 0 -2px;
- speak: none;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- vertical-align: top;
-}
-.email-personal-data--sending::before {
- color: #f56e28;
- content: "\f463";
- -webkit-animation: rotation 2s infinite linear;
- animation: rotation 2s infinite linear;
-}
-.email-personal-data--sent::before {
- color: #79ba49;
- content: "\f147";
-}
</del><span class="cx" style="display: block; padding: 0 10px"> @-webkit-keyframes rotation {
</span><span class="cx" style="display: block; padding: 0 10px"> 0% {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: rotate(0deg);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,6 +1527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transform: rotate(359deg);
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> @keyframes rotation {
</span><span class="cx" style="display: block; padding: 0 10px"> 0% {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-transform: rotate(0deg);
</span></span></pre></div>
<a id="branches49srcwpadminprivacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/privacy.php 2018-05-02 02:47:23 UTC (rev 43099)
+++ branches/4.9/src/wp-admin/privacy.php 2018-05-02 02:49:55 UTC (rev 43100)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Privacy policy page updated successfully.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf(
+ /* translators: %s: URL to Customizer -> Menus */
+ __( 'Privacy policy page updated successfully. Remember to <a href="%s">update your menus</a>!' ),
+ 'customize.php?autofocus[panel]=nav_menus'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'create-privacy-page' === $action ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +54,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'wp_page_for_privacy_policy', $privacy_policy_page_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_settings_error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Privacy policy page created successfully.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf(
+ /* translators: %s: URL to edit Privacy Policy page */
+ __( 'Your Privacy Policy page created successfully. You’ll want to <a href="%s">review and edit your policy</a> next.' ),
+ 'post.php?post=' . $privacy_policy_page_id . '&action=edit'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated'
</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">@@ -62,38 +71,41 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a privacy policy page ID is available, make sure the page actually exists. If not, display an error.
</span><span class="cx" style="display: block; padding: 0 10px"> $privacy_policy_page_exists = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $privacy_policy_page_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $privacy_policy_page = get_post( $privacy_policy_page_id );
- if ( ! $privacy_policy_page instanceof WP_Post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $privacy_policy_page = get_post( $privacy_policy_page_id );
+
+ if ( ! $privacy_policy_page instanceof WP_Post ) {
+ add_settings_error(
+ 'page_for_privacy_policy',
+ 'page_for_privacy_policy',
+ __( 'The currently selected privacy policy page does not exist. Please create or select new page.' ),
+ 'error'
+ );
+ } else {
+ if ( 'trash' === $privacy_policy_page->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_settings_error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'The currently selected privacy policy page does not exist. Please create or select new page.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf(
+ /* translators: URL to Pages Trash */
+ __( 'The currently selected privacy policy page is in the trash. Please create or select new privacy policy page or <a href="%s">restore the current page</a>.' ),
+ 'edit.php?post_status=trash&post_type=page'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' === $privacy_policy_page->post_status ) {
- add_settings_error(
- 'page_for_privacy_policy',
- 'page_for_privacy_policy',
- sprintf(
- __( 'The currently selected privacy policy page is in the trash. Please create or select new privacy policy page or <a href="%s">restore the current page</a>.' ),
- 'edit.php?post_status=trash&post_type=page'
- ),
- 'error'
- );
- } else {
- $privacy_policy_page_exists = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $privacy_policy_page_exists = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'privacy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Privacy' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => '<p>' . __( 'This page provides tools with which you can manage your user\'s personal data and site\'s privacy policy.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => '<p>' . __( 'This page provides tools with which you can manage your user’s personal data and site’s privacy policy.' ) . '</p>',
</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"> get_current_screen()->set_help_sidebar(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,25 +119,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Privacy Tools' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_errors(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <h2><?php _e( 'Privacy policy page' ); ?></h2>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php _e( 'Privacy Policy page' ); ?></h2>
+ <p>
+ <?php _e( 'The first step towards privacy laws compliance is to have a comprehensive Privacy Policy.' ); ?>
+ <?php _e( 'If you already have a Privacy Policy page, please select it below. If not, create one.' ); ?>
+ <?php _e( 'The new policy will include the suggested privacy text.' ); ?>
+ </p>
+ <p>
+ <?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
+ <?php _e( 'On the edit page screen you will find additional privacy information added by your plugins.' ); ?>
+ <?php _e( 'We would also suggest reviewing your privacy policy from time to time, after a WordPress or a plugin update.' ); ?>
+ <?php _e( 'There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
+ </p>
</ins><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="cx" style="display: block; padding: 0 10px"> $edit_href = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post' => $privacy_policy_page_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post' => $privacy_policy_page_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'edit',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'post.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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $view_href = get_permalink( $privacy_policy_page_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="tools-privacy-edit"><strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: URL to edit page, 2: URL to view page */
+ __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy page content.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $edit_href,
</span><span class="cx" style="display: block; padding: 0 10px"> $view_href
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,27 +156,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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">-
- <table class="form-table">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <hr>
+ <table class="form-table tools-privacy-policy-page">
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="page_for_privacy_policy">
- <?php
-
- if ( $privacy_policy_page_exists ) {
- _e( 'Select another page for your privacy policy' );
- } else {
- _e( 'Select an existing privacy policy page' );
- }
-
- ?>
- </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( $privacy_policy_page_exists ) {
+ _e( 'Change your Privacy Policy page' );
+ } else {
+ _e( 'Select a Privacy Policy page' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td id="front-static-pages">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="page_for_privacy_policy">
+ <?php _e( 'Either select an existing page:' ); ?>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="set-privacy-page" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'page_for_privacy_policy',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,37 +186,26 @@
</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"> wp_nonce_field( 'set-privacy-page' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- submit_button( __( 'Set Page' ), 'primary', 'submit', true, array( 'id' => 'set-page' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <form method="post" action="">
+ <input type="hidden" name="action" value="create-privacy-page" />
+ <span>
+ <?php _e( 'Or create a new page: ' ); ?>
+ </span>
+ <?php
+ wp_nonce_field( 'create-privacy-page' );
+
+ submit_button( __( 'Create New Page' ), 'primary', 'submit', false, array( 'id' => 'create-page' ) );
+ ?>
+ </form>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
-
- if ( ! $privacy_policy_page_exists ) {
- ?>
- <tr>
- <th scope="row"><?php _e( 'Create new page for your privacy policy' ); ?></th>
- <td>
- <form method="post" action="">
- <input type="hidden" name="action" value="create-privacy-page" />
- <?php
-
- wp_nonce_field( 'create-privacy-page' );
- submit_button( __( 'Create Page' ), 'primary', 'submit', true, array( 'id' => 'create-page' ) );
-
- ?>
- </form>
- </td>
- </tr>
- <?php
- }
-
- ?>
</del><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>