Changeset 33155 for trunk/src/wp-admin/includes/class-wp-list-table.php

Timestamp:

07/10/2015 09:43:32 PM (9 years ago)

Author:

helen

Message:

List tables: Better accessibility and design for the comments bubble.

It is now plain text in the comments list table's "In Response To" column, where it was visually a bit confusing to have the bubble. For other list tables, it now shows a little notification bubble with the number of pending comments. The bubble and notification become plain text in the responsive list table view. It also shows no bubble when there are no comments at all, reducing some of the visual noise.

props picard102, afercia, karinchristen.
fixes #32152.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -615 +615 @@
      */
     protected function comments_bubble( $post_id, $pending_comments ) {
-        $pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
-
-        if ( $pending_comments )
-            echo '<strong>';
-
-        echo "<a href='" . esc_url( add_query_arg( 'p', $post_id, admin_url( 'edit-comments.php' ) ) ) . "' title='" . esc_attr( $pending_phrase ) . "' class='post-com-count'><span class='comment-count'>" . number_format_i18n( get_comments_number() ) . "</span></a>";
-
-        if ( $pending_comments )
-            echo '</strong>';
+        $approved_comments = get_comments_number();
+
+        $approved_comments_number = number_format_i18n( $approved_comments );
+        $pending_comments_number = number_format_i18n( $pending_comments );
+
+        $approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
+        $approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
+        $pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
+
+        // No comments at all.
+        if ( ! $approved_comments && ! $pending_comments ) {
+            printf( '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
+                __( 'No comments' )
+            );
+        // Approved comments have different display depending on some conditions.
+        } elseif ( $approved_comments ) {
+            printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+                esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+                $approved_comments_number,
+                $pending_comments ? $approved_phrase : $approved_only_phrase
+            );
+        } else {
+            printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+                $approved_comments_number,
+                $pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+            );
+        }
+
+        if ( $pending_comments ) {
+            printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+                esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+                $pending_comments_number,
+                $pending_phrase
+            );
+        }
     }