diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index a6be04a5f9..6c2c69280b 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -338,22 +338,18 @@ div.dashboard-widget-submit input:hover, } .tablenav .dots { - background-color: #e4f2fd; - border-color: #e4f2fd; + border-color: transparent; } .tablenav .next, .tablenav .prev { - background-color: #e4f2fd; - border-bottom-color: #2583ad; - border-color: #e4f2fd; + border-color: transparent; color: #2583ad; } .tablenav .next:hover, .tablenav .prev:hover { - border-bottom-color: #d54e21; - border-color: #e4f2fd; + border-color: transparent; color: #d54e21; } diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 67f0ee6279..e6e12d32e8 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -256,11 +256,16 @@ h6 { } .subsubsub a { - line-height: 200%; - padding: 3px; + line-height: 2; + padding: .2em; text-decoration: none; } +.subsubsub a .count, .subsubsub a.current .count { + color: #999; + font-weight: normal; +} + .subsubsub a.current { font-weight: bold; background: none; diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 091da30e8d..07c47e6bc0 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -120,26 +120,33 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), +//, number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") $stati = array( - 'moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "" . number_format_i18n($num_comments->moderated) . ""), - 'approved' => _c('Approved|plural'), - 'spam' => sprintf(__ngettext('Spam (%s)', 'Spam (%s)', number_format_i18n($num_comments->spam) ), "" . number_format_i18n($num_comments->spam) . "") + 'moderated' => __ngettext_noop('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)'), + 'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used + 'spam' => __ngettext_noop('Spam (%s)', 'Spam (%s)') ); $class = ( '' === $comment_status ) ? ' class="current"' : ''; -$status_links[] = "
  • ".__('Show All Comments').""; +$status_links[] = "
  • " . __( 'All' ) . ''; $type = ( !$comment_type && 'all' != $comment_type ) ? '' : "&comment_type=$comment_type"; foreach ( $stati as $status => $label ) { $class = ''; if ( $status == $comment_status ) $class = ' class="current"'; + if ( !isset( $num_comments->$status ) ) + $num_comments->$status = 10; - $status_links[] = "
  • $label"; + $status_links[] = "
  • " . sprintf( + __ngettext( $label[0], $label[1], $num_comments->$status ), + number_format_i18n( $num_comments->$status ) + ) . ''; } $status_links = apply_filters( 'comment_status_links', $status_links ); -echo implode(' |
    • ', $status_links) . ''; +echo implode( " |\n", $status_links) . ''; unset($status_links); ?> @@ -182,10 +189,14 @@ $page_links = paginate_links( array(
    -$page_links
    "; -?> + +
    ' . __( 'Displaying %s-%s of %s' ) . '' . __( '%s' ), + number_format_i18n( $start + 1 ), + number_format_i18n( min( $page * $comments_per_page, $total ) ), + number_format_i18n( $total ), + $page_links +); echo $page_links_text; ?>
    +
    @@ -230,7 +235,7 @@ if ($posts) {
    $page_links
    "; + echo "
    $page_links_text
    "; ?>
    @@ -300,4 +305,4 @@ endif; // posts;
    - \ No newline at end of file + diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 021c31359f..1715d05806 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -124,8 +124,11 @@ if ( (int) $_GET['locked'] ) { if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts( 'post', 'readable' ); +$total_posts = array_sum( (array) $num_posts ); $class = empty( $_GET['post_status'] ) ? ' class="current"' : ''; -$status_links[] = "
  • " . __('All Posts') . ''; +$status_links[] = "
  • " . sprintf( __ngettext( 'All (%s)', 'All (%s)', $total_posts ), number_format_i18n( $total_posts ) ) . ''; + + foreach ( $post_stati as $status => $label ) { $class = ''; @@ -137,10 +140,9 @@ foreach ( $post_stati as $status => $label ) { if ( isset($_GET['post_status']) && $status == $_GET['post_status'] ) $class = ' class="current"'; - $status_links[] = "
  • " . - sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . ''; + $status_links[] = "
  • " . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . ''; } -echo implode( ' |
    • ', $status_links ) . ''; +echo implode( " |\n", $status_links ) . ''; unset( $status_links ); endif; ?> @@ -223,7 +225,12 @@ do_action('restrict_manage_posts');
    -
    +
    ' . __( 'Displaying %s-%s of %s' ) . '' . __( '%s' ), + number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), + number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), + number_format_i18n( $wp_query->found_posts ), + $page_links +); echo $page_links_text; ?>
    @@ -242,7 +249,7 @@ do_action('restrict_manage_posts'); $page_links
    "; + echo "
    $page_links_text
    "; ?>
    diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index e032a2c832..584d5ce548 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -331,7 +331,7 @@ function wp_dashboard_quick_press() { - +

    diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index e6cc1a6e7e..d9ca48d94f 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -727,11 +727,11 @@ function wp_edit_posts_query( $q = false ) { $q['m'] = isset($q['m']) ? (int) $q['m'] : 0; $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0; $post_stati = array( // array( adj, noun ) - 'publish' => array(__('Published'), __('Published posts'), __ngettext_noop('Published (%s)', 'Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private (%s)', 'Private (%s)')), + 'publish' => array(__('Published'), __('Published posts'), __ngettext_noop('Published (%s)', 'Published (%s)')), + 'future' => array(__('Scheduled'), __('Scheduled posts'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), + 'pending' => array(__('Pending Review'), __('Pending posts'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), + 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), + 'private' => array(__('Private'), __('Private posts'), __ngettext_noop('Private (%s)', 'Private (%s)')), ); $post_stati = apply_filters('post_stati', $post_stati); @@ -794,9 +794,9 @@ function wp_edit_attachments_query( $q = false ) { $q['post_status'] = 'any'; $q['posts_per_page'] = 15; $post_mime_types = array( // array( adj, noun ) - 'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image (%s)', 'Images (%s)')), - 'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio (%s)', 'Audio (%s)')), - 'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video (%s)', 'Video (%s)')), + 'image' => array(__('Images'), __('Manage Images'), __ngettext_noop('Image (%s)', 'Images (%s)')), + 'audio' => array(__('Audio'), __('Manage Audio'), __ngettext_noop('Audio (%s)', 'Audio (%s)')), + 'video' => array(__('Video'), __('Manage Video'), __ngettext_noop('Video (%s)', 'Video (%s)')), ); $post_mime_types = apply_filters('post_mime_types', $post_mime_types); diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index d82775dca5..cca8bf6241 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -687,7 +687,7 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) { function wp_manage_posts_columns() { $posts_columns = array(); $posts_columns['cb'] = ''; - $posts_columns['title'] = __('Title'); + $posts_columns['title'] = __('Post'); $posts_columns['author'] = __('Author'); $posts_columns['categories'] = __('Categories'); $posts_columns['tags'] = __('Tags'); diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 4b663e7bb1..2fbc5532d6 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -665,6 +665,14 @@ class WP_User_Search { 'format' => 'userspage=%#%', 'add_args' => $args ) ); + if ( $this->paging_text ) { + $this->paging_text = sprintf( '' . __( 'Displaying %s-%s of %s' ) . '' . __( '%s' ), + number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ), + number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ), + number_format_i18n( $this->total_users_for_query ), + $this->paging_text + ); + } } } diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 09e8be0859..a116346adc 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -125,11 +125,12 @@ function theme_update_available( $theme ) {
    -
    -$page_links
    "; ?> -
    -
    -
    +
    ' . __( 'Displaying %s-%s of %s' ) . '' . __( '%s' ), + number_format_i18n( $start + 1 ), + number_format_i18n( min( $page * $per_page, $theme_total ) ), + number_format_i18n( $theme_total ), + $page_links +); echo $page_links_text; ?>
    @@ -199,7 +200,7 @@ foreach ( $cols as $col => $theme_name ) {
    -$page_links
    "; ?> +$page_links_text"; ?>
    diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 392a5c040a..dca34e1ded 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -185,13 +185,14 @@ if ( isset($message) ) { ?> $reals ) foreach ( $reals as $real ) $num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real]; $class = empty($_GET['post_mime_type']) && ! isset($_GET['detached']) ? ' class="current"' : ''; -$type_links[] = "
  • ".__('All Types').""; +$type_links[] = "
  • " . sprintf( __ngettext( 'All (%s)', 'All (%s)', $_total_posts ), number_format_i18n( $_total_posts ) ) . ''; foreach ( $post_mime_types as $mime_type => $label ) { $class = ''; @@ -201,13 +202,12 @@ foreach ( $post_mime_types as $mime_type => $label ) { if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) $class = ' class="current"'; - $type_links[] = "
  • " . - sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), number_format_i18n( $num_posts[$mime_type] )) . ''; + $type_links[] = "
  • " . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . ''; } $class = isset($_GET['detached']) ? ' class="current"' : ''; $type_links[] = '
  • ' . __('Unattached') . ''; -echo implode(' |
    • ', $type_links) . ''; +echo implode( " |\n", $type_links) . ''; unset($type_links); ?> @@ -235,9 +235,14 @@ $page_links = paginate_links( array( 'current' => $_GET['paged'] )); -if ( $page_links ) - echo "
    $page_links
    "; -?> +if ( $page_links ) : ?> +
    ' . __( 'Displaying %s-%s of %s' ) . '' . __( '%s' ), + number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), + number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), + number_format_i18n( $wp_query->found_posts ), + $page_links +); echo $page_links_text; ?>
    +