<!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>[GlotPress][944] trunk: locale page: improve layout by actually displaying the included subprojects.</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">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/944">944</a></dd>
<dt>Author</dt> <dd>yoavf</dd>
<dt>Date</dt> <dd>2014-08-17 10:24:45 +0000 (Sun, 17 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>locale page: improve layout by actually displaying the included subprojects.

See <a href="http://glotpress.trac.wordpress.org/ticket/212">#212</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcssstylecss">trunk/css/style.css</a></li>
<li><a href="#trunkgpincludesrouteslocalephp">trunk/gp-includes/routes/locale.php</a></li>
<li><a href="#trunkgptemplateslocalephp">trunk/gp-templates/locale.php</a></li>
<li><a href="#trunkgptemplateslocalesphp">trunk/gp-templates/locales.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkcssstylecss"></a>
<div class="modfile"><h4>Modified: trunk/css/style.css (943 => 944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/css/style.css      2014-08-09 22:27:43 UTC (rev 943)
+++ trunk/css/style.css 2014-08-17 10:24:45 UTC (rev 944)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">  line-height: 1.5em;
</span><span class="cx">  width: 40em;
</span><span class="cx"> }
</span><del>-table.translations, table.translation-sets, table.glossary, table.language-sub-projects {
</del><ins>+table.translations, table.translation-sets, table.glossary, table.locale-sub-projects {
</ins><span class="cx">   font-size: 90%;
</span><span class="cx">  width: 100%;
</span><span class="cx">  border-spacing: 0.1em;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> table.translation-sets thead th,
</span><span class="cx"> table.translations tfoot th,
</span><span class="cx"> table.glossary thead th,
</span><del>-table.language-sub-projects thead th,
</del><ins>+table.locale-sub-projects thead th,
</ins><span class="cx"> table.locales thead th {
</span><span class="cx">  font-weight: bold;
</span><span class="cx">  color: #eee;
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> table.locales thead th {
</span><span class="cx">  width: 33%;
</span><span class="cx"> }
</span><del>-table.translations tr, table.translation-sets tr, table.glossary tr, table.language-sub-projects {
</del><ins>+table.translations tr, table.translation-sets tr, table.glossary tr, table.locale-sub-projects {
</ins><span class="cx">   border: 0;
</span><span class="cx"> }
</span><span class="cx"> table.translations td.translation ul {
</span><span class="lines">@@ -164,8 +164,8 @@
</span><span class="cx"> table.translation-sets td, table.translation-sets th,
</span><span class="cx"> table.locales td, table.locales th,
</span><span class="cx"> table.glossary th, table.glossary td,
</span><del>-table.language-sub-projects th,
-table.language-sub-projects td {
</del><ins>+table.locale-sub-projects th,
+table.locale-sub-projects td {
</ins><span class="cx">   padding: 0.5em;
</span><span class="cx">  border: 1px solid #eee;
</span><span class="cx">  margin: 0;
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx">  clear: both;
</span><span class="cx">  visibility: hidden;
</span><span class="cx"> }
</span><del>-table.translation-sets .stats a, table.language-sub-projects .stats a {
</del><ins>+table.translation-sets .stats a, table.locale-sub-projects .stats a {
</ins><span class="cx">   color: black;
</span><span class="cx">  text-decoration: none;
</span><span class="cx">  -webkit-border-radius: 0.3em;
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx">  width: 100%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.translation-sets .percent, .language-sub-projects .percent {
</del><ins>+.translation-sets .percent, .locale-sub-projects .percent {
</ins><span class="cx">   font-weight: bold;
</span><span class="cx"> }
</span><span class="cx"> .translation-sets .stats {
</span><span class="lines">@@ -740,31 +740,20 @@
</span><span class="cx">  padding: 5px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.language-project {
-       margin-left: 20em;
-}
-
-.language-project .project-description {
-       float:left;
-       margin-left: -20em;
-       width:16em;
-       padding-left: 10px;
-}
-
-table.language-sub-projects {
</del><ins>+table.locale-sub-projects {
</ins><span class="cx">   empty-cells: hide;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-table.language-sub-projects thead th {
</del><ins>+table.locale-sub-projects thead th {
</ins><span class="cx">   text-align:left;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.language-sub-projects .project-name {
</del><ins>+.locale-sub-projects .project-name {
</ins><span class="cx">   border-collapse: separate;
</span><span class="cx">  border-spacing: 20px 5px;
</span><span class="cx">  border: 2px solid #0ff;
</span><span class="cx"> }
</span><del>-.language-sub-projects .project-name th {
</del><ins>+.locale-sub-projects .project-name th {
</ins><span class="cx">   font-size: 1.1em;
</span><span class="cx">  font-weight: bold;
</span><span class="cx">  background-color: #eee;
</span><span class="lines">@@ -772,34 +761,35 @@
</span><span class="cx">  color: #444;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-table.language-sub-projects td {
</del><ins>+.locale-sub-projects th div.stats {
+    font-weight:normal;
+}
+
+
+.locale-sub-projects td {
</ins><span class="cx">   border:none;
</span><span class="cx">  border-bottom: 1px solid #eee;
</span><span class="cx"> }
</span><del>-table.language-sub-projects tr:hover td {
</del><ins>+.locale-sub-projects tr:hover td {
</ins><span class="cx">   background-color:#eff;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.language-sub-projects .sub-project {
</del><ins>+.locale-sub-projects .sub-project {
</ins><span class="cx">   border:none;
</span><span class="cx">  text-align: left;
</span><span class="cx">  vertical-align: top;
</span><del>-       border-bottom: 2px solid #eee;
</del><ins>+        border-bottom: 1px solid #eee;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-table.language-sub-projects tbody tr:last-child td {
-       border-bottom:2px solid #eee;
-}
</del><span class="cx"> 
</span><del>-
-table.language-sub-projects {
</del><ins>+.locale-sub-projects {
</ins><span class="cx">   margin-bottom: 30px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-table.language-sub-projects thead th:nth-child(-n+2) {
</del><ins>+.locale-sub-projects thead th:nth-child(-n+2) {
</ins><span class="cx">   width: 20%;
</span><span class="cx"> }
</span><del>-table.language-sub-projects thead th:nth-child(n+3) {
</del><ins>+.locale-sub-projects thead th:nth-child(n+3) {
</ins><span class="cx">   width: 15%;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -813,11 +803,11 @@
</span><span class="cx">          margin: 0;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       .language-project {
</del><ins>+        .locale-project {
</ins><span class="cx">           margin-left: 0;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       .language-project .project-description {
</del><ins>+        .locale-project .project-description {
</ins><span class="cx">           float: none;
</span><span class="cx">          margin-left: 0;
</span><span class="cx">  }
</span></span></pre></div>
<a id="trunkgpincludesrouteslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/locale.php (943 => 944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/locale.php      2014-08-09 22:27:43 UTC (rev 943)
+++ trunk/gp-includes/routes/locale.php 2014-08-17 10:24:45 UTC (rev 944)
</span><span class="lines">@@ -46,7 +46,8 @@
</span><span class="cx"> 
</span><span class="cx">                  if ( ! in_array( $set_project->parent_project_id, $locale_projects ) ) {
</span><span class="cx">                          $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
</span><del>-                               $projects_data[$parent_id][$set_project->id]['sets'][$set->slug] = $this->set_data( $set );
</del><ins>+                                $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 );
</ins><span class="cx"> 
</span><span class="cx">                          if ( ! isset( $projects_data[$parent_id][$set_project->id]['project'] ) ) {
</span><span class="cx">                                  $projects_data[$parent_id][$set_project->id]['project'] = $set_project;
</span><span class="lines">@@ -67,18 +68,21 @@
</span><span class="cx">                                  $previous_parent = $parent_id;
</span><span class="cx">                          }
</span><span class="cx"> 
</span><del>-                               $set_data = $projects_data[$parent_id][$previous_parent]['sets'][$set->slug];
-                               $projects_data[$parent_id][$previous_parent]['sets'][$set->slug] = $this->set_data( $set, $set_data );
</del><ins>+                                $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 );
</ins><span class="cx">                   }
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="cx">          $this->tmpl( 'locale', get_defined_vars() );
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       private function set_data( $set, $set_data = null ) {
</del><ins>+        private function set_data( $set, $project, $set_data = null ) {
</ins><span class="cx">           if ( ! $set_data ) {
</span><span class="cx">                  $set_data = new stdClass;
</span><span class="cx"> 
</span><ins>+                       $set_data->slug = $set->slug;
+                       $set_data->project_path = $project->path;
</ins><span class="cx">                   $set_data->waiting_count = $set->waiting_count();
</span><span class="cx">                  $set_data->current_count = $set->current_count();
</span><span class="cx">                  $set_data->fuzzy_count   = $set->fuzzy_count();
</span><span class="lines">@@ -92,7 +96,7 @@
</span><span class="cx">          }
</span><span class="cx"> 
</span><span class="cx">          if ( ! isset( $set_data->name ) ) {
</span><del>-                       $set_data->name = $set->name;
</del><ins>+                        $set_data->name = $project->name;
</ins><span class="cx">           }
</span><span class="cx"> 
</span><span class="cx">          return $set_data;
</span></span></pre></div>
<a id="trunkgptemplateslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/locale.php (943 => 944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/locale.php    2014-08-09 22:27:43 UTC (rev 943)
+++ trunk/gp-templates/locale.php       2014-08-17 10:24:45 UTC (rev 944)
</span><span class="lines">@@ -8,70 +8,61 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx">  <h2><?php printf( __( 'Active Projects translated to %s' ), esc_html( $locale->english_name ) ); ?></h2>
</span><del>-       <?php
-       if ( empty( $projects_data ) ) {
-               _e( 'No active projects found.' );
-       }
-       ?>
</del><ins>+<?php
+if ( empty( $projects_data ) ) {
+       _e( 'No active projects found.' );
+}
+?>
</ins><span class="cx"> 
</span><del>-       <?php foreach ( $projects_data as $project_id => $sub_projects ) : ?>
-       <h3><?php echo esc_html( $projects[ $project_id ]->name ); ?></h3>
-       <div class="language-project">
-               <div class="project-description">
-                       <?php echo esc_html( gp_html_excerpt( $projects[ $project_id ]->description, 150 ) ); ?>
-               </div>
-               <table class="language-sub-projects">
</del><ins>+<?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">
</ins><span class="cx">                   <thead>
</span><del>-                               <tr>
-                                       <th class="header"><?php _e( 'Sub Project' ); ?></th>
-                                       <th class="header"><?php _e( 'Set' ); ?></th>
-                                       <th><?php echo _x( '%', 'language translation percent header' ); ?></th>
-                                       <th><?php _e( 'Translated' ); ?></th>
-                                       <th><?php _e( 'Fuzzy' ); ?></th>
-                                       <th><?php _e( 'Untranslated' ); ?></th>
-                                       <th><?php _e( 'Waiting' ); ?></th>
-                               </tr>
</del><ins>+                        <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>
</ins><span class="cx">                   </thead>
</span><del>-               <?php foreach ( $sub_projects as $sub_project_id => $sets ) : ?>
</del><span class="cx">                   <tbody>
</span><ins>+                       <?php foreach ( $sub_projects as $sub_project_id => $data ) : ?>
</ins><span class="cx">                           <tr>
</span><del>-                                       <th class="sub-project" rowspan="<?php echo count( $sets ) + 1; ?>">
-                                               <?php echo esc_html( $projects[$sub_project_id]->name ); ?>
-                                       </th>
-                               </tr>
-                       <?php foreach ( $sets['sets'] as $set_slug => $set_data ) : ?>
-                               <tr>
</del><ins>+                                <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>'; ?>
</ins><span class="cx">                                   <td class="set-name">
</span><del>-                                               <strong><?php gp_link( gp_url_project( $sets['project'], gp_url_join( $locale->slug, $set_slug ) ), $set_data->name ); ?></strong>
</del><ins>+                                                <strong><?php gp_link( gp_url_project( $set_data->project_path, gp_url_join( $locale->slug, $set_data->slug ) ), $set_data->name ); ?></strong>
</ins><span class="cx">                                           <?php if ( $set_data->current_count && $set_data->current_count >= $set_data->all_count * 0.9 ):
</span><span class="cx">                                                  $percent = floor( $set_data->current_count / $set_data->all_count * 100 );
</span><del>-                                               ?>
-                                               <span class="bubble morethan90"><?php echo $percent; ?>%</span>
</del><ins>+                                                        ?>
+                                                       <span class="bubble morethan90"><?php echo $percent; ?>%</span>
</ins><span class="cx">                                           <?php endif;?>
</span><span class="cx">                                  </td>
</span><del>-                                       <td class="stats percent">
-                                               <?php
-                                                       if ( $set_data->current_count ) {
-                                                               echo( floor( absint( $set_data->current_count ) / absint( $set_data->all_count ) * 100 ) );
-                                                       } else {
-                                                               echo '0';
-                                                       }
-                                               ?>%
-                                               </td>
-                                       <td class="stats translated"><?php gp_link( gp_url_project( $sets['project'], gp_url_join( $locale->slug, $set_slug ), array('filters[translated]' => 'yes', 'filters[status]' => 'current') ), absint( $set_data->current_count ) ); ?></td>
-                                       <td class="stats fuzzy"><?php gp_link( gp_url_project( $sets['project'], gp_url_join( $locale->slug, $set_slug ), array('filters[status]' => 'fuzzy' ) ), absint( $set_data->fuzzy_count ) ); ?></td>
-                                       <td class="stats untranslated"><?php gp_link( gp_url_project( $sets['project'], gp_url_join( $locale->slug, $set_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( $sets['project'], gp_url_join( $locale->slug, $set_slug ), array('filters[translated]' => 'yes', 'filters[status]' => 'waiting') ), absint( $set_data->waiting_count ) ); ?></td>
</del><ins>+                                        <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 ?>
</ins><span class="cx">                           </tr>
</span><del>-                       <?php endforeach; //sub project slugs ?>
-               <?php endforeach;  //sub projects ?>
</del><ins>+                        <?php endforeach;  //sub projects ?>
</ins><span class="cx">                   </tbody>
</span><span class="cx">          </table>
</span><span class="cx">  </div>
</span><del>-       <?php endforeach; //top projects ?>
</del><ins>+<?php endforeach; //top projects ?>
</ins><span class="cx"> 
</span><span class="cx">  <p class="actionlist secondary">
</span><span class="cx">          <?php gp_link( '/projects', __('All projects') ); ?>
</span><span class="cx">  </p>
</span><span class="cx"> 
</span><del>-<?php gp_tmpl_footer();
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php gp_tmpl_footer();
</ins></span></pre></div>
<a id="trunkgptemplateslocalesphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/locales.php (943 => 944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/locales.php   2014-08-09 22:27:43 UTC (rev 943)
+++ trunk/gp-templates/locales.php      2014-08-17 10:24:45 UTC (rev 944)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> 
</span><span class="cx">  <h2><?php _e('Locales and Languages'); ?></h2>
</span><span class="cx">  <div class="locales-filter">
</span><del>-               <?php _e( 'Filter:' );?><input id="locales-filter" type="search" placeholder="<?php esc_attr_e('Search string'); ?>" />
</del><ins>+                <?php _e( 'Filter:' );?><input id="locales-filter" type="text" placeholder="<?php esc_attr_e('search'); ?>" />
</ins><span class="cx">   </div>
</span><span class="cx"> 
</span><span class="cx">  <table class="tablesorter locales">
</span></span></pre>
</div>
</div>

</body>
</html>