<!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>[1684] sites/trunk/translate.wordpress.org: Translate: First pass for a new Language and Project Portal.</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="http://meta.trac.wordpress.org/changeset/1684">1684</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1684","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-23 22:33:30 +0000 (Tue, 23 Jun 2015)</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'>Translate: First pass for a new Language and Project Portal.

props isaackeyet, ocean90.
see <a href="http://meta.trac.wordpress.org/ticket/1091">#1091</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgroutesrouteslocalephp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgincludesgppluginswporgrouteswporgroutesphp">sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplateslocalephp">sites/trunk/translate.wordpress.org/public_html/gp-templates/locale.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplateslocalesphp">sites/trunk/translate.wordpress.org/public_html/gp-templates/locales.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplatesstylecss">sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplateslocaleprojectphp">sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-project.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgroutesrouteslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php    2015-06-22 14:16:57 UTC (rev 1683)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php      2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,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">         * Prints all exisiting locales as cards.
</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><span class="cx" style="display: block; padding: 0 10px">        public function get_locales() {
</span><span class="cx" style="display: block; padding: 0 10px">                $locales = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $existing_locales as $locale ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $locales[] = GP_Locales::by_slug( $locale );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                usort( $locales, array( $this, 'sort_locales') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         usort( $locales, array( $this, '_sort_english_name_callback') );
</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $existing_locales );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $contributors_count = wp_cache_get( 'contributors-count', 'wporg-translate' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,157 +32,260 @@
</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">-         * Prints translation sets of a top level project.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Prints projects/translation sets of a top level project.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string $locale_slug      Slug of the locale.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param string $current_set_slug Slug of the translation set.
-        * @param string $project_path     Path of a project
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param string $set_slug         Slug of the translation set.
+        * @param string $project_path     Path of a project.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function get_locale_projects( $locale_slug, $current_set_slug = 'default', $project_path = 'wp' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_locale_projects( $locale_slug, $set_slug = 'default', $project_path = 'wp' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $locale = GP_Locales::by_slug( $locale_slug );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $sets = GP::$translation_set->by_locale( $locale_slug );
-               usort( $sets, array( $this, 'sort_sets_by_project_id' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $locale ) {
+                       return $this->die_with_404();
+               }
</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 ( $project_path ) {
-                       $project = GP::$project->by_path( $project_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $project = GP::$project->by_path( $project_path );
+               if ( ! $project ) {
+                       return $this->die_with_404();
+               }
</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 ( ! $project ) {
-                               return $this->die_with_404();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $sub_projects = $this->get_active_sub_projects( $project );
+               if ( ! $sub_projects ) {
+                       return $this->die_with_404();
+               }
+
+               usort( $sub_projects, array( $this, '_sort_name_callback' ) );
+
+               $project_status = $project_icons = array();
+               foreach ( $sub_projects as $key => $sub_project ) {
+                       $status = $this->get_project_status( $sub_project, $locale_slug, $set_slug );
+                       if ( ! $status->sub_projects_count ) {
+                               unset( $sub_projects[ $key ] );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</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">-                $locale_projects = $projects_data = $projects = $parents = $set_slugs = $set_list = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $project_status[ $sub_project->id ] = $status;
+                       $project_icons[ $sub_project->id ] = $this->get_project_icon( $project, $sub_project );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                //TODO: switch to wp_list_pluck
-               foreach ( $sets as $key => $value ) {
-                       $locale_projects[ $key ] = $value->project_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $contributors_count = wp_cache_get( 'contributors-count', 'wporg-translate' );
+               if ( false === $contributors_count ) {
+                       $contributors_count = array();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ( $sets as $set ) {
-                       $set_slugs[ $set->slug ] = $set;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $top_level_projects = GP::$project->top_level();
+               usort( $top_level_projects, array( $this, '_sort_reverse_name_callback' ) );
</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 ( $current_set_slug != $set->slug ) {
-                               continue;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $variants = $this->get_locale_variants( $locale_slug, array_keys( $project_status ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store project data for later use
-                       if ( isset( $projects[ $set->project_id ] ) ) {
-                               $set_project = $projects[$set->project_id];
-                       } else {
-                               $set_project = GP::$project->get( $set->project_id );
-                               $projects[$set->project_id] = $set_project;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->tmpl( 'locale', get_defined_vars() );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // We only want to list active projects
-                       if ( ! isset( $set_project->active ) || $set_project->active == false ) {
-                               continue;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Prints projects/translation sets of a sub project.
+        *
+        * @param string $locale_slug      Slug of the locale.
+        * @param string $set_slug         Slug of the translation set.
+        * @param string $project_path     Path of a project.
+        * @param string $sub_project_path Path of a sub project.
+        */
+       public function get_locale_project( $locale_slug, $set_slug, $project_path, $sub_project_path ) {
+               $locale = GP_Locales::by_slug( $locale_slug );
+               if ( ! $locale ) {
+                       return $this->die_with_404();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $parent_id = is_null( $set_project->parent_project_id ) ? $set_project->id : $set_project->parent_project_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $project = GP::$project->by_path( $project_path );
+               if ( ! $project ) {
+                       return $this->die_with_404();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store parent project data for later use
-                       if ( isset( $projects[$parent_id] ) ) {
-                               $parent_project = $projects[$parent_id];
-                       } else {
-                               $parent_project = GP::$project->get( $parent_id );
-                               $projects[$parent_id] = $parent_project;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $sub_project = GP::$project->by_path( $project_path . '/' . $sub_project_path );
+               if ( ! $sub_project ) {
+                       return $this->die_with_404();
+               }
+
+               $project_status = $this->get_project_status( $sub_project, $locale_slug, $set_slug );
+               $sub_project_status = $this->get_project_status( $sub_project, $locale_slug, $set_slug, null, false );
+
+               $project_icon = $this->get_project_icon( $project, $sub_project, 64 );
+
+               $contributors_count = wp_cache_get( 'contributors-count', 'wporg-translate' );
+               if ( false === $contributors_count ) {
+                       $contributors_count = array();
+               }
+
+               $sub_projects = $this->get_active_sub_projects( $sub_project, true );
+               if ( $sub_projects ) {
+                       $sub_project_statuses = array();
+                       foreach ( $sub_projects as $key => $_sub_project ) {
+                               $status = $this->get_project_status( $_sub_project, $locale_slug, $set_slug );
+                               if ( ! $status->all_count ) {
+                                       unset( $sub_projects[ $key ] );
+                               }
+
+                               $sub_project_statuses[ $_sub_project->id ] = $status;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Store parent id for
-                       $parents[$set_project->id] = $parent_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $variants = $this->get_locale_variants( $locale_slug, array_keys( $sub_project_statuses ) );
+               } else {
+                       $variants = $this->get_locale_variants( $locale_slug, array( $sub_project->id ) );
+               }
</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 ( ! in_array( $set_project->parent_project_id, $locale_projects ) ) {
-                               $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
-                               $projects_data[$parent_id][$set_project->id]['sets'][$set->id] = $this->set_data( $set, $set_project );
-                               $projects_data[$parent_id][$set_project->id]['totals'] = $this->set_data( $set, $set_project );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->tmpl( 'locale-project', get_defined_vars() );
+       }
</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 ( ! isset( $projects_data[$parent_id][$set_project->id]['project'] ) ) {
-                                       $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Returns markup for project icons.
+        *
+        * @param GP_Project $project     A GlotPress project.
+        * @param GP_Project $sub_project A sub project of a GlotPress project.
+        * @param int        $size        Size of icon.
+        * @return string HTML markup of an icon.
+        */
+       private function get_project_icon( $project, $sub_project, $size = 128 ) {
+               switch( $project->slug ) {
+                       case 'wp':
+                               return '<div class="wordpress-icon"><span class="dashicons dashicons-wordpress-alt"></span></div>';
+                       case 'bbpress':
+                       case 'buddypress':
+                               require_once WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php';
+                               if ( function_exists( 'wporg_get_plugin_icon' ) ) {
+                                       return wporg_get_plugin_icon( $project->slug, $size );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        } else {
-                               while ( ! in_array( $parent_id, array_keys( $projects_data ) ) && isset( $parents[$parent_id] ) ) {
-                                       $previous_parent = $parent_id;
-                                       $parent_id = $parents[$parent_id];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 case 'wp-plugins':
+                               require_once WPORGPATH . 'extend/plugins-plugins/_plugin-icons.php';
+                               if ( function_exists( 'wporg_get_plugin_icon' ) ) {
+                                       return wporg_get_plugin_icon( $sub_project->slug, $size );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        default:
+                               return '<div class="default-icon"><span class="dashicons dashicons-translation"></span></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">-                                //Orphan project - a sub project is set to active, while it's parent isn't
-                               if ( ! isset( $projects_data[$parent_id] ) ) {
-                                       continue;
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Retrieves non-default slugs of translation sets for a list of
+        * project IDs.
+        *
+        * @param string $locale     Slug of a GlotPress locale.
+        * @param array $project_ids List of project IDs.
+        * @return array List of non-default slugs.
+        */
+       private function get_locale_variants( $locale, $project_ids ) {
+               global $gpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                //For when root project has sets, and sub projects.
-                               if ( ! isset( $previous_parent ) || ! isset( $projects_data[$parent_id][$previous_parent] ) ) {
-                                       $previous_parent = $parent_id;
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $table = GP::$translation_set->table;
+               $project_ids = implode( ',', $project_ids );
+               $slugs = $gpdb->get_col( $gpdb->prepare( "
+                       SELECT DISTINCT(slug), name
+                       FROM $table
+                       WHERE
+                               project_id IN( $project_ids )
+                               AND locale = %s
+               ", $locale ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $set_data = $projects_data[$parent_id][$previous_parent]['totals'];
-                               $projects_data[$parent_id][$previous_parent]['sets'][$set->id] = $this->set_data( $set, $set_project  );
-                               $projects_data[$parent_id][$previous_parent]['totals'] = $this->set_data( $set, $set_project, $set_data );
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $slugs;
+       }
+
+       /**
+        * Calculates the status of a project.
+        *
+        * @param GP_Project $project           The GlotPress project.
+        * @param string     $locale            Slug of GlotPress locale.
+        * @param string     $set_slug          Slug of the translation set.
+        * @param object     $status            The status object.
+        * @param bool       $calc_sub_projects Whether sub projects should be calculated too.
+        *                                      Default true.
+        * @return object The status of a project.
+        */
+       private function get_project_status( $project, $locale, $set_slug, $status = null, $calc_sub_projects = true ) {
+               if ( null === $status ) {
+                       $status = new stdClass;
+                       $status->sub_projects_count = 0;
+                       $status->waiting_count      = 0;
+                       $status->current_count      = 0;
+                       $status->fuzzy_count        = 0;
+                       $status->all_count          = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'default' !== $current_set_slug && ! isset( $set_slugs[ $current_set_slug ] ) ) {
-                       return $this->die_with_404();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $set = GP::$translation_set->by_project_id_slug_and_locale(
+                       $project->id,
+                       $set_slug,
+                       $locale
+               );
+
+               if ( $set ) {
+                       $status->sub_projects_count += 1;
+                       $status->waiting_count      += (int) $set->waiting_count();
+                       $status->current_count      += (int) $set->current_count();
+                       $status->fuzzy_count        += (int) $set->fuzzy_count();
+                       $status->all_count          += (int) $set->all_count();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $set_slugs ) {
-                       // Make default the first item.
-                       if ( ! empty( $set_slugs[ 'default' ] ) ) {
-                               $default = $set_slugs[ 'default' ];
-                               unset( $set_slugs[ 'default' ] );
-                               array_unshift( $set_slugs, $default );
-                       }
-
-                       foreach ( $set_slugs as $set ) {
-                               if ( 'default' == $set->slug ) {
-                                       if ( 'default' != $current_set_slug ) {
-                                               $set_list[ $set->slug ] = gp_link_get( gp_url_join( '/languages', $locale->slug ), __( 'Default' ) );
-                                       } else {
-                                               $set_list[ $set->slug ] = __( 'Default' );
-                                       }
-                               } else {
-                                       if ( $set->slug != $current_set_slug ) {
-                                               $set_list[ $set->slug ] = gp_link_get( gp_url_join('/languages', $locale->slug, $set->slug ), esc_html( $set->name ) );
-                                       } else {
-                                               $set_list[ $set->slug ] = esc_html( $set->name );
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $calc_sub_projects ) {
+                       $sub_projects = $this->get_active_sub_projects( $project, true );
+                       if ( $sub_projects ) {
+                               foreach ( $sub_projects as $sub_project ) {
+                                       $this->get_project_status( $sub_project, $locale, $set_slug, $status );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 }
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->tmpl( 'locale', get_defined_vars() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $status;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private function set_data( $set, $project, $set_data = null ) {
-               if ( ! $set_data ) {
-                       $set_data = new stdClass;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * Retrieves active sub projects.
+        *
+        * @param  GP_Project $project           The parent project
+        * @param  bool       $with_sub_projects Whether sub projects should be fetched too.
+        *                                       Default false.
+        * @return array List of sub projects.
+        */
+       private function get_active_sub_projects( $project, $with_sub_projects = false ) {
+               $_projects = $project->many( "
+                       SELECT *
+                       FROM $project->table
+                       WHERE
+                               parent_project_id = %d AND
+                               active = 1
+                       ORDER BY id ASC
+               ", $project->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $set_data->slug = $set->slug;
-                       $set_data->project_path = $project->path;
-                       $set_data->waiting_count = $set->waiting_count();
-                       $set_data->current_count = $set->current_count();
-                       $set_data->fuzzy_count   = $set->fuzzy_count();
-                       $set_data->all_count     = $set->all_count();
-               }
-               else {
-                       $set_data->waiting_count += $set->waiting_count();
-                       $set_data->current_count += $set->current_count();
-                       $set_data->fuzzy_count   += $set->fuzzy_count();
-                       $set_data->all_count     += $set->all_count();
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $projects = array();
+               foreach ( $_projects as $project ) {
+                       $projects[ $project->id ] = $project;
</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 ( ! isset( $set_data->name ) ) {
-                       $set_data->name = $project->name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $with_sub_projects ) {
+                               // e.g. wp/dev/admin/network
+                               $sub_projects = $project->many( "
+                                       SELECT *
+                                       FROM $project->table
+                                       WHERE
+                                               parent_project_id = %d AND
+                                               active = 1
+                                       ORDER BY id ASC
+                               ", $project->id );
+
+                               foreach ( $sub_projects as $sub_project ) {
+                                       $projects[ $sub_project->id ] = $sub_project;
+                               }
+                               unset( $sub_projects);
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                unset( $_projects );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $set_data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return $projects;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private function sort_locales( $a, $b ) {
-               return $a->english_name > $b->english_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function _sort_reverse_name_callback( $a, $b ) {
+               return - strcasecmp( $a->name, $b->name );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private function sort_sets_by_project_id( $a, $b ) {
-               return $a->project_id > $b->project_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function _sort_name_callback( $a, $b ) {
+               return strcasecmp( $a->name, $b->name );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       private function _sort_english_name_callback( $a, $b ) {
+               return $a->english_name > $b->english_name;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgincludesgppluginswporgrouteswporgroutesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php     2015-06-22 14:16:57 UTC (rev 1683)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php       2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,10 +30,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                unset( GP::$router->urls['get:/languages'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                GP::$router->add( '/', array( 'GP_WPorg_Route_Index', 'get_index' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                GP::$router->add( '/languages', array( 'GP_WPorg_Route_Locale', 'get_locales' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         GP::$router->add( "/languages/$locale/$path/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_project' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 GP::$router->add( "/languages/$locale/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                GP::$router->add( "/languages/$locale/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                GP::$router->add( "/languages/$locale", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                GP::$router->add( '/languages', array( 'GP_WPorg_Route_Locale', 'get_locales' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplateslocaleprojectphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-project.php                           (rev 0)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-project.php     2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,160 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+gp_title( sprintf( __( 'Projects translated to %s &lt; GlotPress' ),  esc_html( $locale->english_name ) ) );
+
+$breadcrumb   = array();
+$breadcrumb[] = gp_link_get( '/languages', __( 'Locales' ) );
+$breadcrumb[] = gp_link_get( gp_url_join( '/languages', $locale_slug, $set_slug), esc_html( $locale->english_name ) );
+$breadcrumb[] = $sub_project->name . '' . $project->name;
+gp_breadcrumb( $breadcrumb );
+gp_tmpl_header();
+?>
+
+<div class="project-header">
+       <p class="project-description"><?php echo $sub_project->description; ?></p>
+
+       <div class="project-box">
+               <div class="project-box-header">
+                       <div class="project-icon">
+                               <?php echo $project_icon; ?>
+                       </div>
+
+                       <ul class="project-meta">
+                               <li class="project-name"><?php echo $sub_project->name; ?></li>
+                               <li class="locale-english"><?php echo $locale->english_name; ?></li>
+                               <li class="locale-native"><?php echo $locale->native_name; ?></li>
+                               <li class="locale-code">
+                                       <?php
+                                       echo $locale->wp_locale;
+
+                                       if ( count( $variants ) > 1 ) {
+                                               ?>
+                                               <select id="variant-selector" name="variant">
+                                                       <?php
+                                                       foreach ( $variants as $variant ) {
+                                                               $selected =
+                                                               printf(
+                                                                       '<option name="%s" data-project-url="%s"%s>%s</option>',
+                                                                       $variant,
+                                                                       esc_url( gp_url_join( '/languages', $locale_slug, $variant, $sub_project->path ) ),
+                                                                       ( $set_slug == $variant ) ? ' selected="selected"' : '',
+                                                                       ucfirst( $variant )
+                                                               );
+                                                       }
+                                                       ?>
+                                               </select>
+                                               <?php
+                                       }
+                                       ?>
+                               </li>
+                       </ul>
+
+                       <div class="project-status">
+                               <?php
+                               $percent_complete = floor( $project_status->current_count / $project_status->all_count * 100 );
+                               echo $percent_complete . '%';
+                               ?>
+                       </div>
+               </div>
+
+               <div class="project-status-progress percent">
+                       <div class="percent-complete" style="width:<?php echo $percent_complete; ?>%;"></div>
+               </div>
+
+               <div class="project-box-footer">
+               </div>
+       </div>
+</div>
+
+<div class="locale-project">
+       <table class="locale-sub-projects">
+               <thead>
+                       <tr>
+                               <th class="header"><?php _e( 'Set / Sub Project' ); ?></th>
+                               <th><?php _e( 'Translated' ); ?></th>
+                               <th><?php _e( 'Fuzzy' ); ?></th>
+                               <th><?php _e( 'Untranslated' ); ?></th>
+                               <th><?php _e( 'Waiting' ); ?></th>
+                       </tr>
+               </thead>
+               <tbody>
+                       <?php
+                       // Show the current project if it has strings.
+                       if ( $sub_project_status->all_count ) {
+                               ?>
+                               <tr>
+                                       <td class="set-name">
+                                               <strong><?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ) ), $sub_project->name ); ?></strong>
+                                               <?php if ( $sub_project_status->current_count && $sub_project_status->current_count >= $sub_project_status->all_count * 0.9 ):
+                                                       $percent = floor( $sub_project_status->current_count / $sub_project_status->all_count * 100 );
+                                                       ?>
+                                                       <span class="bubble morethan90"><?php echo $percent; ?>%</span>
+                                               <?php endif;?>
+                                       </td>
+                                       <td class="stats translated">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[translated]' => 'yes', 'filters[status]' => 'current') ), absint( $sub_project_status->current_count ) ); ?>
+                                       </td>
+                                       <td class="stats fuzzy">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[status]' => 'fuzzy' ) ), absint( $sub_project_status->fuzzy_count ) ); ?>
+                                       </td>
+                                       <td class="stats untranslated">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[status]' => 'untranslated' ) ), absint( $sub_project_status->all_count ) -  absint( $sub_project_status->current_count ) ); ?>
+                                       </td>
+                                       <td class="stats waiting">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[translated]' => 'yes', 'filters[status]' => 'waiting' ) ), absint( $sub_project_status->waiting_count ) ); ?>
+                                       </td>
+                                       </tr>
+                               </tr>
+                               <?php
+                       }
+                       ?>
+
+                       <?php
+                       foreach ( $sub_projects as $sub_project ) {
+                               $status = $sub_project_statuses[ $sub_project->id ];
+                               ?>
+                               <tr>
+                                       <td class="set-name">
+                                               <strong><?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ) ), $sub_project->name ); ?></strong>
+                                               <?php if ( $status->current_count && $status->current_count >= $status->all_count * 0.9 ):
+                                                       $percent = floor( $status->current_count / $status->all_count * 100 );
+                                                       ?>
+                                                       <span class="bubble morethan90"><?php echo $percent; ?>%</span>
+                                               <?php endif;?>
+                                       </td>
+                                       <td class="stats translated">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[translated]' => 'yes', 'filters[status]' => 'current') ), absint( $status->current_count ) ); ?>
+                                       </td>
+                                       <td class="stats fuzzy">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[status]' => 'fuzzy' ) ), absint( $status->fuzzy_count ) ); ?>
+                                       </td>
+                                       <td class="stats untranslated">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[status]' => 'untranslated' ) ), absint( $status->all_count ) -  absint( $status->current_count ) ); ?>
+                                       </td>
+                                       <td class="stats waiting">
+                                               <?php gp_link( gp_url_project( $sub_project->path, gp_url_join( $locale->slug, $set_slug ), array( 'filters[translated]' => 'yes', 'filters[status]' => 'waiting' ) ), absint( $status->waiting_count ) ); ?>
+                                       </td>
+                                       </tr>
+                               </tr>
+                               <?php
+                       }
+                       ?>
+               </tbody>
+       </table>
+</div>
+
+<script>
+       jQuery( document ).ready( function( $ ) {
+               $( '#variant-selector' ).on( 'change', function( event ) {
+                       event.preventDefault();
+
+                       var $optionSelected = $( 'option:selected', this ),
+                               projectUrl = $optionSelected.data( 'projectUrl' );
+
+                       if ( projectUrl.length ) {
+                               window.location = projectUrl;
+                       }
+               });
+       });
+</script>
+
+<?php gp_tmpl_footer();
</ins></span></pre></div>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplateslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/public_html/gp-templates/locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates/locale.php   2015-06-22 14:16:57 UTC (rev 1683)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/locale.php     2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,81 +1,177 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> gp_title( sprintf( __( 'Projects translated to %s &lt; GlotPress' ),  esc_html( $locale->english_name ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$breadcrumb = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$breadcrumb   = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $breadcrumb[] = gp_link_get( '/languages', __( 'Locales' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'default' == $current_set_slug ) {
-       $breadcrumb[] = esc_html( $locale->english_name );
-} else {
-       $breadcrumb[] = gp_link_get( gp_url_join( '/languages', $locale->slug ), esc_html( $locale->english_name ) );
-       $breadcrumb[] = $set_list[ $current_set_slug ];
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$breadcrumb[] = esc_html( $locale->english_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> gp_breadcrumb( $breadcrumb );
</span><span class="cx" style="display: block; padding: 0 10px"> gp_tmpl_header();
</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">-        <h2><?php printf( __( 'Active Projects translated to %s' ), esc_html( $locale->english_name ) ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="locale-header">
+       <p class="locale-intro">Translate WordPress, core projects, plugins, and themes into your language. Select your project below to get started.</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">-<?php if ( count( $set_list ) > 1 ) : ?>
-       <p class="actionlist secondary">
-               <?php echo implode( ' &bull;&nbsp;', $set_list ); ?>
-       </p>
-<?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="locale-box">
+               <ul class="name">
+                       <li class="english"><?php echo $locale->english_name; ?></li>
+                       <li class="native"><?php echo $locale->native_name; ?></li>
+                       <li class="code">
+                               <?php
+                               echo $locale->wp_locale;
</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 ( empty( $projects_data ) ) {
-       _e( 'No active projects found.' );
-}
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( count( $variants ) > 1 ) {
+                                       ?>
+                                       <select id="variant-selector" name="variant">
+                                               <?php
+                                               foreach ( $variants as $variant ) {
+                                                       $selected =
+                                                       printf(
+                                                               '<option name="%s" data-project-url="%s"%s>%s</option>',
+                                                               $variant,
+                                                               esc_url( gp_url_join( '/languages', $locale_slug, $variant, $project->slug ) ),
+                                                               ( $set_slug == $variant ) ? ' selected="selected"' : '',
+                                                               ucfirst( $variant )
+                                                       );
+                                               }
+                                               ?>
+                                       </select>
+                                       <?php
+                               }
+                               ?>
+                       </li>
+               </ul>
+               <div class="contributors">
+                       <?php
+                       $contributors = sprintf(
+                               '<span class="dashicons dashicons-admin-users"></span><br />%s',
+                               isset( $contributors_count[ $locale->slug ] ) ? $contributors_count[ $locale->slug ] : 0
+                       );
+                       echo gp_link_get( 'https://make.wordpress.org/polyglots/teams/?locale=' . $locale->wp_locale, $contributors );
+                       ?>
+               </div>
+       </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 foreach ( $projects_data as $project_id => $sub_projects ) : ?>
-       <div class="locale-project">
-               <h3><?php echo ( $projects[$project_id]->name );?></h3>
-               <table class="locale-sub-projects">
-                       <thead>
-                       <tr>
-                               <th class="header" <?php if (count($sub_projects)>1 ) echo 'rowspan="'. count($sub_projects) . '"';?>><?php if (count($sub_projects)>1 ) _e( 'Project' ); ?></th>
-                               <th class="header"><?php _e( 'Set / Sub Project' ); ?></th>
-                               <th><?php _e( 'Translated' ); ?></th>
-                               <th><?php _e( 'Fuzzy' ); ?></th>
-                               <th><?php _e( 'Untranslated' ); ?></th>
-                               <th><?php _e( 'Waiting' ); ?></th>
-                       </tr>
-                       </thead>
-                       <tbody>
-                       <?php foreach ( $sub_projects as $sub_project_id => $data ) : ?>
-                               <tr>
-                               <th class="sub-project" rowspan="<?php echo count( $data['sets'] );  ?>">
-                                       <?php if (count($sub_projects)>1  ) echo esc_html( $projects[$sub_project_id]->name ); ?>
-                                       <div class="stats">
-                                               <div class="total-strings"><?php printf( __( '%d strings' ), $data['totals']->all_count ); ?></div>
-                                               <div class="percent-completed"><?php printf( __( '%d%% translated' ), $data['totals']->current_count ? floor( absint($data['totals']->current_count ) / absint( $data['totals']->all_count ) * 100 ) : 0 ); ?></div>
-                                       </div>
-                               </th>
-                               <?php foreach ( $data['sets'] as $set_id => $set_data ) : ?>
-                                       <?php  reset( $data['sets'] );       if ( $set_id !== key($data['sets']) ) echo '<tr>'; ?>
-                                       <td class="set-name">
-                                               <strong><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ) ), $set_data->name ); ?></strong>
-                                               <?php if ( $set_data->current_count && $set_data->current_count >= $set_data->all_count * 0.9 ):
-                                                       $percent = floor( $set_data->current_count / $set_data->all_count * 100 );
-                                                       ?>
-                                                       <span class="bubble morethan90"><?php echo $percent; ?>%</span>
-                                               <?php endif;?>
-                                       </td>
-                                       <td class="stats translated"><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ), array('filters[translated]' => 'yes', 'filters[status]' => 'current') ), absint( $set_data->current_count ) ); ?></td>
-                                       <td class="stats fuzzy"><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ), array('filters[status]' => 'fuzzy' ) ), absint( $set_data->fuzzy_count ) ); ?></td>
-                                       <td class="stats untranslated"><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ), array('filters[status]' => 'untranslated' ) ), absint( $set_data->all_count ) -  absint( $set_data->current_count ) ); ?></td>
-                                       <td class="stats waiting"><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ), array('filters[translated]' => 'yes', 'filters[status]' => 'waiting') ), absint( $set_data->waiting_count ) ); ?></td>
-                                       </tr>
-                               <?php endforeach; //sub project slugs ?>
-                               </tr>
-                       <?php endforeach;  //sub projects ?>
-                       </tbody>
-               </table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="filter-header">
+       <ul class="filter-header-links">
+               <?php
+               foreach ( $top_level_projects as $top_level_project ) {
+                       printf(
+                               '<li><a href="%s"%s>%s</a></li>',
+                               gp_url_join( '/languages', $locale_slug, $set_slug, $top_level_project->slug ),
+                               ( $top_level_project->path == $project_path ) ? ' class="current"' : '',
+                               $top_level_project->name
+                       );
+               }
+               ?>
+       </ul>
+       <div class="search-form">
+               <label class="screen-reader-text" for="projects-filter"><?php esc_attr_e( 'Search projects...' ); ?></label>
+               <input placeholder="<?php esc_attr_e( 'Search projects...' ); ?>" type="search" id="projects-filter" class="filter-search">
</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">-<?php endforeach; //top projects ?>
</del><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">-        <p class="actionlist secondary">
-               <?php gp_link( '/projects', __('All projects') ); ?>
-       </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="projects" class="projects">
+       <?php
+       foreach ( $sub_projects as $sub_project ) {
+               $percent_complete = $waiting = $sub_projects_count = 0;
+               if ( isset( $project_status[ $sub_project->id ] ) ) {
+                       $status = $project_status[ $sub_project->id ];
+                       $percent_complete = floor( $status->current_count / $status->all_count * 100 );
+                       $waiting = $status->waiting_count;
+                       $sub_projects_count = $status->sub_projects_count;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $project_url = gp_url_join( '/languages', $locale_slug, $set_slug, $sub_project->path );
+
+               $project_icon = '';
+               if ( isset( $project_icons[ $sub_project->id ] ) ) {
+                       $project_icon = $project_icons[ $sub_project->id ];
+               }
+
+               $classes = 'project-' . sanitize_title_with_dashes( str_replace( '/', '-', $project->path ) );
+               $classes .= ' project-' . sanitize_title_with_dashes( str_replace( '/', '-', $sub_project->path ) );
+               $classes .= ' percent-' . $percent_complete;
+               ?>
+               <div class="project <?php echo $classes; ?>">
+                       <div class="project-top">
+                               <div class="project-icon">
+                                       <?php echo gp_link_get( $project_url, $project_icon ) ?>
+                               </div>
+
+                               <div class="project-name">
+                                       <h4>
+                                               <?php echo gp_link_get( $project_url, $sub_project->name ) ?>
+                                       </h4>
+                               </div>
+                               <div class="project-description">
+                                       <p><?php echo $sub_project->description; ?></p>
+                               </div>
+                       </div>
+
+                       <div class="project-status">
+                               <div class="project-status-sub-projects">
+                                       <span class="project-status-title">Sub-Projects</span>
+                                       <span class="project-status-value"><?php echo $sub_projects_count; ?></span>
+                               </div>
+                               <div class="project-status-waiting">
+                                       <span class="project-status-title">Waiting</span>
+                                       <span class="project-status-value"><?php echo $waiting; ?></span>
+                               </div>
+                               <div class="project-status-progress">
+                                       <span class="project-status-title">Progress</span>
+                                       <span class="project-status-value"><?php echo $percent_complete; ?>%</span>
+                               </div>
+                       </div>
+
+                       <div class="percent">
+                               <div class="percent-complete" style="width:<?php echo $percent_complete; ?>%;"></div>
+                       </div>
+
+                       <div class="project-bottom">
+                               <div class="button contribute-button">
+                                       <?php echo gp_link_get( $project_url, 'Translate Project' ) ?>
+                               </div>
+                       </div>
+               </div>
+               <?php
+       }
+       ?>
+</div>
+
+<script>
+       jQuery( document ).ready( function( $ ) {
+               $rows = $( '#projects' ).find( '.project' );
+               $( '#projects-filter' ).on( 'input keyup', function() {
+                       var words = this.value.toLowerCase().split( ' ' );
+
+                       if ( '' === this.value.trim() ) {
+                               $rows.show();
+                       } else {
+                               $rows.hide();
+                               $rows.filter( function( i, v ) {
+                                       var $t = $(this).find( '.project-top' );
+                                       for ( var d = 0; d < words.length; ++d ) {
+                                               if ( $t.text().toLowerCase().indexOf( words[d] ) != -1 ) {
+                                                       return true;
+                                               }
+                                       }
+                                       return false;
+                               }).show();
+                       }
+               });
+
+               $( '#variant-selector' ).on( 'change', function( event ) {
+                       event.preventDefault();
+
+                       var $optionSelected = $( 'option:selected', this ),
+                               projectUrl = $optionSelected.data( 'projectUrl' );
+
+                       if ( projectUrl.length ) {
+                               window.location = projectUrl;
+                       }
+               });
+       });
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php gp_tmpl_footer();
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplateslocalesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/public_html/gp-templates/locales.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates/locales.php  2015-06-22 14:16:57 UTC (rev 1683)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/locales.php    2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,18 +34,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <li class="code"><?php echo gp_link_get( gp_url_join( gp_url_current(), $locale->slug ), $wp_locale ) ?></li>
</span><span class="cx" style="display: block; padding: 0 10px">                                </ul>
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="contributors">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <span class="dashicons dashicons-admin-users"></span><br />
</del><span class="cx" style="display: block; padding: 0 10px">                                         <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $contributors = isset( $contributors_count[ $locale->slug ] ) ? $contributors_count[ $locale->slug ] : 0;
-                                       echo gp_link_get( 'https://make.wordpress.org/polyglots/teams/?locale=' . $wp_locale, $contributors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $contributors = sprintf(
+                                               '<span class="dashicons dashicons-admin-users"></span><br />%s',
+                                               isset( $contributors_count[ $locale->slug ] ) ? $contributors_count[ $locale->slug ] : 0
+                                       );
+                                       echo gp_link_get( 'https://make.wordpress.org/polyglots/teams/?locale=' . $locale->wp_locale, $contributors );
</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">                                <div class="percent">
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="percent-complete" style="width:<?php echo $percent_complete; ?>%;"></div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="locale-button">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <div class="button">
-                                               <?php echo gp_link_get( gp_url_join( gp_url_current(), $locale->slug ), "Contribute Translation" ) ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="button contribute-button">
+                                               <?php echo gp_link_get( gp_url_join( gp_url_current(), $locale->slug ), 'Contribute Translation' ) ?>
</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">                        </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        <script>
</span><span class="cx" style="display: block; padding: 0 10px">                jQuery( document ).ready( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $rows = $( '#locales' ).find( '.locale' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $( '#locales-filter' ).bind( 'change keyup input',function() {
-                               var words = this.value.toLowerCase().split(' ');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $( '#locales-filter' ).on( 'input keyup',function() {
+                               var words = this.value.toLowerCase().split( ' ' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( '' === this.value.trim() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        $rows.show();
</span></span></pre></div>
<a id="sitestrunktranslatewordpressorgpublic_htmlgptemplatesstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css    2015-06-22 14:16:57 UTC (rev 1683)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css      2015-06-23 22:33:30 UTC (rev 1684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        position: relative;
</span><span class="cx" style="display: block; padding: 0 10px">        -webkit-box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px">        box-sizing: border-box;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        margin: 12px 0 25px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 30px 0;
</ins><span class="cx" style="display: block; padding: 0 10px">         padding: 0 20px;
</span><span class="cx" style="display: block; padding: 0 10px">        width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">        -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        display: inline-block;
</span><span class="cx" style="display: block; padding: 0 10px">        margin: 0 10px;
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 15px 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        border-bottom: 4px solid #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-bottom: 4px solid #efefef;
</ins><span class="cx" style="display: block; padding: 0 10px">         color: #666;
</span><span class="cx" style="display: block; padding: 0 10px">        cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,12 +175,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">        margin-left: -2.083%;
</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">+/* Clearfix */
+.locale-header:before,
+.locale-header:after,
+.project-header:before,
+.project-header:after,
+.projects:before,
+.projects:after,
+.project-box-header:before,
+.project-box-header:after,
+.project-status:before,
+.project-status:after,
</ins><span class="cx" style="display: block; padding: 0 10px"> .locales:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .locales:after {
</span><span class="cx" style="display: block; padding: 0 10px">        content: "";
</span><span class="cx" style="display: block; padding: 0 10px">        display: table;
</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">+.locale-header:after,
+.project-header:after,
+.projects:after,
+.project-box-header:after,
+.project-status:after,
</ins><span class="cx" style="display: block; padding: 0 10px"> .locales:after {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,11 +217,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        border-color: #509040;
</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">-.locale-button .button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.contribute-button {
</ins><span class="cx" style="display: block; padding: 0 10px">         height: 26px;
</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">-.locale-button .button a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.contribute-button a {
</ins><span class="cx" style="display: block; padding: 0 10px">         vertical-align: baseline;
</span><span class="cx" style="display: block; padding: 0 10px">        color: #555;
</span><span class="cx" style="display: block; padding: 0 10px">        line-height: 26px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,40 +232,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">        white-space: nowrap;
</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">-.locale-button .button a:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.contribute-button a:hover {
</ins><span class="cx" style="display: block; padding: 0 10px">         color: #333;
</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"> .locale-button {
</span><span class="cx" style="display: block; padding: 0 10px">        background: #f9f9f9;
</span><span class="cx" style="display: block; padding: 0 10px">        text-align: center;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        padding: 13px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 20px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.locale-button a {
-       color: #555;
-       padding: 8px;
-}
-
-.locale .name {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale .name,
+.locale-box .name {
</ins><span class="cx" style="display: block; padding: 0 10px">         display: inline-block;
</span><span class="cx" style="display: block; padding: 0 10px">        margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 20px;
</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">-.locale .name li {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale .name li,
+.locale-box .name li {
</ins><span class="cx" style="display: block; padding: 0 10px">         display: block;
</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">-.locale .name li.english a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale .name li.english a,
+.locale-box .name li.english {
</ins><span class="cx" style="display: block; padding: 0 10px">         font-weight: bold;
</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">-.locale .name li.code a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-box.project .name li.english {
+       font-weight: normal;
+}
+
+.locale .name li.code a,
+.locale-box .name li.code {
</ins><span class="cx" style="display: block; padding: 0 10px">         color: #999;
</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">-.locale .contributors {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale .contributors,
+.locale-box .contributors,
+.locale-box .project-status {
</ins><span class="cx" style="display: block; padding: 0 10px">         float: right;
</span><span class="cx" style="display: block; padding: 0 10px">        margin-top: 20px;
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 10px 20px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,19 +279,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">        text-align: center;
</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">-.locale .contributors .dashicons {
-       margin-left: -7px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-box .project-status {
+       color: #509040;
+       font-weight: 600;
+}
+
+.locale .contributors .dashicons,
+.locale-box .contributors .dashicons {
</ins><span class="cx" style="display: block; padding: 0 10px">         font-size: 2em;
</span><span class="cx" style="display: block; padding: 0 10px">        padding-bottom: 10px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        display: inline;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.locale .percent {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale-box .contributors .dashicons {
+       font-size: 1.5em;
+}
+
+.locale .percent,
+.project .percent {
</ins><span class="cx" style="display: block; padding: 0 10px">         width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">        height: 4px;
</span><span class="cx" style="display: block; padding: 0 10px">        background-color: #d6d6d6;
</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">-.locale .percent-complete {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.locale .percent-complete,
+.project .percent-complete {
</ins><span class="cx" style="display: block; padding: 0 10px">         height: 4px;
</span><span class="cx" style="display: block; padding: 0 10px">        background-color: #509040;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,6 +316,244 @@
</span><span class="cx" style="display: block; padding: 0 10px">        width: 1px;
</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">+.locale-intro {
+       float: left;
+       width: 100%;
+       max-width: 600px;
+       margin-top: 20px;
+       font-family: Georgia, Times, "Times New Roman", serif;
+       font-size: 16px;
+       line-height: 1.6em;
+}
+
+.locale-box {
+       float: right;
+       width: 250px;
+       border: 1px solid #ccc;
+       -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       background: #fff;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
+.projects {
+       margin-left: -2.083%;
+}
+
+.projects .project {
+       float: left;
+       margin: 0 0 2.083% 2.083%;
+       width: 47.917%;
+       border: 1px solid #ccc;
+       -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       background: #fff;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
+.projects .project:nth-child(odd) {
+       clear: both;
+}
+
+.projects .project.percent-100 {
+       border-color: #509040;
+}
+
+.projects .project-top {
+       position: relative;
+       padding: 20px 20px 10px;
+       min-height: 135px;
+}
+
+.projects .project-name,
+.projects .project-description {
+       margin-left: 148px;
+       word-break: break-word;
+}
+
+.projects .project-name h4 {
+       border: 0;
+       margin: 0 0 12px;
+       font-size: 18px;
+       font-weight: 600;
+       line-height: 1.3;
+}
+
+.projects .project-description {
+       font-size: 13px;
+}
+
+.projects .project-icon {
+       position: absolute;
+       top: 20px;
+       left: 20px;
+       width: 128px;
+       height: 128px;
+       margin: 0 20px 20px 0;
+}
+
+.projects .project-icon .plugin-icon {
+       margin: 0 !important;
+}
+
+.projects .project-icon .default-icon,
+.projects .project-icon .wordpress-icon {
+       width: 128px;
+       height: 128px;
+       background: #dedede;
+}
+
+.projects .project-icon .default-icon span,
+.projects .project-icon .wordpress-icon span {
+       height: 128px;
+       width: 128px;
+       font-size: 85px;
+       line-height: 128px;
+       color: #a0a5aa;
+}
+
+.projects .project-icon .wordpress-icon {
+       background: #464646;
+}
+
+.projects .project-icon .wordpress-icon span {
+       color: #fff;
+}
+
+.projects .project-status {
+       font-size: 13px;
+}
+
+.projects .project-status > div {
+       width: 33.333%;
+       float: left;
+       margin: 20px 0;
+       padding: 0 20px;
+       text-align: center;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
+.projects .project-status-waiting {
+       border-right: 1px solid #eee;
+       border-left: 1px solid #eee;
+}
+
+.projects .project-status-title {
+       display: inline-block;
+       margin-bottom: 6px;
+       color: #82878c;
+}
+
+.projects .project-status-value {
+       display: block;
+       font-size: 16px;
+       font-weight: 600;
+}
+
+.projects .project-status-progress .project-status-value {
+       color: #509040;
+}
+
+.projects .project-bottom {
+       background: #f9f9f9;
+       text-align: center;
+       padding: 20px 0;
+}
+
+/* Project */
+.project-header {
+       margin-bottom: 30px;
+}
+
+.project-header .project-description {
+       float: left;
+       width: 100%;
+       max-width: 520px;
+}
+
+.project-header .project-box {
+       position: relative;
+       float: right;
+       width: 350px;
+       border: 1px solid #ccc;
+       -webkit-box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       box-shadow: 0 1px 1px -1px rgba(0,0,0,0.1);
+       background: #fff;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
+.project-box .project-box-header {
+       padding: 15px;
+}
+
+.project-box .project-icon {
+       float: left;
+       width: 64px;
+       height: 64px;
+       margin: 0 20px 20px 0;
+}
+
+.project-box .project-icon .plugin-icon {
+       margin: 0 !important;
+}
+
+.project-box .project-icon .default-icon,
+.project-box .project-icon .wordpress-icon {
+       width: 64px;
+       height: 64px;
+       background: #dedede;
+}
+
+.project-box .project-icon .default-icon span,
+.project-box .project-icon .wordpress-icon span {
+       height: 64px;
+       width: 64px;
+       font-size: 42px;
+       line-height: 64px;
+       color: #a0a5aa;
+}
+
+.project-box .project-icon .wordpress-icon {
+       background: #464646;
+}
+
+.project-box .project-icon .wordpress-icon span {
+       color: #fff;
+}
+
+.project-box .project-meta {
+       float: left;
+       width: 165px;
+       list-style: none;
+       margin: 0;
+       padding: 0;
+}
+
+.project-meta .project-name {
+       font-weight: 600;
+}
+
+.project-meta .locale-code {
+       color: #999;
+}
+
+.project-box .project-status {
+       position: absolute;
+       top: 50%;
+       right: 15px;
+       -webkit-transform: translateY(-50%);
+       transform: translateY(-50%);
+       font-size: 20px;
+       font-weight: 600;
+       color: #509040;
+       padding: 10px 0 10px 15px;
+       border-left: 1px solid #eee;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Responsive styles */
</span><span class="cx" style="display: block; padding: 0 10px"> @media (max-width: 700px) {
</span><span class="cx" style="display: block; padding: 0 10px">        .intro {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,12 +567,14 @@
</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">-@media only screen and (max-width: 480px) {
-       .locales {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media only screen and (max-width: 700px) {
+       .locales,
+       .projects {
</ins><span class="cx" style="display: block; padding: 0 10px">                 margin-left: 0;
</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">-        .locales .locale {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .locales .locale,
+       .projects .project {
</ins><span class="cx" style="display: block; padding: 0 10px">                 width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">                margin-left: 0;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre>
</div>
</div>

</body>
</html>