<!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>[2072] sites/trunk/translate.wordpress.org: Translate: Add a basic sorting dropdown to project views.</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/2072">2072</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/2072","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-11 02:00:12 +0000 (Wed, 11 Nov 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: Add a basic sorting dropdown to project views.
Patches welcome to integrate the UI into the listing UI better.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1122">#1122</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="#sitestrunktranslatewordpressorgpublic_htmlgptemplateslocaleprojectsphp">sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-projects.php</a></li>
<li><a href="#sitestrunktranslatewordpressorgpublic_htmlgptemplatesstylecss">sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css</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-11-10 23:55:35 UTC (rev 2071)
+++ sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php 2015-11-11 02:00:12 UTC (rev 2072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 20;
</span><span class="cx" style="display: block; padding: 0 10px"> $page = (int) gp_get( 'page', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $search = gp_get( 's', '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter = gp_get( 'filter', 'default' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter = gp_get( 'filter', false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_projects = $paged_sub_projects['projects'];
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = $paged_sub_projects['pages'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter = $paged_sub_projects['filter'];
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $paged_sub_projects );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project_status = $project_icons = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'set_slug' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filter' => 'default',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filter' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> extract( $r, EXTR_SKIP );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,8 +408,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This removes the parent_project_id restriction and replaces it with all-translation-editer-projects
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'waiting' == $project->slug && GP::$user->current()->id && isset( GP::$plugins->wporg_rosetta_roles ) ) {
</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' === $filter ) {
- $filter = 'strings-waiting';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $filter ) {
+ $filter = 'strings-waiting-and-fuzzy';
</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"> $user_id = GP::$user->current()->id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,9 +452,15 @@
</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"> $filter_order_by = $filter_where = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $filter ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sort_order = 'DESC';
+ $filter_name = $filter;
+ if ( $filter && '-asc' == substr( $filter, -4 ) ) {
+ $sort_order = 'ASC';
+ $filter_name = substr( $filter, 0, -4 );
+ }
+ switch ( $filter_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'default':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'special':
</ins><span class="cx" style="display: block; padding: 0 10px"> // Float favorites to the start, but only if they have untranslated strings
</span><span class="cx" style="display: block; padding: 0 10px"> $user_fav_projects = array_map( array( $gpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,22 +487,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'strings-remaining':
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_where = 'AND stats.untranslated > 0';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter_order_by = 'stats.untranslated DESC, tp.name ASC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_order_by = "stats.untranslated $sort_order, tp.name ASC";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'strings-waiting':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'strings-waiting-and-fuzzy':
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter_where = 'AND (stats.waiting > 0 OR stats.fuzzy > 0 )';
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_order_by = "tp.path LIKE 'wp/%%' AND (stats.fuzzy + stats.waiting) > 0 DESC, (stats.fuzzy + stats.waiting) DESC, tp.name ASC";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'strings-fuzzy-and-warnings':
- $filter_where = 'AND ( stats.fuzzy > 0 OR stats.warnings > 0 )';
- $filter_order_by = '(stats.fuzzy+stats.warnings) DESC, tp.name ASC';
- break;
-
</del><span class="cx" style="display: block; padding: 0 10px"> case 'percent-completed':
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_where = 'AND stats.untranslated > 0';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter_order_by = ' ( stats.current / stats.all ) DESC, tp.name ASC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_order_by = "( stats.current / stats.all ) $sort_order, tp.name ASC";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,6 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'pages' => compact( 'pages', 'page', 'per_page', 'results' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'projects' => $projects,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filter' => $filter,
</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_htmlgptemplateslocaleprojectsphp"></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-projects.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-projects.php 2015-11-10 23:55:35 UTC (rev 2071)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-projects.php 2015-11-11 02:00:12 UTC (rev 2072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="sort-bar">
+ <select id="sort-filter" disabled="disabled">
+ <?php
+ $sorts = array();
+ if ( GP::$user->current()->id && in_array( $project->slug, array( 'waiting', 'wp-themes', 'wp-plugins' ) ) ) {
+ $sorts['special'] = 'Untranslated Favorites, Remaining Strings (Most first)';
+ $sorts['favorites'] = 'My Favorites';
+ }
+ $sorts['strings-remaining'] = 'Remaining Strings (Most first)';
+ $sorts['strings-remaining-asc'] = 'Remaining Strings (Least first)';
+ $sorts['strings-waiting-and-fuzzy'] = 'Waiting + Fuzzy (Most first)';
+ $sorts['strings-waiting-and-fuzzy-asc'] = 'Waiting + Fuzzy (Least first)';
+ $sorts['percent-completed'] = 'Percent Completed (Most first)';
+ $sorts['percent-completed-asc'] = 'Percent Completed (Least first)';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $sorts as $value => $text ) {
+ printf( '<option value="%s" %s>%s</option>', esc_attr( $value ), ( $value == $filter ? 'selected="selected"' : '' ), esc_attr( $text ) );
+ }
+ ?>
+ </select>
+</div>
+<script>
+ jQuery('#sort-filter').change( function() {
+ var current_url = document.location.href.replace(/[?&]filter=[^&$]*/, '' );
+ document.location.replace(
+ current_url +
+ ( -1 == current_url.indexOf('?') ? '?filter=' : '&filter=' ) +
+ this.options[ this.options.selectedIndex ].value
+ );
+ } ).prop('disabled', '');
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="projects" class="projects">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sub_projects as $sub_project ) {
</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-11-10 23:55:35 UTC (rev 2071)
+++ sites/trunk/translate.wordpress.org/public_html/gp-templates/style.css 2015-11-11 02:00:12 UTC (rev 2072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,3 +1023,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .stats-table th.headerSortDown:after {
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f142";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.sort-bar {
+ float: right;
+ margin: -30px 0 5px 5px;
+ background-color: #eee;
+ padding: 5px;
+ border: 1px solid #dfdfdf;
+ border-top: none;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>