Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 7053) +++ wp-includes/script-loader.php (working copy) @@ -126,9 +126,8 @@ 'strong' => __('Strong') ) ); $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20071104' ); - $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20071023' ); $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' ); - $this->add( 'admin-forms', '/wp-admin/js/forms.js', array('wp-lists'), '20080108' ); + $this->add( 'admin-forms', '/wp-admin/js/forms.js', false, '20080108' ); $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' ); $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' ); $this->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery'), '20080128' ); Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 7053) +++ wp-admin/users.php (working copy) @@ -264,14 +264,17 @@ } unset($users_of_blog); +$current_role = false; foreach ( $wp_roles->get_names() as $role => $name ) { if ( !isset($avail_roles[$role]) ) continue; $class = ''; - if ( $role == $_GET['role'] ) + if ( $role == $_GET['role'] ) { + $current_role = $_GET['role']; $class = ' class="current"'; + } $name = translate_with_context($name); $name = sprintf(_c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$role]); @@ -339,12 +342,12 @@ get_results() as $userid ) { $user_object = new WP_User($userid); $roles = $user_object->roles; $role = array_shift($roles); - $style = ''; $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"'; echo "\n\t" . user_row($user_object, $style, $role); } @@ -399,7 +402,7 @@ else echo '

' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '

'; ?> -
+ @@ -437,7 +440,7 @@ - + \n\t\n"; // Hack! $class = ( $i_post > 15 || 'alternate' == $class) ? '' : 'alternate'; global $current_user; $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); @@ -165,7 +163,7 @@ case 'control_delete': ?> - + - - - -
Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 7053) +++ wp-admin/edit.php (working copy) @@ -33,15 +33,12 @@ $title = __('Posts'); $parent_file = 'edit.php'; -wp_enqueue_script( 'admin-posts' ); wp_enqueue_script('admin-forms'); if ( 1 == $_GET['c'] ) wp_enqueue_script( 'admin-comments' ); require_once('admin-header.php'); -add_filter( 'post_limits', $limit_filter = create_function( '$a', '$b = split(" ",$a); if ( !isset($b[2]) ) return $a; $start = intval(trim($b[1])) / 20 * 15; if ( !is_int($start) ) return $a; return "LIMIT $start, 20";' ) ); list($post_stati, $avail_post_stati) = wp_edit_posts_query(); -$wp_query->max_num_pages = ceil( $wp_query->found_posts / 15 ); // We grab 20 but only show 15 ( 5 more for ajax extra ) if ( !isset( $_GET['paged'] ) ) $_GET['paged'] = 1; @@ -179,10 +176,6 @@ - - - -
Index: wp-admin/link-manager.php =================================================================== --- wp-admin/link-manager.php (revision 7053) +++ wp-admin/link-manager.php (working copy) @@ -24,7 +24,6 @@ exit; } -wp_enqueue_script( 'wp-lists' ); wp_enqueue_script('admin-forms'); wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]')); @@ -150,7 +149,7 @@ } ?>
- + - +
@@ -450,11 +453,6 @@

- - - -
- comment_post_ID); $authordata = get_userdata($post->post_author); $the_comment_status = wp_get_comment_status($comment->comment_ID); - $class = ('alternate' == $class) ? '' : ''; - $class .= ('unapproved' == $the_comment_status) ? ' unapproved' : ''; + $class = ('unapproved' == $the_comment_status) ? 'unapproved' : ''; $post_link = '' . get_the_title($comment->comment_post_ID) . ''; $author_url = get_comment_author_url(); if ( 'http://' == $author_url ) Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 7053) +++ wp-admin/includes/template.php (working copy) @@ -263,21 +263,10 @@ // convert it to table rows $out = ''; $class = ''; - $i = 0; $count = 0; - foreach( $tags as $tag ) { - if( $i ) { - $i = 0; - $class = ' class="alternate"'; - } else { - $i = 1; - $class = ''; - } + foreach( $tags as $tag ) + $out .= _tag_row( $tag, ++$count % 2 ? ' class="alternate"' : '' ); - $out .= _tag_row( $tag, $class ); - $count++; - } - // filter and send to screen $out = apply_filters('tag_rows', $out); echo $out; Index: wp-admin/js/edit-posts.js =================================================================== --- wp-admin/js/edit-posts.js (revision 7053) +++ wp-admin/js/edit-posts.js (working copy) @@ -1,22 +0,0 @@ -jQuery(function($) { -var delAfter; var extra; var list; - -if ( document.location.href.match(/(\?|&)c=/) ) - delAfter = function() { $('#comments, #the-comment-list').remove(); } -else - delAfter = function() { - list[0].wpList.add( extra.children(':eq(0)').remove().clone() ); - $('#get-extra-posts').submit(); - } - -var addBefore = function ( settings ) { - var q = document.location.href.split('?'); - if ( q[1] ) - settings.data += '&' + q[1]; - return settings; -} - -extra = $('#the-extra-list').wpList( { alt: '', addBefore: addBefore, addColor: 'none', delColor: 'none' } ); -list = $('#the-list').wpList( { delAfter: delAfter, addColor: 'none' } ); - -} ); Index: wp-admin/js/users.js =================================================================== --- wp-admin/js/users.js (revision 7053) +++ wp-admin/js/users.js (working copy) @@ -1,22 +1 @@ -jQuery( function($) { - var userLists; var list; var addBefore; var addAfter; - - addBefore = function( s ) { - if ( $( '#role-' + $('#role').val() ).size() ) - return s; - return false; - }; - - addAfter = function( r, s ) { - var roleTable = $( '#role-' + $('role', r).text() ); - - var e = $('#user-' + $('user', r).attr('id') ); - if ( !roleTable.size() ) { return; } - if ( !e.size() ) { return; } - - roleTable[0].wpList.add(e.remove().clone()); - }; - - userLists = $('.user-list').wpList(); - list = $('#user-list').wpList( { addBefore: addBefore, addAfter: addAfter } ); -} ); +jQuery( function($) { $('#users').wpList(); } ); Index: wp-admin/edit-post-rows.php =================================================================== --- wp-admin/edit-post-rows.php (revision 7053) +++ wp-admin/edit-post-rows.php (working copy) @@ -10,15 +10,13 @@