<!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>[17909] trunk/wp-admin: Add core contributors to credits page, first pass.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17909">17909</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-05-13 00:49:53 +0000 (Fri, 13 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add core contributors to credits page, first pass. see <a href="http://trac.wordpress.org/ticket/17384">#17384</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincreditsphp">trunk/wp-admin/credits.php</a></li>
<li><a href="#trunkwpadminfreedomsphp">trunk/wp-admin/freedoms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (17908 => 17909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php 2011-05-12 23:13:56 UTC (rev 17908)
+++ trunk/wp-admin/credits.php 2011-05-13 00:49:53 UTC (rev 17909)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> add_action( 'admin_head', 'add_css' );
</span><span class="cx"> function add_css() { ?>
</span><span class="cx"> <style type="text/css">
</span><del>-h3.wp-people-group { clear: both; }
</del><ins>+h3.wp-people-group, h3.wp-props-group { clear: both; }
</ins><span class="cx"> ul.wp-people-group { margin-bottom: 50px; }
</span><span class="cx"> li.wp-person { float: left; height: 100px; width: 240px; margin-right: 20px; }
</span><span class="cx"> li.wp-person img.gravatar { float: left; margin-right: 10px; margin-bottom: 10px; width: 60px; height: 60px }
</span><span class="lines">@@ -33,49 +33,83 @@
</span><span class="cx"> $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.0/?version=$wp_version&locale=$locale" );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><del>- return new WP_Error( 'credits_fail', "Oops. We'll need to put a link to WP.org if the HTTP request fails." );
</del><ins>+ return false;
</ins><span class="cx">
</span><del>- $people = unserialize( wp_remote_retrieve_body( $response ) );
-
- if ( ! $people )
- return new WP_Error( 'credits_fail', "Oops. We'll need to put a link to WP.org if the HTTP request fails." );
</del><ins>+ $results = unserialize( wp_remote_retrieve_body( $response ) );
</ins><span class="cx">
</span><ins>+ if ( ! $results )
+ return false;
+
</ins><span class="cx"> set_site_transient( 'wordpress_credits', $people, 604800 ); // One week.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $people;
</del><ins>+ return $results;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function _wp_credits_add_profile_link( &$user, $key, $prefix ) {
+ $user = '<a href="' . esc_url( $prefix . $user ) . '">' . esc_html( $user ) . '</a>';
+}
+
</ins><span class="cx"> include( './admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'WordPress Credits' ); ?></h2>
</span><span class="cx">
</span><del>-<p><?php _e( "WordPress is created by a worldwide team of passionate individuals. We couldn't possibly list them all, but here some of the most influential people currently involved with the project:" ); ?></p>
-
</del><span class="cx"> <?php
</span><span class="cx">
</span><del>-$people = wp_credits();
-if ( is_wp_error( $people ) ) {
- echo $people->get_error_message();
-} else {
</del><ins>+$results = wp_credits();
</ins><span class="cx">
</span><del>- unset( $people['props'] ); // @TODO
</del><ins>+if ( false === $results ) {
+ echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+ 'http://wordpress.org/about/',
+ 'http://codex.wordpress.org/Contributing_to_WordPress' ) . '</p>';
+ include( './admin-footer.php' );
+ exit;
+}
</ins><span class="cx">
</span><del>- foreach ( $people as $group => $members ) {
- echo '<h3 class="wp-people-group">' . $group . '</h3>';
- echo '<ul class="wp-people-group" id="wp-people-group-' . $group . '">';
- shuffle( $members ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
- foreach ( $members as $slug => $member ) {
- echo '<li class="wp-person" id="wp-person-' . $slug . '"><img src="http://gravatar.com/avatar/' . $member[3] . '?s=60&r=PG" class="gravatar" /><a class="web" href="' . $member[2] . '">' . $member[0] . '</a><br /><span class="title">' . $member[1] . '</span></li>';
- }
- echo '</ul>';
</del><ins>+echo '<p>' . __( "WordPress is created by a worldwide team of passionate individuals. We couldn't possibly list them all, but here some of the most influential people currently involved with the project:" ) . "<p>\n";
+
+$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
+
+foreach ( $results['people'] as $group_slug => $members ) {
+ echo '<h3 class="wp-people-group">' . translate( $results['groups'][ $group_slug ] ) . "</h3>\n";
+ echo '<ul class="wp-people-group" id="wp-people-group-' . $group_slug . '">' . "\n";
+ shuffle( $members ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+ foreach ( $members as $member_slug => $member ) {
+ echo '<li class="wp-person" id="wp-person-' . $member_slug . '"><img src="' . $gravatar . $member[3] . '?s=60" class="gravatar" /><a class="web" href="' . $results['data']['profile_prefix'] . $member[2] . '">' . $member[0] . '</a><br /><span class="title">' . translate( $member[1] ) . "</span></li>\n";
</ins><span class="cx"> }
</span><ins>+ echo "</ul>\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( isset( $results['props'] ) ) {
+ echo '<h3 class="wp-props-group">' . sprintf( translate( $results['groups']['props'] ), $results['data']['version'] ) . "</h3>\n\n";
+ array_walk( $results['props'], '_wp_credits_add_profile_link', $results['data']['profile_prefix'] );
+ shuffle( $results['props'] );
+ echo wp_sprintf( '%l.', $results['props'] );
+}
+
</ins><span class="cx"> ?>
</span><span class="cx"> <p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ), 'http://codex.wordpress.org/Contributing_to_WordPress' ); ?></p>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>-<?php include( 'admin-footer.php' ); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php
+
+include( './admin-footer.php' );
+
+return;
+
+__( 'Project Leaders' );
+__( 'Extended Core Team' );
+__( 'Recent Rockstars' );
+__( 'Core Contributors to WordPress %s' );
+__( 'Cofounder, Project Lead' );
+__( 'Lead Developer' );
+__( 'UI/UX and Community Lead' );
+__( 'Developer, Core Committer' );
+__( 'Developer' );
+__( 'Designer' );
+__( 'XML-RPC Developer' );
+__( 'Internationalization' );
+
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminfreedomsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/freedoms.php (17908 => 17909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/freedoms.php 2011-05-12 23:13:56 UTC (rev 17908)
+++ trunk/wp-admin/freedoms.php 2011-05-13 00:49:53 UTC (rev 17909)
</span><span class="lines">@@ -39,4 +39,4 @@
</span><span class="cx"> <p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="http://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>-<?php include( 'admin-footer.php' ); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php include( './admin-footer.php' ); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>