Index: /trunk/src/wp-admin/includes/class-wp-comments-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-comments-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-comments-list-table.php (revision 32644) @@ -358,4 +358,16 @@ } + /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'comment'; + } + public function display() { wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); @@ -414,4 +426,119 @@ $this->single_row_columns( $comment ); echo "\n"; + } + + /** + * Generate and display row actions links + * + * @since 4.3.0 + * @access protected + * + * @param object $comment Comment being acted upon + * @param string $column_name Current column name + * @param string $primary Primary column name + * + * @return string + */ + protected function handle_row_actions( $comment, $column_name, $primary ) { + global $comment_status; + + if ( ! $this->user_can ) { + return; + + } + + $post = get_post(); + + $the_comment_status = wp_get_comment_status( $comment->comment_ID ); + + $out = ''; + + if( $primary === $column_name ) { + $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); + $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); + + $url = "comment.php?c=$comment->comment_ID"; + + $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); + $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); + $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); + $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); + $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); + $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); + $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); + + // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash. + $actions = array( + 'approve' => '', 'unapprove' => '', + 'reply' => '', + 'quickedit' => '', + 'edit' => '', + 'spam' => '', 'unspam' => '', + 'trash' => '', 'untrash' => '', 'delete' => '' + ); + + // Not looking at all comments. + if ( $comment_status && 'all' != $comment_status ) { + if ( 'approved' == $the_comment_status ) { + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } elseif ( 'unapproved' == $the_comment_status ) { + $actions['approve'] = "" . __( 'Approve' ) . ''; + } + } else { + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + } + + if ( 'spam' != $the_comment_status ) { + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + } elseif ( 'spam' == $the_comment_status ) { + $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; + } + + if ( 'trash' == $the_comment_status ) { + $actions['untrash'] = "" . __( 'Restore' ) . ''; + } + + if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { + $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; + } else { + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; + } + + if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { + $actions['edit'] = "". __( 'Edit' ) . ''; + + $format = '%s'; + + $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick Edit' ) ); + + $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) ); + } + + /** This filter is documented in wp-admin/includes/dashboard.php */ + $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); + + $i = 0; + $out .= '
'; + foreach ( $actions as $action => $link ) { + ++$i; + ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; + + // Reply and quickedit need a hide-if-no-js span when not added with ajax + if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) + $action .= ' hide-if-no-js'; + elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { + if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) + $action .= ' approve'; + else + $action .= ' unapprove'; + } + + $out .= "$sep$link"; + } + $out .= '
'; + } + + return $out; } @@ -470,90 +597,4 @@ user_can ) { - $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); - $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); - - $url = "comment.php?c=$comment->comment_ID"; - - $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" ); - $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" ); - $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" ); - $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" ); - $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" ); - $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" ); - $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" ); - - // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash. - $actions = array( - 'approve' => '', 'unapprove' => '', - 'reply' => '', - 'quickedit' => '', - 'edit' => '', - 'spam' => '', 'unspam' => '', - 'trash' => '', 'untrash' => '', 'delete' => '' - ); - - // Not looking at all comments. - if ( $comment_status && 'all' != $comment_status ) { - if ( 'approved' == $the_comment_status ) { - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - } elseif ( 'unapproved' == $the_comment_status ) { - $actions['approve'] = "" . __( 'Approve' ) . ''; - } - } else { - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - } - - if ( 'spam' != $the_comment_status ) { - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - } elseif ( 'spam' == $the_comment_status ) { - $actions['unspam'] = "" . _x( 'Not Spam', 'comment' ) . ''; - } - - if ( 'trash' == $the_comment_status ) { - $actions['untrash'] = "" . __( 'Restore' ) . ''; - } - - if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently' ) . ''; - } else { - $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ''; - } - - if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) { - $actions['edit'] = "". __( 'Edit' ) . ''; - - $format = '%s'; - - $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick Edit' ) ); - - $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) ); - } - - /** This filter is documented in wp-admin/includes/dashboard.php */ - $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment ); - - $i = 0; - echo '
'; - foreach ( $actions as $action => $link ) { - ++$i; - ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; - - // Reply and quickedit need a hide-if-no-js span when not added with ajax - if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') ) - $action .= ' hide-if-no-js'; - elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) { - if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) - $action .= ' approve'; - else - $action .= ' unapprove'; - } - - echo "$sep$link"; - } - echo '
'; - } } Index: /trunk/src/wp-admin/includes/class-wp-links-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-links-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-links-list-table.php (revision 32644) @@ -122,4 +122,16 @@ /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'name'; + } + + /** * * @global int $cat_id @@ -143,64 +155,59 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class='column-$column_name'"; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - $attributes = $class . $style; - - switch ( $column_name ) { - case 'cb': ?> - - - - - link_name ) ) . "'>$link->link_name
"; - - $actions = array(); - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['delete'] = "link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . ""; - echo $this->row_actions( $actions ); - - echo ''; - break; - case 'url': - echo "link_name ) )."'>$short_url"; - break; - case 'categories': - ?>>link_category as $category ) { - $cat = get_term( $category, 'link_category', OBJECT, 'display' ); - if ( is_wp_error( $cat ) ) - echo $cat->get_error_message(); - $cat_name = $cat->name; - if ( $cat_id != $category ) - $cat_name = "$cat_name"; - $cat_names[] = $cat_name; - } - echo implode( ', ', $cat_names ); - ?>>link_rel ) ? '
' : $link->link_rel; ?>>> - > + + + + + "; + + switch ( $column_name ) { + case 'name': + echo "link_name ) ) . "'>$link->link_name
"; + break; + case 'url': + echo "link_name ) )."'>$short_url"; + break; + case 'categories': + $cat_names = array(); + foreach ( $link->link_category as $category ) { + $cat = get_term( $category, 'link_category', OBJECT, 'display' ); + if ( is_wp_error( $cat ) ) + echo $cat->get_error_message(); + $cat_name = $cat->name; + if ( $cat_id != $category ) + $cat_name = "$cat_name"; + $cat_names[] = $cat_name; + } + echo implode( ', ', $cat_names ); + break; + case 'rel': + echo empty( $link->link_rel ) ? '
' : $link->link_rel; + break; + case 'visible': + echo $visible; + break; + case 'rating': + echo $rating; + break; + default: /** * Fires for each registered custom link column. @@ -212,7 +219,9 @@ */ do_action( 'manage_link_custom_column', $column_name, $link->link_id ); - ?> - handle_row_actions( $link, $column_name, $primary ); + echo ''; } } @@ -222,3 +231,26 @@ } } + + /** + * Generate and display row actions links + * + * @since 4.3 + * @access protected + * + * @param object $link Link being acted upon + * @param string $column_name Current column name + * @param string $primary Primary column name + * + * @return string + */ + protected function handle_row_actions( $link, $column_name, $primary ) { + if( $primary === $column_name ) { + $edit_link = get_edit_bookmark_link( $link ); + + $actions = array(); + $actions['edit'] = '' . __('Edit') . ''; + $actions['delete'] = "link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . ""; + return $this->row_actions($actions); + } + } } Index: /trunk/src/wp-admin/includes/class-wp-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-list-table.php (revision 32644) @@ -796,4 +796,44 @@ /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return ''; + } + + /** + * Get name of primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Filtered name of primary column + */ + protected function get_primary_column_name() { + $columns = $this->get_columns(); + $default = $this->get_default_primary_column_name(); + /** + * Filter the name of the primary column for the current list table, with context as argument (eg: 'plugins'). + * + * @since 4.3.0 + * + * @param string $default Column name default for the specific list table (eg: 'name') + * @param string $context Screen ID for specific list table (eg: 'plugins') + */ + $column = apply_filters( 'list_table_primary_column', $default, $this->screen->id ); + + if ( empty( $column ) || ! isset( $columns[ $column ] ) ) { + $column = $default; + } + + return $column; + } + + /** * Get a list of all, hidden and sortable columns, with filter applied * @@ -835,5 +875,6 @@ } - $this->_column_headers = array( $columns, $hidden, $sortable ); + $primary = $this->get_primary_column_name(); + $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); return $this->_column_headers; @@ -1063,14 +1104,18 @@ */ protected function single_row_columns( $item ) { - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class='$column_name column-$column_name'"; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - $attributes = "$class$style"; + } + + $attributes = "class='$classes'$style"; if ( 'cb' == $column_name ) { @@ -1082,4 +1127,5 @@ echo ""; echo call_user_func( array( $this, 'column_' . $column_name ), $item ); + echo $this->handle_row_actions( $item, $column_name, $primary ); echo ""; } @@ -1087,8 +1133,25 @@ echo ""; echo $this->column_default( $item, $column_name ); + echo $this->handle_row_actions( $item, $column_name, $primary ); echo ""; } } } + + /** + * Generate and display row actions links + * + * @since 4.3.0 + * @access protected + * + * @param object $item Item being acted upon + * @param string $column_name Current column name + * @param string $primary Primary column name + * + * @return string + */ + protected function handle_row_actions( $item, $column_name, $primary ) { + return ''; + } /** Index: /trunk/src/wp-admin/includes/class-wp-media-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-media-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-media-list-table.php (revision 32644) @@ -309,17 +309,20 @@ get_column_info(); +list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); + foreach ( $columns as $column_name => $column_display_name ) { - $class = "class='$column_name column-$column_name'"; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - $attributes = $class . $style; - - switch ( $column_name ) { - - case 'cb': + } + + $attributes = "class='$classes'$style"; + + if ( 'cb' === $column_name ) { ?> @@ -330,188 +333,169 @@ post_mime_type ); - $attributes = 'class="column-icon media-icon ' . $mime . '-icon"' . $style; -?> - >ID, array( 80, 60 ), true ) ) { - if ( $this->is_trash || ! $user_can_edit ) { - echo $thumb; + } else { + echo ""; + + switch ( $column_name ) { + case 'icon': + list( $mime ) = explode( '/', $post->post_mime_type ); + $attributes = 'class="column-icon media-icon ' . $mime . '-icon"' . $style; + + if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) { + if ( $this->is_trash || ! $user_can_edit ) { + echo $thumb; + } else { ?> + + + + + is_trash || ! $user_can_edit ) { + echo $att_title; + } else { ?> + + + +

