<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16961] trunk: Move search results text in site-themes/site-users.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16961">16961</a></dd>
<dt>Author</dt> <dd>PeteMall</dd>
<dt>Date</dt> <dd>2010-12-15 18:32:25 +0000 (Wed, 15 Dec 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move search results text in site-themes/site-users. Props sorich87, ocean90. Fixes <a href="http://trac.wordpress.org/ticket/15553">#15553</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjslisttabledevjs">trunk/wp-admin/js/list-table.dev.js</a></li>
<li><a href="#trunkwpadminjslisttablejs">trunk/wp-admin/js/list-table.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (16960 => 16961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js        2010-12-15 17:56:25 UTC (rev 16960)
+++ trunk/wp-admin/js/list-table.dev.js        2010-12-15 18:32:25 UTC (rev 16961)
</span><span class="lines">@@ -254,12 +254,21 @@
</span><span class="cx">                         if ( $('h2.nav-tab-wrapper').length )
</span><span class="cx">                                 return;
</span><span class="cx"> 
</span><del>-                        $('h2 .subtitle').remove();
</del><ins>+                        if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) { 
+                                $('h4.search-text').remove();
</ins><span class="cx"> 
</span><del>-                        if ( data.s )
-                                $('h2').append($('&lt;span class=&quot;subtitle&quot;&gt;').html(
-                                        listTableL10n.search.replace('%s', this.htmlencode(data.s))
-                                ));
</del><ins>+                                if ( data.s )
+                                        $('ul.subsubsub').after($('&lt;h4 class=&quot;clear search-text&quot;&gt;').html( 
+                                                listTableL10n.search.replace('%s', this.htmlencode(data.s)) 
+                                        ));
+                        } else { 
+                                $('h2 .subtitle').remove();
+
+                                if ( data.s ) 
+                                        $('h2').append($('&lt;span class=&quot;subtitle&quot;&gt;').html( 
+                                                listTableL10n.search.replace('%s', this.htmlencode(data.s)) 
+                                        )); 
+                        }
</ins><span class="cx">                 });
</span><span class="cx">         }
</span><span class="cx">         $('.search-box :submit').click(change_search);
</span></span></pre></div>
<a id="trunkwpadminjslisttablejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.js (16960 => 16961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.js        2010-12-15 17:56:25 UTC (rev 16960)
+++ trunk/wp-admin/js/list-table.js        2010-12-15 18:32:25 UTC (rev 16961)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(document).ready(function(a){window.listTable={init:function(){this.loading=false;a(&quot;form&quot;).each(function(){this.reset()});if(&quot;&quot;==a.query.GET(&quot;paged&quot;)){a.query.SET(&quot;paged&quot;,1)}this.set_total_pages();this.$tbody=a(&quot;#the-list, #the-comment-list&quot;);this.$overlay=a('&lt;div id=&quot;loading-items&quot;&gt;').html(listTableL10n.loading).hide().prependTo(a(&quot;body&quot;))},set_total_pages:function(e){var d=a(&quot;.last-page&quot;).attr(&quot;href&quot;);if(d){this.total_pages=e||a.query.load(d).get(&quot;paged&quot;)}},get_total_pages:function(){return this.total_pages},htmlencode:function(d){return a(&quot;&lt;div/&gt;&quot;).text(d).html()},update_rows:function(e,d,h){if(this.loading){return false}var g=false,f={};a.each(e,function(i,j){if(j!=a.query.GET(i)){a.query.SET(i,j);g=true}});if(!g){return false}this.show_overlay();if(d){a.query.SET(&quot;paged&quot;,1)}a.each(a.query.get(),function(i,j){if(true===j){f[i]=&quot;&quot;}else{f[i]=j}});this._callback=h;this.fetch_list(f,a.proxy(this,&quot;handle_success&quot;),a.proxy(this,&quot;handle_error&quot;));return true},fetch_list:function(e,f,d){e=a.extend(e,{action:&quot;fetch-list&quot;,list_args:list_args});a.ajax({url:ajaxurl,global:false,dataType:&quot;json&quot;,data:e,success:f,error:d})},handle_success:function(d){if(&quot;object&quot;!=typeof d){this.handle_error()}else{this.hide_overlay();this.$tbody.html(d.rows);a(&quot;.displaying-num&quot;).html(d.total_items_i18n);a(&quot;.total-pages&quot;).html(d.total_pages_i18n);this.set_total_pages(d.total_pages);a(&quot;.current-page&quot;).val(a.query.GET(&quot;paged&quot;));a(&quot;th.column-cb :input&quot;).attr(&quot;checked&quot;,false);if(history.replaceState){history.replaceState({},&quot;&quot;,location.pathname+a.query)}if(this._callback){this._callback()}}},handle_error:function(){this.hide_overlay();a(&quot;h2&quot;).after('&lt;div class=&quot;error ajax below-h2&quot;&gt;&lt;p&gt;'+listTableL10n.error+&quot;&lt;/p&gt;&lt;/div&gt;&quot;)},show_overlay:function(){this.loading=true;a(&quot;.error.ajax&quot;).remove();this.$overlay.css({width:this.$tbody.width()+&quot;px&quot;,height:this.$tbody.height()-20+&quot;px&quot;}).css(this.$tbody.offset()).show()},hide_overlay:function(){this.loading=false;this.$overlay.hide()}};listTable.init();function b(e,d){if(e&lt;1){e=1}if(e&gt;listTable.get_total_pages()){e=listTable.get_total_pages()}listTable.update_rows({paged:e},false,function(){if(d.parents(&quot;.tablenav.bottom&quot;).length){scrollTo(0,0)}a(listTable).trigger(&quot;changePage&quot;)})}a(&quot;.tablenav-pages a&quot;).click(function(){var e=a(this),d=a.query.GET(&quot;paged&quot;);switch(e.attr(&quot;class&quot;)){case&quot;first-page&quot;:d=1;break;case&quot;prev-page&quot;:d-=1;break;case&quot;next-page&quot;:d+=1;break;case&quot;last-page&quot;:d=listTable.get_total_pages();break}b(d,e);return false});a(&quot;.current-page&quot;).keypress(function(f){if(13!=f.keyCode){return}var d=a(this);b(parseInt(d.val())||1,d);return false});a(&quot;th.sortable a, th.sorted a&quot;).click(function(){function i(k){return a.query.load(k.find(&quot;a&quot;).attr(&quot;href&quot;)).get(&quot;order&quot;)}var f=a(this),h=f.parent(&quot;th&quot;),g=h.index(),j=a.query.load(f.attr(&quot;href&quot;)).get(&quot;orderby&quot;),e;h=h.closest(&quot;table&quot;).find(&quot;thead th:eq(&quot;+g+&quot;), tfoot th:eq(&quot;+g+&quot;)&quot;);if(j==a.query.get(&quot;orderby&quot;)){e=(&quot;asc&quot;==a.query.get(&quot;order&quot;))?&quot;desc&quot;:&quot;asc&quot;}else{e=i(h);var d=a(&quot;th.sorted&quot;);if(d.length){d.removeClass(&quot;sorted&quot;).addClass(&quot;sortable&quot;);d.removeClass(&quot;desc&quot;).removeClass(&quot;asc&quot;).addClass(&quot;asc&quot;==i(d)?&quot;desc&quot;:&quot;asc&quot;)}h.removeClass(&quot;sortable&quot;).addClass(&quot;sorted&quot;)}h.removeClass(&quot;desc&quot;).removeClass(&quot;asc&quot;).addClass(e);listTable.update_rows({orderby:j,order:e},true);return false});function c(d){if(&quot;keypress&quot;==d.type&amp;&amp;13!=d.keyCode){return}d.preventDefault();d.stopImmediatePropagation();var e=a(this).parent(&quot;.search-box&quot;).find(&quot;:input&quot;).serializeObject();listTable.update_rows(e,true,function(){if(a(&quot;h2.nav-tab-wrapper&quot;).length){return}a(&quot;h2 .subtitle&quot;).remove();if(e.s){a(&quot;h2&quot;).append(a('&lt;span class=&quot;subtitle&quot;&gt;').html(listTableL10n.search.replace(&quot;%s&quot;,this.htmlencode(e.s))))}})}a(&quot;.search-box :submit&quot;).click(c);a(&quot;.search-box :text&quot;).keypress(c);a(&quot;#post-query-submit&quot;).click(function(){var d={};a(this).parents(&quot;.actions&quot;).find('select[name!=&quot;action&quot;]').each(function(){var e=a(this);d[e.attr(&quot;name&quot;)]=e.val()});listTable.update_rows(d,true);return false});a(&quot;.view-switch a&quot;).click(function(){var d=a(this);listTable.update_rows({mode:a.query.load(d.attr(&quot;href&quot;)).get(&quot;mode&quot;)},false,function(){a(&quot;.view-switch .current&quot;).removeClass(&quot;current&quot;);d.addClass(&quot;current&quot;)});return false})});
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(document).ready(function(a){window.listTable={init:function(){this.loading=false;a(&quot;form&quot;).each(function(){this.reset()});if(&quot;&quot;==a.query.GET(&quot;paged&quot;)){a.query.SET(&quot;paged&quot;,1)}this.set_total_pages();this.$tbody=a(&quot;#the-list, #the-comment-list&quot;);this.$overlay=a('&lt;div id=&quot;loading-items&quot;&gt;').html(listTableL10n.loading).hide().prependTo(a(&quot;body&quot;))},set_total_pages:function(e){var d=a(&quot;.last-page&quot;).attr(&quot;href&quot;);if(d){this.total_pages=e||a.query.load(d).get(&quot;paged&quot;)}},get_total_pages:function(){return this.total_pages},htmlencode:function(d){return a(&quot;&lt;div/&gt;&quot;).text(d).html()},update_rows:function(e,d,h){if(this.loading){return false}var g=false,f={};a.each(e,function(i,j){if(j!=a.query.GET(i)){a.query.SET(i,j);g=true}});if(!g){return false}this.show_overlay();if(d){a.query.SET(&quot;paged&quot;,1)}a.each(a.query.get(),function(i,j){if(true===j){f[i]=&quot;&quot;}else{f[i]=j}});this._callback=h;this.fetch_list(f,a.proxy(this,&quot;handle_success&quot;),a.proxy(this,&quot;handle_error&quot;));return true},fetch_list:function(e,f,d){e=a.extend(e,{action:&quot;fetch-list&quot;,list_args:list_args});a.ajax({url:ajaxurl,global:false,dataType:&quot;json&quot;,data:e,success:f,error:d})},handle_success:function(d){if(&quot;object&quot;!=typeof d){this.handle_error()}else{this.hide_overlay();this.$tbody.html(d.rows);a(&quot;.displaying-num&quot;).html(d.total_items_i18n);a(&quot;.total-pages&quot;).html(d.total_pages_i18n);this.set_total_pages(d.total_pages);a(&quot;.current-page&quot;).val(a.query.GET(&quot;paged&quot;));a(&quot;th.column-cb :input&quot;).attr(&quot;checked&quot;,false);if(history.replaceState){history.replaceState({},&quot;&quot;,location.pathname+a.query)}if(this._callback){this._callback()}}},handle_error:function(){this.hide_overlay();a(&quot;h2&quot;).after('&lt;div class=&quot;error ajax below-h2&quot;&gt;&lt;p&gt;'+listTableL10n.error+&quot;&lt;/p&gt;&lt;/div&gt;&quot;)},show_overlay:function(){this.loading=true;a(&quot;.error.ajax&quot;).remove();this.$overlay.css({width:this.$tbody.width()+&quot;px&quot;,height:this.$tbody.height()-20+&quot;px&quot;}).css(this.$tbody.offset()).show()},hide_overlay:function(){this.loading=false;this.$overlay.hide()}};listTable.init();function b(e,d){if(e&lt;1){e=1}if(e&gt;listTable.get_total_pages()){e=listTable.get_total_pages()}listTable.update_rows({paged:e},false,function(){if(d.parents(&quot;.tablenav.bottom&quot;).length){scrollTo(0,0)}a(listTable).trigger(&quot;changePage&quot;)})}a(&quot;.tablenav-pages a&quot;).click(function(){var e=a(this),d=a.query.GET(&quot;paged&quot;);switch(e.attr(&quot;class&quot;)){case&quot;first-page&quot;:d=1;break;case&quot;prev-page&quot;:d-=1;break;case&quot;next-page&quot;:d+=1;break;case&quot;last-page&quot;:d=listTable.get_total_pages();break}b(d,e);return false});a(&quot;.current-page&quot;).keypress(function(f){if(13!=f.keyCode){return}var d=a(this);b(parseInt(d.val())||1,d);return false});a(&quot;th.sortable a, th.sorted a&quot;).click(function(){function i(k){return a.query.load(k.find(&quot;a&quot;).attr(&quot;href&quot;)).get(&quot;order&quot;)}var f=a(this),h=f.parent(&quot;th&quot;),g=h.index(),j=a.query.load(f.attr(&quot;href&quot;)).get(&quot;orderby&quot;),e;h=h.closest(&quot;table&quot;).find(&quot;thead th:eq(&quot;+g+&quot;), tfoot th:eq(&quot;+g+&quot;)&quot;);if(j==a.query.get(&quot;orderby&quot;)){e=(&quot;asc&quot;==a.query.get(&quot;order&quot;))?&quot;desc&quot;:&quot;asc&quot;}else{e=i(h);var d=a(&quot;th.sorted&quot;);if(d.length){d.removeClass(&quot;sorted&quot;).addClass(&quot;sortable&quot;);d.removeClass(&quot;desc&quot;).removeClass(&quot;asc&quot;).addClass(&quot;asc&quot;==i(d)?&quot;desc&quot;:&quot;asc&quot;)}h.removeClass(&quot;sortable&quot;).addClass(&quot;sorted&quot;)}h.removeClass(&quot;desc&quot;).removeClass(&quot;asc&quot;).addClass(e);listTable.update_rows({orderby:j,order:e},true);return false});function c(d){if(&quot;keypress&quot;==d.type&amp;&amp;13!=d.keyCode){return}d.preventDefault();d.stopImmediatePropagation();var e=a(this).parent(&quot;.search-box&quot;).find(&quot;:input&quot;).serializeObject();listTable.update_rows(e,true,function(){if(a(&quot;h2.nav-tab-wrapper&quot;).length){return}if(&quot;site-users-network&quot;==pagenow||&quot;site-themes-network&quot;==pagenow){a(&quot;h4.search-text&quot;).remove();if(e.s){a(&quot;ul.subsubsub&quot;).after(a('&lt;h4 class=&quot;clear search-text&quot;&gt;').html(listTableL10n.search.replace(&quot;%s&quot;,this.htmlencode(e.s))))}}else{a(&quot;h2 .subtitle&quot;).remove();if(e.s){a(&quot;h2&quot;).append(a('&lt;span class=&quot;subtitle&quot;&gt;').html(listTableL10n.search.replace(&quot;%s&quot;,this.htmlencode(e.s))))}}})}a(&quot;.search-box :submit&quot;).click(c);a(&quot;.search-box :text&quot;).keypress(c);a(&quot;#post-query-submit&quot;).click(function(){var d={};a(this).parents(&quot;.actions&quot;).find('select[name!=&quot;action&quot;]').each(function(){var e=a(this);d[e.attr(&quot;name&quot;)]=e.val()});listTable.update_rows(d,true);return false});a(&quot;.view-switch a&quot;).click(function(){var d=a(this);listTable.update_rows({mode:a.query.load(d.attr(&quot;href&quot;)).get(&quot;mode&quot;)},false,function(){a(&quot;.view-switch .current&quot;).removeClass(&quot;current&quot;);d.addClass(&quot;current&quot;)});return false})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16960 => 16961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2010-12-15 17:56:25 UTC (rev 16960)
+++ trunk/wp-includes/script-loader.php        2010-12-15 18:32:25 UTC (rev 16961)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx">                 $scripts-&gt;add( 'admin-custom-fields', &quot;/wp-admin/js/custom-fields$suffix.js&quot;, array('wp-lists'), '20090106' );
</span><span class="cx">                 $scripts-&gt;add_data( 'admin-custom-fields', 'group', 1 );
</span><span class="cx"> 
</span><del>-                $scripts-&gt;add( 'list-table', &quot;/wp-admin/js/list-table$suffix.js&quot;, array( 'jquery-query', 'jquery-serialize-object' ), '20101214' );
</del><ins>+                $scripts-&gt;add( 'list-table', &quot;/wp-admin/js/list-table$suffix.js&quot;, array( 'jquery-query', 'jquery-serialize-object' ), '20101215' );
</ins><span class="cx">                 $scripts-&gt;add_data( 'list-table', 'group', 1 );
</span><span class="cx">                 $scripts-&gt;localize( 'list-table', 'listTableL10n', array(
</span><span class="cx">                         'loading' =&gt; __('Loading...'),
</span></span></pre>
</div>
</div>

</body>
</html>