Index: wp-admin/includes/ajax-actions.php =================================================================== --- wp-admin/includes/ajax-actions.php (revision 22515) +++ wp-admin/includes/ajax-actions.php (working copy) @@ -1422,13 +1422,11 @@ check_ajax_referer( 'find-posts' ); - if ( empty($_POST['ps']) ) - wp_die(); + $post_types = get_post_types( array( 'public' => true ), 'objects' ); + unset( $post_types['attachment'] ); - if ( !empty($_POST['post_type']) && in_array( $_POST['post_type'], get_post_types() ) ) - $what = $_POST['post_type']; - else - $what = 'post'; + $what = array_keys( $post_types ); + $what = "'" . implode( "', '", $what ) . "'"; $s = stripslashes($_POST['ps']); preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches); @@ -1444,14 +1442,18 @@ if ( count($search_terms) > 1 && $search_terms[0] != $s ) $search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')"; - $posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND post_status IN ('draft', 'publish') AND ($search) ORDER BY post_date_gmt DESC LIMIT 50" ); + if ( empty($_POST['ps']) ) + $search = ''; + else + $search = 'AND (' . $search . ')'; + $posts = $wpdb->get_results( "SELECT ID, post_title, post_type, post_status, post_date FROM $wpdb->posts WHERE post_type IN ($what) AND post_status IN ('draft', 'publish') $search ORDER BY post_date_gmt DESC LIMIT 50" ); + if ( ! $posts ) { - $posttype = get_post_type_object($what); - wp_die( $posttype->labels->not_found ); + wp_die( __('No items found.') ); } - $html = ''; + $html = '

'.__('Title').''.__('Date').''.__('Status').'
'; foreach ( $posts as $post ) { switch ( $post->post_status ) { @@ -1478,17 +1480,16 @@ } $html .= ''; - $html .= ''."\n\n"; + $html .= '' . "\n\n"; } + $html .= '

