<!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>[42121] trunk/src/wp-admin: About Page: Implement design.</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 { 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/42121">42121</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/42121","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>melchoyce</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-07 04:10:41 +0000 (Tue, 07 Nov 2017)</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'>About Page: Implement design.
Props ryelle, karmatosed, transl8or, obenland, melchoyce.
See <a href="https://core.trac.wordpress.org/ticket/42087">#42087</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.php</a></li>
<li><a href="#trunksrcwpadmincreditsphp">trunk/src/wp-admin/credits.php</a></li>
<li><a href="#trunksrcwpadmincssaboutcss">trunk/src/wp-admin/css/about.css</a></li>
<li><a href="#trunksrcwpadminfreedomsphp">trunk/src/wp-admin/freedoms.php</a></li>
<li><a href="#trunksrcwpadminprivacyphp">trunk/src/wp-admin/privacy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminaboutphp"></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/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2017-11-07 01:08:11 UTC (rev 42120)
+++ trunk/src/wp-admin/about.php 2017-11-07 04:10:41 UTC (rev 42121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,32 +9,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Administration Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.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">-if ( ! wp_is_mobile() ) {
- wp_enqueue_style( 'wp-mediaelement' );
- wp_enqueue_script( 'mediaelement-vimeo' );
- wp_enqueue_script( 'wp-mediaelement' );
- wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
- 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
- 'classPrefix' => 'mejs-',
- 'stretching' => 'responsive',
- 'pauseOtherPlayers' => '',
- ) );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_script( 'underscore' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$video_url = 'https://videopress.com/embed/AHz0Ca46?hd=true';
-$lang_code = str_replace( '_', '-', get_user_locale() );
-list( $lang_code ) = explode( '-', $lang_code );
-if ( 'en' !== $lang_code ) {
- $video_url = add_query_arg( 'defaultLangCode', $lang_code, $video_url );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'About' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
</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-header.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="wrap about-wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="wrap about-wrap full-width-layout">
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,137 +45,142 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <hr />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="inline-svg full-width">
+ <picture>
+ <source media="(max-width: 500px)" srcset="<?php echo 'https://s.w.org/images/core/4.9/banner-mobile.svg'; ?>">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/banner.svg'; ?>" alt="">
+ </picture>
+ </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">- <h2>
- <?php
- printf(
- /* translators: %s: wrench emoji */
- __( 'Customizer Workflow Improved %s' ),
- '🔧'
- );
- ?>
- </h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="floating-header-section">
+ <h2><?php _e( 'Customizer Workflow Improved' ); ?></h2>
</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="headline-feature one-col">
- <div class="col">
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="section-content">
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/draft-and-schedule.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Draft and Schedule Site Design Customizations' ); ?></h3>
+ <p><?php _e( 'Yes, you read that right. Just like you can draft and revise posts and schedule them to go live on the date and time you choose, you can now tinker with your site’s design and schedule those design changes to go live as you please.' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/design-preview-links.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Collaborate with Design Preview Links' ); ?></h3>
+ <p><?php _e( 'Need to get some feedback on proposed site design changes? WordPress 4.9 gives you a preview link you can send to your team and customers so that you can collect and integrate feedback before you schedule the changes to go live. Can we say collaboration++?' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/locking.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Design Locking To Guard Your Changes' ); ?></h3>
+ <p><?php _e( 'Ever encounter a scenario where two designers walk into a project and designer A overrides designer B’s beautiful changes? WordPress 4.9’s design lock feature (similar to post locking) secures your draft design so that no one can make changes to it or erase all your hard work.' );?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/prompt.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'A Prompt to Protect Your Work' ); ?></h3>
+ <p><?php _e( 'Were you lured away from your desk before you saved your new draft design? Fear not, when you return, WordPress 4.9 will politely ask whether or not you’d like to save your unsaved changes.' ); ?></p>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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="feature-section two-col">
- <div class="col">
- <h3><?php _e( 'Draft and Schedule Site Design Customizations' ); ?></h3>
- <p><?php _e( 'Yes, you read that right. Just like you can draft and revise posts and schedule them to go live on the date and time you choose, you can now tinker with your site’s design and schedule those design changes to go live as you please.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="floating-header-section">
+ <h2><?php _e( 'Coding Enhancements' ); ?></h2>
+
+ <div class="section-content">
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/syntax-highlighting.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Syntax Highlighting and Error Checking? Yes, Please!' ); ?></h3>
+ <p><?php _e( 'You’ve got a display problem but can’t quite figure out exactly what went wrong in the CSS you lovingly wrote. With syntax highlighting and error checking for CSS editing and the Custom HTML widget introduced in WordPress 4.8.1, you’ll pinpoint coding errors quickly. Practically guaranteed to help you scan code more easily and suss out and fix code errors quickly.' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/sandbox.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Sandbox for Safety' ); ?></h3>
+ <p><?php _e( 'The dreaded white screen. You’ll avoid it when working on themes and plugin code because WordPress 4.9 will warn you about saving an error. You’ll sleep better at night.' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/warning.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Warning: Potential Danger Ahead!' ); ?></h3>
+ <p><?php _e( 'When you edit themes and plugins directly, WordPress 4.9 will politely warn you that this is a dangerous practice. It will recommend that you backup your files before saving, so they don’t get overwritten by the next update. Take the safe route: your future self will thank you. Your team and customers will thank you.' );?></p>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="col">
- <h3><?php _e( 'Collaborate with Design Preview Links' ); ?></h3>
- <p><?php _e( 'Need to get some feedback on proposed site design changes? WordPress 4.9 gives you a preview link you can send to your team and customers so that you can collect and integrate feedback before you schedule the changes to go live. Can we say collaboration++?' ); ?></p>
- </div>
- <div class="col">
- <h3><?php _e( 'Design Locking To Guard Your Changes' ); ?></h3>
- <p><?php _e( 'Ever encounter a scenario where two designers walk into a project and designer A overrides designer B’s beautiful changes? WordPress 4.9’s design lock feature (similar to post locking) secures your draft design so that no one can make changes to it or erase all your hard work.' );?></p>
- </div>
- <div class="col">
- <h3><?php _e( 'A Prompt to Protect Your Work' ); ?></h3>
- <p><?php _e( 'Were you lured away from your desk before you saved your new draft design? Fear not, when you return, WordPress 4.9 will politely ask whether or not you’d like to save your unsaved changes.' ); ?></p>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <hr />
-
- <h2>
- <?php
- printf(
- /* translators: %s: technologist (woman) emoji */
- __( 'Coding Enhancements %s' ),
- '👩🏾‍💻'
- );
- ?>
- </h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="floating-header-section">
+ <h2><?php _e( 'Even More Widget Updates' ); ?></h2>
</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="feature-section three-col">
- <div class="col">
- <h3><?php _e( 'Syntax Highlighting and Error Checking? Yes, Please!' ); ?></h3>
- <p><?php _e( 'You’ve got a display problem but can’t quite figure out exactly what went wrong in the CSS you lovingly wrote. With syntax highlighting and error checking for CSS editing and the Custom HTML widget introduced in WordPress 4.8.1, you’ll pinpoint coding errors quickly. Practically guaranteed to help you scan code more easily and suss out and fix code errors quickly.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="section-content">
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/gallery-widget.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'The New Gallery Widget' ); ?></h3>
+ <p><?php _e( 'An incremental improvement to the media changes hatched in WordPress 4.8, you can now add a gallery via widget. Yes!' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/media-button.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Press a Button, Add Media' ); ?></h3>
+ <p><?php _e( 'Want to add media to your text widget? Embed images, video, and audio directly into the widget along with your text, with our simple but useful Add Media button. Woo!' ); ?></p>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="col">
- <h3><?php _e( 'Sandbox for Safety' ); ?></h3>
- <p><?php _e( 'The dreaded white screen. You’ll avoid it when working on themes and plugin code because WordPress 4.9 will warn you about saving an error. You’ll sleep better at night.' ); ?></p>
- </div>
- <div class="col">
- <h3><?php _e( 'Warning: Potential Danger Ahead!' ); ?></h3>
- <p><?php _e( 'When you edit themes and plugins directly, WordPress 4.9 will politely warn you that this is a dangerous practice. It will recommend that you backup your files before saving, so they don’t get overwritten by the next update. Take the safe route: your future self will thank you. Your team and customers will thank you.' );?></p>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <hr />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="floating-header-section">
+ <h2><?php _e( 'Site Building Improvements' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2>
- <?php
- printf(
- /* translators: %s: frame with picture emoji */
- __( 'Even More Widget Updates %s' ),
- '🖼'
- );
- ?>
- </h2>
-
- <div class="feature-section two-col">
- <div class="col">
- <h3><?php _e( 'The New Gallery Widget' ); ?></h3>
- <p><?php _e( 'An incremental improvement to the media changes hatched in WordPress 4.8, you can now add a gallery via widget. Yes!' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="section-content">
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/theme-switching.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'More Reliable Theme Switching' ); ?></h3>
+ <p><?php _e( 'When you switch themes, widgets sometimes think they can just up and move location. Improvements in WordPress 4.9 offer more persistent menu and widget placement when you decide it’s time for a new theme. Additionally, you can preview installed themes or download, install, and preview new themes right. Nothing says handy like being able to preview before you deploy. ' ); ?></p>
+ </div>
+ <div class="section-item">
+ <div class="inline-svg">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/menu-flow.svg'; ?>" alt="">
+ </div>
+ <h3><?php _e( 'Better Menu Instructions = Less Confusion' ); ?></h3>
+ <p><?php _e( 'Were you confused by the steps to create a new menu? Perhaps no longer! We’ve ironed out the UX for a smoother menu creation process. Newly updated copy will guide you.' ); ?></p>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="col">
- <h3><?php _e( 'Press a Button, Add Media' ); ?></h3>
- <p><?php _e( 'Want to add media to your text widget? Embed images, video, and audio directly into the widget along with your text, with our simple but useful Add Media button. Woo!' ); ?></p>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <hr />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="inline-svg">
+ <picture>
+ <source media="(max-width: 500px)" srcset="<?php echo 'https://s.w.org/images/core/4.9/gutenberg-mobile.svg'; ?>">
+ <img src="<?php echo 'https://s.w.org/images/core/4.9/gutenberg.svg'; ?>" alt="">
+ </picture>
+ </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">- <h2>
- <?php
- printf(
- /* translators: %s: hammer emoji */
- __( 'Site Building Improvements %s' ),
- '🔨'
- );
- ?>
- </h2>
-
- <div class="feature-section two-col">
- <div class="col">
- <h3><?php _e( 'More Reliable Theme Switching' ); ?></h3>
- <p><?php _e( 'When you switch themes, widgets sometimes think they can just up and move location. Improvements in WordPress 4.9 offer more persistent menu and widget placement when you decide it’s time for a new theme. Additionally, you can preview installed themes or download, install, and preview new themes right. Nothing says handy like being able to preview before you deploy. ' ); ?></p>
- </div>
- <div class="col">
- <h3><?php _e( 'Better Menu Instructions = Less Confusion' ); ?></h3>
- <p><?php _e( 'Were you confused by the steps to create a new menu? Perhaps no longer! We’ve ironed out the UX for a smoother menu creation process. Newly updated copy will guide you.' ); ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="feature-section">
+ <h2>
+ <?php
+ printf(
+ /* translators: %s: handshake emoji */
+ __( 'Lend a Hand with Gutenberg %s' ),
+ '🤝'
+ );
+ ?>
+ </h2>
+ <p><?php printf(
+ __( 'WordPress is working on a new way to create and control your content and we’d love to have your help. Interested in being an <a href="%s">early tester</a> or getting involved with the Gutenberg project? <a href="%s">Contribute on GitHub</a>.' ),
+ __( 'https://wordpress.org/plugins/gutenberg/' ),
+ 'https://github.com/WordPress/gutenberg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <hr />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <div class="feature-section one-col">
- <div class="col">
- <h2>
- <?php
- printf(
- /* translators: %s: handshake emoji */
- __( 'Lend a Hand with Gutenberg %s' ),
- '🤝'
- );
- ?>
- </h2>
- <p><?php printf(
- __( 'WordPress is working on a new way to create and control your content and we’d love to have your help. Interested in being an <a href="%s">early tester</a> or getting involved with the Gutenberg project? <a href="%s">Contribute on GitHub</a>.' ),
- __( 'https://wordpress.org/plugins/gutenberg/' ),
- 'https://github.com/WordPress/gutenberg' ); ?></p>
- </div>
- </div>
-
- <hr />
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="changelog">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,31 +191,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?></h2>
</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="under-the-hood three-col">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="under-the-hood two-col">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="col">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><a href="https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/"><?php _e( 'Customizer JS API Improvements' ); ?></a></h3>
+ <p><?php
+ printf(
+ /* translators: %s: https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/ */
+ __( 'We’ve made numerous improvements to the Customizer JS API in WordPress 4.9, eliminating many pain points and making it just as easy to work with as the PHP API. There are also new base control templates, a date/time control, and section/panel/global notifications to name a few. <a href="%s">Check out the full list.</a>' ),
+ 'https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/'
+ );
+ ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="col">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><a href="https://make.wordpress.org/core/2017/10/22/code-editing-improvements-in-wordpress-4-9/"><?php _e( 'CodeMirror available for use in your themes and plugins' ); ?></a></h3>
+ <p><?php _e( 'We’ve introduced a new code editing library, CodeMirror, for use within core. Use it to improve any code writing or editing experiences within your plugins, like CSS or JavaScript include fields.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="col">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><a href="https://make.wordpress.org/core/2017/10/30/mediaelement-upgrades-in-wordpress-4-9/"><?php _e( 'MediaElement.js upgraded to 4.2.6' ); ?></a></h3>
+ <p><?php _e( 'WordPress 4.9 includes an upgraded version of MediaElement.js, which removes dependencies on jQuery, improves accessibility, modernizes the UI, and fixes many bugs.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="col">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><a href="https://make.wordpress.org/core/2017/10/15/improvements-for-roles-and-capabilities-in-4-9/"><?php _e( 'Roles and Capability Improvements' ); ?></a></h3>
+ <p><?php _e( 'New capabilities have been introduced that allow granular management of plugins and translation files. In addition, the site switching process in multisite has been fine-tuned to update the available roles and capabilities in a more reliable and coherent way.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="col">
- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
- </div>
- <div class="col">
- <h3><a href="#"><?php _e( 'Heading' ); ?></a></h3>
- <p><?php _e( 'Paragraph' ); ?></p>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,8 +227,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard → Home' ) : _e( 'Go to Dashboard' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <script>
+ (function( $ ) {
+ $( function() {
+ var $window = $( window );
+ var $adminbar = $( '#wpadminbar' );
+ var $sections = $( '.floating-header-section' );
+ var offset = 0;
+
+ // Account for Admin bar.
+ if ( $adminbar.length ) {
+ offset += $adminbar.height();
+ }
+
+ var adjustScrollClass = _.throttle( function adjustScrollClass() {
+ $sections.each( function( i, section ) {
+ var $section = $( section );
+ var $header = $section.find( 'h2' );
+ var width = $header.innerWidth();
+
+ var sectionStart = $section.offset().top - offset;
+ var sectionEnd = sectionStart + $section.innerHeight() - 60;
+
+ // If we're scrolled into a section, stick the header
+ if ( $window.scrollTop() >= sectionStart && $window.scrollTop() < sectionEnd ) {
+ $header.addClass( 'header-fixed' );
+ $header.css( { top: offset + 'px', width: width + 'px' } );
+ } else {
+ $header.removeClass( 'header-fixed' );
+ $header.css( { top: 0, width: 'auto' } );
+ }
+ } );
+ }, 100 );
+ function enableFixedHeaders() {
+ if ( $window.width() > 782 ) {
+ adjustScrollClass();
+ $window.on( 'scroll', adjustScrollClass );
+ } else {
+ $window.off( 'scroll', adjustScrollClass );
+ $sections.find( 'h2' )
+ .removeClass( 'header-fixed' )
+ .css( { top: 0, width: 'auto' } );
+ }
+ }
+ $( window ).resize( enableFixedHeaders );
+ enableFixedHeaders();
+ } );
+ })( jQuery );
+ </script>
+
</ins><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>
<a id="trunksrcwpadmincreditsphp"></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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/credits.php 2017-11-07 01:08:11 UTC (rev 42120)
+++ trunk/src/wp-admin/credits.php 2017-11-07 04:10:41 UTC (rev 42121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</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-header.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="wrap about-wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wrap about-wrap full-width-layout">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="about-wrap-content">
</ins><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"> $credits = wp_credits();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '</div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</div>
</ins><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>
<a id="trunksrcwpadmincssaboutcss"></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/about.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/about.css 2017-11-07 01:08:11 UTC (rev 42120)
+++ trunk/src/wp-admin/css/about.css 2017-11-07 04:10:41 UTC (rev 42121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 2.0 About Page
</span><span class="cx" style="display: block; padding: 0 10px"> 2.1 Typography
</span><span class="cx" style="display: block; padding: 0 10px"> 2.2 Structure
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2.3 Floating Header Layout
</ins><span class="cx" style="display: block; padding: 0 10px"> 3.0 Credits & Freedoms Pages
</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">@@ -22,6 +23,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 15px;
</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">+.about-wrap.full-width-layout {
+ max-width: 1200px;
+}
+
+.about-wrap-content {
+ max-width: 1050px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .about-wrap div.updated,
</span><span class="cx" style="display: block; padding: 0 10px"> .about-wrap div.error,
</span><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .notice {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +182,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 700px;
</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">+.about-wrap .inline-svg img {
+ max-width: 100%;
+ width: 100%;
+ height: auto;
+}
+
+.about-wrap .inline-svg.full-width {
+ margin-bottom: 120px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .about-wrap [class$="-col"] .col {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-flex: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> flex: 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,6 +354,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0 5px;
</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">+/* 2.3 Floating Header Layout */
+
+.about-wrap .floating-header-section {
+ display: grid;
+ grid-gap: 0 60px;
+ grid-template-columns: 5fr 11fr;
+ max-width: 1020px;
+ margin: 0 auto 120px;
+}
+
+.about-wrap .floating-header-section h2 {
+ grid-column: 1;
+ text-align: left;
+ margin: 0;
+}
+
+.about-wrap .floating-header-section .header-fixed {
+ position: fixed;
+ width: 300px;
+}
+
+.about-wrap .floating-header-section .section-content {
+ display: grid;
+ grid-gap: 60px;
+ grid-template-columns: 5fr 5fr;
+ grid-column: 2;
+}
+
+.about-wrap .floating-header-section .section-item:nth-of-type(odd) {
+ grid-column: 1;
+}
+
+.about-wrap .floating-header-section .section-item:nth-of-type(even) {
+ grid-column: 2;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> 3.0 - Credits & Freedoms Pages
</span><span class="cx" style="display: block; padding: 0 10px"> ------------------------------------------------------------------------------*/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,6 +496,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ .about-wrap .floating-header-section {
+ grid-template-columns: 1fr;
+ grid-gap: 60px 0;
+ }
+
+ .about-wrap .floating-header-section h2,
+ .about-wrap .floating-header-section .section-content {
+ grid-column: 1;
+ }
</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"> @media only screen and (max-width: 500px) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,4 +550,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .under-the-hood:nth-of-type(3n) h3 {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ .about-wrap .floating-header-section {
+ margin-bottom: 60px;
+ grid-gap: 30px 0;
+ }
+
+ .about-wrap .inline-svg.full-width {
+ margin-bottom: 60px;
+ }
+
+ .about-wrap .floating-header-section .section-content {
+ grid-template-columns: 1fr;
+ grid-gap: 60px 0;
+ }
+
+ .about-wrap .floating-header-section .section-content .section-item {
+ grid-column: 1;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminfreedomsphp"></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/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/freedoms.php 2017-11-07 01:08:11 UTC (rev 42120)
+++ trunk/src/wp-admin/freedoms.php 2017-11-07 04:10:41 UTC (rev 42121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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-header.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="wrap about-wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wrap about-wrap full-width-layout">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,25 +30,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="about-wrap-content">
+ <p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></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">-<ol start="0">
- <li><p><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></p></li>
- <li><p><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></p></li>
- <li><p><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></p></li>
- <li><p><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></p></li>
-</ol>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ol start="0">
+ <li><p><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></p></li>
+ <li><p><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></p></li>
+ <li><p><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></p></li>
+ <li><p><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></p></li>
+ </ol>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></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">-<p><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
-$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
+ $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></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">-<p><?php _e( 'Don’t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Don’t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
</span></span></pre></div>
<a id="trunksrcwpadminprivacyphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy.php 2017-11-07 01:08:11 UTC (rev 42120)
+++ trunk/src/wp-admin/privacy.php 2017-11-07 04:10:41 UTC (rev 42121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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-header.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="wrap about-wrap">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wrap about-wrap full-width-layout">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,11 +30,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="privacy.php" class="nav-tab nav-tab-active"><?php _e( 'Privacy' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="about-description"><?php _e( 'From time to time, your WordPress site may send data to WordPress.org — including, but not limited to — the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="about-wrap-content">
+ <p class="about-description"><?php _e( 'From time to time, your WordPress site may send data to WordPress.org — including, but not limited to — the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></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">-<p><?php printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' ); ?></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">-<p><?php printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' ); ?></p>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>