guid ); ?>

+%s', + esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ), + get_the_author() + ); + + break; + + case 'desc': + echo has_excerpt() ? $post->post_excerpt : ''; + break; + + case 'date': + if ( '0000-00-00 00:00:00' == $post->post_date ) { + $h_time = __( 'Unpublished' ); } else { -?> - - - - - - - - > - is_trash || ! $user_can_edit ) { - echo $att_title; - } else { ?> - - - -

guid ); ?>

-row_actions( $this->_get_row_actions( $post, $att_title ) ); -?> - - - >%s', - esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ), - get_the_author() - ); - ?> - - >post_excerpt : ''; ?> -post_date ) { - $h_time = __( 'Unpublished' ); - } else { - $m_time = $post->post_date; - $time = get_post_time( 'G', true, $post, false ); - if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) { - if ( $t_diff < 0 ) - $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) ); + $m_time = $post->post_date; + $time = get_post_time( 'G', true, $post, false ); + if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) { + if ( $t_diff < 0 ) + $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) ); + else + $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) ); + } else { + $h_time = mysql2date( __( 'Y/m/d' ), $m_time ); + } + } + + echo $h_time; + break; + + case 'parent': + if ( $post->post_parent > 0 ) + $parent = get_post( $post->post_parent ); else - $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) ); - } else { - $h_time = mysql2date( __( 'Y/m/d' ), $m_time ); - } - } -?> - > -post_parent > 0 ) - $parent = get_post( $post->post_parent ); - else - $parent = false; - - if ( $parent ) { - $title = _draft_or_post_title( $post->post_parent ); - $parent_type = get_post_type_object( $parent->post_type ); -?> - > - show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?> - - post_parent ); + $parent_type = get_post_type_object( $parent->post_type ); + ?> + + show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?> + + , +
+ $post->post_parent, + 'media[]' => $post->ID, + '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] ) + ), 'upload.php' ); ?> + + , -
- $post->post_parent, - 'media[]' => $post->ID, - '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] ) - ), 'upload.php' ); ?> - - - - - >
- - - - - - > -
-ID ); - - $this->comments_bubble( $post->ID, $pending_comments ); -?> -
- -'; - if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) { - $out = array(); - foreach ( $terms as $t ) { - $posts_in_term_qv = array(); - $posts_in_term_qv['taxonomy'] = $taxonomy; - $posts_in_term_qv['term'] = $t->slug; - - $out[] = sprintf( '%s', - esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ), - esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) ) - ); - } - /* translators: used between list items, there is a space after the comma */ - echo join( __( ', ' ), $out ); - } else { - echo '—'; - } - echo ''; - break; - } -?> - >ID ); - ?> -
+ + + + '; + + $pending_comments = get_pending_comments_num( $post->ID ); + $this->comments_bubble( $post->ID, $pending_comments ); + + echo ''; + + break; + + default: + if ( 'categories' == $column_name ) + $taxonomy = 'category'; + elseif ( 'tags' == $column_name ) + $taxonomy = 'post_tag'; + elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) + $taxonomy = substr( $column_name, 9 ); + else + $taxonomy = false; + + if ( $taxonomy ) { + if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) { + $out = array(); + foreach ( $terms as $t ) { + $posts_in_term_qv = array(); + $posts_in_term_qv['taxonomy'] = $taxonomy; + $posts_in_term_qv['term'] = $t->slug; + + $out[] = sprintf( '%s', + esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ), + esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) ) + ); + } + /* translators: used between list items, there is a space after the comma */ + echo join( __( ', ' ), $out ); + } else { + echo '—'; + } + + break; + } + + /** + * Fires for each custom column in the Media list table. + * + * Custom columns are registered using the 'manage_media_columns' filter. + * + * @since 2.5.0 + * + * @param string $column_name Name of the custom column. + * @param int $post_id Attachment ID. + */ + do_action( 'manage_media_custom_column', $column_name, $post->ID ); + break; + } + + if( $primary === $column_name ) { + echo $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); + } + + echo ''; } } @@ -519,4 +503,16 @@ domain, '', $blog['domain'] ) : $blog['path']; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } + $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - switch ( $column_name ) { - case 'cb': ?> - - - - - - - - - - - "; ?> + } + + $attributes = "class='$classes'$style"; + + if ( 'cb' === $column_name ) { +?> + + + + + + + + + + +"; + + switch ( $column_name ) { + case 'blogname': + ?> '', 'backend' => '', - 'activate' => '', 'deactivate' => '', - 'archive' => '', 'unarchive' => '', - 'spam' => '', 'unspam' => '', - 'delete' => '', - 'visit' => '', - ); - - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['backend'] = "" . __( 'Dashboard' ) . ''; - if ( get_current_site()->blog_id != $blog['blog_id'] ) { - if ( $blog['deleted'] == '1' ) { - $actions['activate'] = '' . __( 'Activate' ) . ''; - } else { - $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; - } - - if ( $blog['archived'] == '1' ) { - $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; - } else { - $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; - } - - if ( $blog['spam'] == '1' ) { - $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . ''; - } else { - $actions['spam'] = '' . _x( 'Spam', 'site' ) . ''; - } - - if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) { - $actions['delete'] = '' . __( 'Delete' ) . ''; - } + break; + + case 'lastupdated': + echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); + break; + + case 'registered': + if ( $blog['registered'] == '0000-00-00 00:00:00' ) { + echo '—'; + } else { + echo mysql2date( $date, $blog['registered'] ); } - - $actions['visit'] = "" . __( 'Visit' ) . ''; - - /** - * Filter the action links displayed for each site in the Sites list table. - * - * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by - * default for each site. The site's status determines whether to show the - * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and - * 'Not Spam' or 'Spam' link for each site. - * - * @since 3.1.0 - * - * @param array $actions An array of action links to be displayed. - * @param int $blog_id The site ID. - * @param string $blogname Site path, formatted depending on whether it is a sub-domain - * or subdirectory multisite install. - */ - $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); - echo $this->row_actions( $actions ); - ?> - - "; - echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); ?> - - "; - if ( $blog['registered'] == '0000-00-00 00:00:00' ) - echo '—'; - else - echo mysql2date( $date, $blog['registered'] ); - ?> - - "; + break; + + case 'users': $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) ); if ( is_array( $blogusers ) ) { @@ -377,39 +322,36 @@ echo '' . $blogusers_warning . '
'; } - ?> - - - "; - /** - * Fires inside the auxiliary 'Actions' column of the Sites list table. - * - * By default this column is hidden unless something is hooked to the action. - * - * @since MU - * - * @param int $blog_id The site ID. - */ - do_action( 'wpmublogsaction', $blog['blog_id'] ); ?> - - "; - /** - * Fires for each registered custom column in the Sites list table. - * - * @since 3.1.0 - * - * @param string $column_name The name of the column to display. - * @param int $blog_id The site ID. - */ - do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] ); - echo ""; - break; + break; + + case 'plugins': + if ( has_filter( 'wpmublogsaction' ) ) { + /** + * Fires inside the auxiliary 'Actions' column of the Sites list table. + * + * By default this column is hidden unless something is hooked to the action. + * + * @since MU + * + * @param int $blog_id The site ID. + */ + do_action( 'wpmublogsaction', $blog['blog_id'] ); + } + break; + + default: + /** + * Fires for each registered custom column in the Sites list table. + * + * @since 3.1.0 + * + * @param string $column_name The name of the column to display. + * @param int $blog_id The site ID. + */ + do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] ); + break; + } + + echo $this->handle_row_actions( $blog, $column_name, $primary ); + echo ''; } } @@ -419,3 +361,91 @@ } } + + /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'blogname'; + } + + /** + * Generate and display row actions links + * + * @since 4.3.0 + * @access protected + * + * @param object $blog Blog being acted upon + * @param string $column_name Current column name + * @param string $primary Primary column name + * + * @return string + */ + protected function handle_row_actions( $blog, $column_name, $primary ) { + global $current_site; + + if ( $primary === $column_name ) { + $blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path']; + + // Preordered. + $actions = array( + 'edit' => '', 'backend' => '', + 'activate' => '', 'deactivate' => '', + 'archive' => '', 'unarchive' => '', + 'spam' => '', 'unspam' => '', + 'delete' => '', + 'visit' => '', + ); + + $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['backend'] = "" . __( 'Dashboard' ) . ''; + if ( get_current_site()->blog_id != $blog['blog_id'] ) { + if ( $blog['deleted'] == '1' ) { + $actions['activate'] = '' . __( 'Activate' ) . ''; + } else { + $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; + } + + if ( $blog['archived'] == '1' ) { + $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; + } else { + $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; + } + + if ( $blog['spam'] == '1' ) { + $actions['unspam'] = '' . _x( 'Not Spam', 'site' ) . ''; + } else { + $actions['spam'] = '' . _x( 'Spam', 'site' ) . ''; + } + + if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) { + $actions['delete'] = '' . __( 'Delete' ) . ''; + } + } + + $actions['visit'] = "" . __( 'Visit' ) . ''; + + /** + * Filter the action links displayed for each site in the Sites list table. + * + * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by + * default for each site. The site's status determines whether to show the + * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and + * 'Not Spam' or 'Spam' link for each site. + * + * @since 3.1.0 + * + * @param array $actions An array of action links to be displayed. + * @param int $blog_id The site ID. + * @param string $blogname Site path, formatted depending on whether it is a sub-domain + * or subdirectory multisite install. + */ + $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); + return $this->row_actions( $actions ); + } + } } Index: /trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php (revision 32644) @@ -231,4 +231,16 @@ /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'name'; + } + + /** * * @global array $totals @@ -401,5 +413,5 @@ echo ""; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { @@ -414,5 +426,7 @@ case 'name': echo "" . $theme->display('Name') . ""; - echo $this->row_actions( $actions, true ); + if ( $primary === $column_name ) { + echo $this->row_actions($actions, true); + } echo ""; break; @@ -452,5 +466,9 @@ echo implode( ' | ', $theme_meta ); - echo ""; + echo ''; + if ( $primary === $column_name ) { + echo $this->row_actions($actions, true); + } + echo ''; break; @@ -468,4 +486,8 @@ */ do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme ); + + if ( $primary === $column_name ) { + echo $this->row_actions($actions, true); + } echo ""; } Index: /trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php (revision 32644) @@ -181,79 +181,64 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) : - $class = "class='$column_name column-$column_name'"; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name || 'blogs' === $column_name ) { + $classes .= ' has-row-actions'; + } + + if ( $primary === $column_name ) { + $classes .= ' column-primary'; + } $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - $attributes = "$class$style"; - - switch ( $column_name ) { - case 'cb': ?> - - - - + } + + $attributes = "class='$classes'$style"; + + if ( 'cb' === $column_name ){ + ?> + + + + user_email, 32 ); - $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) ); - - echo ""; ?> - user_login; ?>"; + + switch ( $column_name ) { + case 'username': + $avatar = get_avatar( $user->user_email, 32 ); + $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) ); + + echo $avatar; ?>user_login; ?>user_login, $super_admins ) ) echo ' - ' . __( 'Super Admin' ); ?> -
- ' . __( 'Edit' ) . ''; - - if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { - $actions['delete'] = '' . __( 'Delete' ) . ''; - } - - /** - * Filter the action links displayed under each user - * in the Network Admin Users list table. - * - * @since 3.2.0 - * - * @param array $actions An array of action links to be displayed. - * Default 'Edit', 'Delete'. - * @param WP_User $user WP_User object. - */ - $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); - echo $this->row_actions( $actions ); - ?> - - $user->first_name $user->last_name"; - break; - - case 'email': - echo "$user->user_email"; - break; - - case 'registered': - if ( 'list' == $mode ) - $date = __( 'Y/m/d' ); - else - $date = __( 'Y/m/d g:i:s a' ); - - echo "" . mysql2date( $date, $user->user_registered ) . ""; - break; - - case 'blogs': - $blogs = get_blogs_of_user( $user->ID, true ); - echo ""; + first_name $user->last_name"; + break; + + case 'email': + echo "$user->user_email"; + break; + + case 'registered': + if ( 'list' == $mode ) + $date = __( 'Y/m/d' ); + else + $date = __( 'Y/m/d g:i:s a' ); + + echo mysql2date( $date, $user->user_registered ); + break; + + case 'blogs': + $blogs = get_blogs_of_user( $user->ID, true ); if ( is_array( $blogs ) ) { foreach ( (array) $blogs as $key => $val ) { @@ -306,15 +291,14 @@ } } - ?> - - "; - /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */ - echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); - echo ""; - break; + break; + + default: + /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */ + echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID ); + break; + } + + echo $this->handle_row_actions( $user, $column_name, $primary ); + echo ''; } endforeach @@ -324,3 +308,54 @@ } } + + /** + * Get name of default primary column + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'username'; + } + + /** + * Generate and display row actions links + * + * @since 4.3.0 + * @access protected + * + * @param object $user User being acted upon + * @param string $column_name Current column name + * @param string $primary Primary column name + * + * @return string + */ + protected function handle_row_actions( $user, $column_name, $primary ) { + $super_admins = get_super_admins(); + $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) ); + + if ( $primary === $column_name ) { + $actions = array(); + $actions['edit'] = '' . __( 'Edit' ) . ''; + + if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) { + $actions['delete'] = '' . __( 'Delete' ) . ''; + } + + /** + * Filter the action links displayed under each user + * in the Network Admin Users list table. + * + * @since 3.2.0 + * + * @param array $actions An array of action links to be displayed. + * Default 'Edit', 'Delete'. + * @param WP_User $user WP_User object. + */ + $actions = apply_filters( 'ms_user_row_actions', $actions, $user ); + return $this->row_actions( $actions ); + } + } } Index: /trunk/src/wp-admin/includes/class-wp-plugins-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (revision 32644) @@ -569,10 +569,13 @@ ); - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); + + $extra_class = ' has-row-actions column-primary'; foreach ( $columns as $column_name => $column_display_name ) { $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; + } switch ( $column_name ) { @@ -581,10 +584,19 @@ break; case 'name': - echo "$plugin_name"; - echo $this->row_actions( $actions, true ); + if ( $primary === $column_name || ! isset( $columns[ $primary ] ) ) { + echo "$plugin_name"; + echo $this->row_actions( $actions, true ); + } else { + echo "$plugin_name"; + } echo ""; break; case 'description': - echo " + $classes = 'column-description desc'; + if ( $primary === $column_name ) { + $classes .= " $extra_class"; + } + + echo "
$description
"; @@ -633,8 +645,16 @@ echo implode( ' | ', $plugin_meta ); + if ( $primary === $column_name ) { + echo $this->row_actions( $actions, true ); + } echo "
"; break; default: - echo ""; + $classes = "$column_name column-$column_name$class"; + if ( $primary === $column_name ) { + $classes .= " $extra_class"; + } + + echo ""; /** @@ -648,4 +668,8 @@ */ do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data ); + + if ( $primary === $column_name ) { + echo $this->row_actions( $actions, true ); + } echo ""; } @@ -683,3 +707,15 @@ do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status ); } + + /** + * Get name of default primary column for this specific list table. + * + * @since 4.3.0 + * @access protected + * + * @return string + */ + protected function get_default_primary_column_name() { + return 'plugin'; + } } Index: /trunk/src/wp-admin/includes/class-wp-posts-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-posts-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-posts-list-table.php (revision 32644) @@ -685,14 +685,18 @@ get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } $style = ''; - if ( in_array( $column_name, $hidden ) ) + if ( in_array( $column_name, $hidden ) ) { $style = ' style="display:none;"'; - - $attributes = "$class$style"; + } + + $attributes = "class='$classes'$style"; switch ( $column_name ) { @@ -716,5 +720,6 @@ case 'title': - $attributes = 'class="post-title page-title column-title"' . $style; + $classes .= ' page-title'; // Special addition for title column + $attributes = "class='$classes'$style"; if ( $this->hierarchical_display ) { if ( 0 == $level && (int) $post->post_parent > 0 ) { @@ -773,63 +778,5 @@ the_excerpt(); - $actions = array(); - if ( $can_edit_post && 'trash' != $post->post_status ) { - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; - } - if ( current_user_can( 'delete_post', $post->ID ) ) { - if ( 'trash' == $post->post_status ) - $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; - elseif ( EMPTY_TRASH_DAYS ) - $actions['trash'] = "" . __( 'Trash' ) . ""; - if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) - $actions['delete'] = "" . __( 'Delete Permanently' ) . ""; - } - if ( $post_type_object->public ) { - if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) { - if ( $can_edit_post ) { - $preview_link = set_url_scheme( get_permalink( $post->ID ) ); - /** This filter is documented in wp-admin/includes/meta-boxes.php */ - $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ); - $actions['view'] = '' . __( 'Preview' ) . ''; - } - } elseif ( 'trash' != $post->post_status ) { - $actions['view'] = '' . __( 'View' ) . ''; - } - } - - if ( is_post_type_hierarchical( $post->post_type ) ) { - - /** - * Filter the array of row action links on the Pages list table. - * - * The filter is evaluated only for hierarchical post types. - * - * @since 2.8.0 - * - * @param array $actions An array of row action links. Defaults are - * 'Edit', 'Quick Edit', 'Restore, 'Trash', - * 'Delete Permanently', 'Preview', and 'View'. - * @param WP_Post $post The post object. - */ - $actions = apply_filters( 'page_row_actions', $actions, $post ); - } else { - - /** - * Filter the array of row action links on the Posts list table. - * - * The filter is evaluated only for non-hierarchical post types. - * - * @since 2.8.0 - * - * @param array $actions An array of row action links. Defaults are - * 'Edit', 'Quick Edit', 'Restore, 'Trash', - * 'Delete Permanently', 'Preview', and 'View'. - * @param WP_Post $post The post object. - */ - $actions = apply_filters( 'post_row_actions', $actions, $post ); - } - - echo $this->row_actions( $actions ); + echo $this->handle_row_actions( $post, $column_name, $primary ); get_inline_data( $post ); @@ -888,4 +835,5 @@ _e( 'Last Modified' ); } + echo $this->handle_row_actions( $post, $column_name, $primary ); echo ''; break; @@ -899,5 +847,5 @@ $this->comments_bubble( $post->ID, $pending_comments ); ?> - + handle_row_actions( $post, $column_name, $primary ); ?> handle_row_actions( $post, $column_name, $primary ); ?> handle_row_actions( $post, $column_name, $primary ); echo ''; break; @@ -996,4 +946,5 @@ */ do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID ); + echo $this->handle_row_actions( $post, $column_name, $primary ); ?> post_type ); + $can_edit_post = current_user_can( 'edit_post', $post->ID ); + $actions = array(); + + if ( $can_edit_post && 'trash' != $post->post_status ) { + $actions['edit'] = '' . __( 'Edit' ) . ''; + $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; + } + + if ( current_user_can( 'delete_post', $post->ID ) ) { + if ( 'trash' == $post->post_status ) + $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; + elseif ( EMPTY_TRASH_DAYS ) + $actions['trash'] = "" . __( 'Trash' ) . ""; + if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) + $actions['delete'] = "" . __( 'Delete Permanently' ) . ""; + } + + if ( $post_type_object->public ) { + if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) { + if ( $can_edit_post ) { + $preview_link = set_url_scheme( get_permalink( $post->ID ) ); + /** This filter is documented in wp-admin/includes/meta-boxes.php */ + $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ); + $actions['view'] = '' . __( 'Preview' ) . ''; + } + } elseif ( 'trash' != $post->post_status ) { + $actions['view'] = '' . __( 'View' ) . ''; + } + } + + if ( is_post_type_hierarchical( $post->post_type ) ) { + + /** + * Filter the array of row action links on the Pages list table. + * + * The filter is evaluated only for hierarchical post types. + * + * @since 2.8.0 + * + * @param array $actions An array of row action links. Defaults are + * 'Edit', 'Quick Edit', 'Restore, 'Trash', + * 'Delete Permanently', 'Preview', and 'View'. + * @param WP_Post $post The post object. + */ + $actions = apply_filters( 'page_row_actions', $actions, $post ); + } else { + + /** + * Filter the array of row action links on the Posts list table. + * + * The filter is evaluated only for non-hierarchical post types. + * + * @since 2.8.0 + * + * @param array $actions An array of row action links. Defaults are + * 'Edit', 'Quick Edit', 'Restore, 'Trash', + * 'Delete Permanently', 'Preview', and 'View'. + * @param WP_Post $post The post object. + */ + $actions = apply_filters( 'post_row_actions', $actions, $post ); + } + + return $this->row_actions( $actions ); + } } Index: /trunk/src/wp-admin/includes/class-wp-terms-list-table.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-terms-list-table.php (revision 32643) +++ /trunk/src/wp-admin/includes/class-wp-terms-list-table.php (revision 32644) @@ -308,7 +308,4 @@ public function column_name( $tag ) { $taxonomy = $this->screen->taxonomy; - $tax = get_taxonomy( $taxonomy ); - - $default_term = get_option( 'default_' . $taxonomy ); $pad = str_repeat( '— ', max( 0, $this->level ) ); @@ -334,40 +331,4 @@ $out = '' . $name . '
'; - $actions = array(); - if ( current_user_can( $tax->cap->edit_terms ) ) { - $actions['edit'] = '' . __( 'Edit' ) . ''; - $actions['inline hide-if-no-js'] = '' . __( 'Quick Edit' ) . ''; - } - if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) - $actions['delete'] = "term_id ) . "'>" . __( 'Delete' ) . ""; - if ( $tax->public ) - $actions['view'] = '' . __( 'View' ) . ''; - - /** - * Filter the action links displayed for each term in the Tags list table. - * - * @since 2.8.0 - * @deprecated 3.0.0 Use {$taxonomy}_row_actions instead. - * - * @param array $actions An array of action links to be displayed. Default - * 'Edit', 'Quick Edit', 'Delete', and 'View'. - * @param object $tag Term object. - */ - $actions = apply_filters( 'tag_row_actions', $actions, $tag ); - - /** - * Filter the action links displayed for each term in the terms list table. - * - * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug. - * - * @since 3.0.0 - * - * @param array $actions An array of action links to be displayed. Default - * 'Edit', 'Quick Edit', 'Delete', and 'View'. - * @param object $tag Term object. - */ - $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag ); - - $out .= $this->row_actions( $actions ); $out .= '