<!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>[46709] trunk/src/wp-admin: Help/About: Update the 5.3 About 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/46709">46709</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/46709","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>2019-11-11 20:43:48 +0000 (Mon, 11 Nov 2019)</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'>Help/About: Update the 5.3 About page.
* Remove extra padding on the Credits tab.
Previously <a href="https://core.trac.wordpress.org/changeset/46556">[46556]</a>, <a href="https://core.trac.wordpress.org/changeset/46572">[46572]</a>, <a href="https://core.trac.wordpress.org/changeset/46616">[46616]</a>, <a href="https://core.trac.wordpress.org/changeset/46705">[46705]</a>.
Props ryelle.
See <a href="https://core.trac.wordpress.org/ticket/47708">#47708</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunksrcwpadminincludescreditsphp">trunk/src/wp-admin/includes/credits.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2019-11-11 20:30:16 UTC (rev 46708)
+++ trunk/src/wp-admin/credits.php 2019-11-11 20:43:48 UTC (rev 46709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,76 +85,47 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$previous_type = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <hr />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( $credits['groups'] as $group_slug => $group_data ) :
- ?>
- <?php
- if ( $previous_type !== $group_data['type'] ) {
- echo '<hr />';
- }
- ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="about__section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="column <?php echo 'titles' === $group_data['type'] ? 'has-subtle-background-color' : ''; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="column has-subtle-background-color">
+ <?php wp_credits_section_title( $credits['groups']['core-developers'] ); ?>
+ <?php wp_credits_section_list( $credits, 'core-developers' ); ?>
+ <?php wp_credits_section_list( $credits, 'contributing-developers' ); ?>
+ </div>
+ </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">- <?php
- if ( $group_data['name'] ) {
- if ( 'Translators' == $group_data['name'] ) {
- // Considered a special slug in the API response. (Also, will never be returned for en_US.)
- $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
- } elseif ( isset( $group_data['placeholders'] ) ) {
- // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
- $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
- } else {
- // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
- $title = translate( $group_data['name'] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <hr />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="about__section">
+ <div class="column">
+ <?php wp_credits_section_title( $credits['groups']['props'] ); ?>
+ <?php wp_credits_section_list( $credits, 'props' ); ?>
+ </div>
+ </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">- if ( ! empty( $group_data['shuffle'] ) ) {
- shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <hr />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $group_data['type'] ) {
- case 'list':
- array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
- echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
- break;
- case 'libraries':
- array_walk( $group_data['data'], '_wp_credits_build_object_link' );
- echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
- break;
- default:
- $compact = 'compact' == $group_data['type'];
- $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
- echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
- foreach ( $group_data['data'] as $person_data ) {
- echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
- echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
- $size = 'compact' == $group_data['type'] ? 40 : 80;
- $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
- $size *= 2;
- $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
- echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
- echo esc_html( $person_data[0] ) . "</a>\n\t";
- if ( ! $compact ) {
- // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
- echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
- }
- echo "</li>\n";
- }
- echo "</ul>\n";
- break;
- }
- $previous_type = $group_data['type'];
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( isset( $credits['groups']['translators'] ) || isset( $credits['groups']['validators'] ) ) : ?>
+ <div class="about__section">
+ <div class="column">
+ <?php wp_credits_section_title( $credits['groups']['validators'] ); ?>
+ <?php wp_credits_section_list( $credits, 'validators' ); ?>
+ <?php wp_credits_section_list( $credits, 'translators' ); ?>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <hr />
+ <?php endif; ?>
+
+ <div class="about__section">
+ <div class="column">
+ <?php wp_credits_section_title( $credits['groups']['libraries'] ); ?>
+ <?php wp_credits_section_list( $credits, 'libraries' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</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">-<?php endforeach; ?>
</del><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></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 2019-11-11 20:30:16 UTC (rev 46708)
+++ trunk/src/wp-admin/css/about.css 2019-11-11 20:43:48 UTC (rev 46709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,11 +550,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 2.0 - Credits Page
</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">-.about__section .wp-people-group-title {
- margin-bottom: 2em;
- font-size: 1.4em;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .about__section .wp-people-group {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludescreditsphp"></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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/credits.php 2019-11-11 20:30:16 UTC (rev 46708)
+++ trunk/src/wp-admin/includes/credits.php 2019-11-11 20:43:48 UTC (rev 46709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,3 +76,82 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_credits_build_object_link( &$data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Display a the title for a given group of contributors.
+ *
+ * @since 5.3.0
+ *
+ * @param array $group_data The current contributor group.
+ */
+function wp_credits_section_title( $group_data = array() ) {
+ if ( ! count( $group_data ) ) {
+ return;
+ }
+
+ if ( $group_data['name'] ) {
+ if ( 'Translators' === $group_data['name'] ) {
+ // Considered a special slug in the API response. (Also, will never be returned for en_US.)
+ $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
+ } elseif ( isset( $group_data['placeholders'] ) ) {
+ // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+ $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+ } else {
+ // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+ $title = translate( $group_data['name'] );
+ }
+
+ echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n";
+ }
+}
+
+/**
+ * Display a list of contributors for a given group.
+ *
+ * @since 5.3.0
+ *
+ * @param array $credits The credits groups returned from the API.
+ * @param string $slug The current group to display.
+ */
+function wp_credits_section_list( $credits = array(), $slug = '' ) {
+ $group_data = isset( $credits['groups'][ $slug ] ) ? $credits['groups'][ $slug ] : array();
+ $credits_data = $credits['data'];
+ if ( ! count( $group_data ) ) {
+ return;
+ }
+
+ if ( ! empty( $group_data['shuffle'] ) ) {
+ shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+ }
+
+ switch ( $group_data['type'] ) {
+ case 'list':
+ array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles'] );
+ echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+ break;
+ case 'libraries':
+ array_walk( $group_data['data'], '_wp_credits_build_object_link' );
+ echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+ break;
+ default:
+ $compact = 'compact' === $group_data['type'];
+ $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
+ echo '<ul class="' . $classes . '" id="wp-people-group-' . $slug . '">' . "\n";
+ foreach ( $group_data['data'] as $person_data ) {
+ echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
+ echo '<a href="' . esc_url( sprintf( $credits_data['profiles'], $person_data[2] ) ) . '" class="web">';
+ $size = $compact ? 40 : 80;
+ $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+ $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) );
+ echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
+ echo esc_html( $person_data[0] ) . "</a>\n\t";
+ if ( ! $compact ) {
+ // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+ echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+ }
+ echo "</li>\n";
+ }
+ echo "</ul>\n";
+ break;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>