'.__('Title').''.__('Type').''.__('Date').''.__('Status').'
'.esc_html( $time ).''.esc_html( $stat ).'
' . esc_html( $post_types[$post->post_type]->labels->singular_name ) . ''.esc_html( $time ) . '' . esc_html( $stat ). '
'; $x = new WP_Ajax_Response(); $x->add( array( - 'what' => $what, 'data' => $html )); $x->send(); - } function wp_ajax_widgets_order() { Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 22515) +++ wp-admin/includes/template.php (working copy) @@ -1278,18 +1278,8 @@ -
- - true), 'objects' ); - foreach ( $post_types as $post ) { - if ( 'attachment' == $post->name ) - continue; - ?> - name, 'post'); ?> /> - - + +
Index: wp-admin/js/media.js =================================================================== --- wp-admin/js/media.js (revision 22515) +++ wp-admin/js/media.js (working copy) @@ -3,41 +3,63 @@ (function($){ findPosts = { open : function(af_name, af_val) { - var st = document.documentElement.scrollTop || $(document).scrollTop(); + var st = document.documentElement.scrollTop || $(document).scrollTop(), + overlay = $( '.ui-find-overlay' ); + if ( overlay.length == 0 ) { + $( 'body' ).append( '
' ); + findPosts.overlay(); + } + + overlay.show(); + if ( af_name && af_val ) { $('#affected').attr('name', af_name).val(af_val); } $('#find-posts').show().draggable({ handle: '#find-posts-head' - }).css({'top':st + 50 + 'px','left':'50%','marginLeft':'-250px'}); + }).css({'top':st + 50 + 'px','left':'50%','marginLeft':'-328px'}); $('#find-posts-input').focus().keyup(function(e){ if (e.which == 27) { findPosts.close(); } // close on Escape }); + // Pull some results up by default + findPosts.send(); + return false; }, close : function() { $('#find-posts-response').html(''); $('#find-posts').draggable('destroy').hide(); + $( '.ui-find-overlay' ).hide(); }, + overlay : function() { + $( '.ui-find-overlay' ).css( + { 'z-index': '999', 'width': $( document ).width() + 'px', 'height': $( document ).height() + 'px' } + ).on('click', function () { + findPosts.close(); + }); + }, + send : function() { var post = { - ps: $('#find-posts-input').val(), - action: 'find_posts', - _ajax_nonce: $('#_ajax_nonce').val(), - post_type: $('input[name="find-posts-what"]:checked').val() - }; + ps: $('#find-posts-input').val(), + action: 'find_posts', + _ajax_nonce: $('#_ajax_nonce').val() + }, + spinner = $( '.find-box-search .spinner' ); + spinner.show(); + $.ajax({ type : 'POST', url : ajaxurl, data : post, - success : function(x) { findPosts.show(x); }, - error : function(r) { findPosts.error(r); } + success : function(x) { findPosts.show(x); spinner.hide(); }, + error : function(r) { findPosts.error(r); spinner.hide(); } }); }, @@ -55,6 +77,11 @@ } r = r.responses[0]; $('#find-posts-response').html(r.data); + + // Enable whole row to be clicked + $( '.found-posts td' ).on( 'click', function () { + $( this ).parent().find( '.found-radio input' ).prop( 'checked', true ); + }); }, error : function(r) { @@ -91,4 +118,7 @@ }); }); }); + $(window).resize(function() { + findPosts.overlay(); + }); })(jQuery); Index: wp-admin/css/colors-fresh.css =================================================================== --- wp-admin/css/colors-fresh.css (revision 22515) +++ wp-admin/css/colors-fresh.css (working copy) @@ -20,15 +20,19 @@ 1.0 - Left to Right Styles ------------------------------------------------------------------------------*/ -.find-box-search { - border-color: #dfdfdf; - background-color: #f1f1f1; +.find-box-search, +.find-box-buttons { + background-color: #f7f7f7; } .find-box { - background-color: #f1f1f1; + background-color: #444; } +.find-box-head { + color: #eee; +} + .find-box-inside { background-color: #fff; } @@ -139,7 +143,6 @@ h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, -.find-box-head, .sidebar-name, #nav-menu-header, #nav-menu-footer, @@ -436,8 +439,7 @@ .widefat tfoot tr th, h3.dashboard-widget-title, h3.dashboard-widget-title span, -h3.dashboard-widget-title small, -.find-box-head { +h3.dashboard-widget-title small { color: #333; } Index: wp-admin/css/wp-admin-rtl.css =================================================================== --- wp-admin/css/wp-admin-rtl.css (revision 22515) +++ wp-admin/css/wp-admin-rtl.css (working copy) @@ -1020,6 +1020,21 @@ 14.1 - Media Uploader ------------------------------------------------------------------------------*/ +#find-posts-input { + float: right; +} + +#find-posts-search { + float: right; + margin-right: 3px; + margin-left: 4px; +} + +.find-box-search .spinner { + left: auto; + right: 115px; +} + #find-posts-response .found-radio { padding: 5px 8px 0 0; } Index: wp-admin/css/wp-admin.css =================================================================== --- wp-admin/css/wp-admin.css (revision 22515) +++ wp-admin/css/wp-admin.css (working copy) @@ -4004,10 +4004,10 @@ ------------------------------------------------------------------------------*/ .find-box { - width: 500px; + width: 600px; height: 300px; overflow: hidden; - padding: 33px 5px 40px; + padding: 33px 0 51px; position: absolute; z-index: 1000; } @@ -4025,16 +4025,34 @@ .find-box-inside { overflow: auto; - width: 100%; + padding: 6px; height: 100%; } .find-box-search { - padding: 12px; - border-width: 1px; - border-style: none none solid; + overflow: hidden; + padding: 9px; + position: relative; } +.find-box-search .spinner { + float: none; + left: 125px; + position: absolute; + top: 9px; +} + +#find-posts-input { + float: left; + width: 140px; + height: 24px; +} + +#find-posts-search { + float: left; + margin: 1px 4px 0 3px; +} + #find-posts-response { margin: 8px 0; padding: 0 1px; @@ -4045,25 +4063,30 @@ } #find-posts-response .found-radio { - padding: 5px 0 0 8px; + padding: 3px 0 0 8px; width: 15px; } .find-box-buttons { - width: 480px; - margin: 8px; + padding: 8px; + overflow: hidden; } -.find-box-search label { - padding-right: 6px; -} - .find-box #resize-se { position: absolute; right: 1px; bottom: 1px; } +.ui-find-overlay { + position: absolute; + top: 0; + left: 0; + background-color: #000; + opacity: 0.6; + filter: alpha(opacity=60); +} + ul#dismissed-updates { display: none; } Index: wp-admin/css/colors-classic.css =================================================================== --- wp-admin/css/colors-classic.css (revision 22515) +++ wp-admin/css/colors-classic.css (working copy) @@ -20,15 +20,19 @@ 1.0 - Left to Right Styles ------------------------------------------------------------------------------*/ -.find-box-search { - border-color: #dfdfdf; - background-color: #f1f1f1; +.find-box-search, +.find-box-buttons { + background-color: #eff8ff; } .find-box { - background-color: #f1f1f1; + background-color: #5589aa; } +.find-box-head { + color: #fff; +} + .find-box-inside { background-color: #fff; } @@ -142,7 +146,6 @@ h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, -.find-box-head, .sidebar-name, #nav-menu-header, #nav-menu-footer, @@ -440,8 +443,7 @@ .widefat tfoot tr th, h3.dashboard-widget-title, h3.dashboard-widget-title span, -h3.dashboard-widget-title small, -.find-box-head { +h3.dashboard-widget-title small { color: #333; }