Index: wp-admin/css/common.css =================================================================== --- wp-admin/css/common.css (revision 32958) +++ wp-admin/css/common.css (working copy) @@ -583,6 +583,7 @@ .wrap h1, .wrap h2 { + display: inline-block; font-size: 23px; font-weight: 400; padding: 9px 15px 4px 0; Index: wp-admin/css/themes.css =================================================================== --- wp-admin/css/themes.css (revision 32958) +++ wp-admin/css/themes.css (working copy) @@ -13,7 +13,7 @@ } .themes-php .wrap h1 { - float: left; + display: inline-block; margin-bottom: 15px; } Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 32958) +++ wp-admin/edit-comments.php (working copy) @@ -140,22 +140,23 @@ ?>
-

%s', - get_edit_post_link( $post_id ), - wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) - ) - ); -else - _e( 'Comments' ); - -if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) - echo '' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> -

- +
+

%s', + get_edit_post_link( $post_id ), + wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) + ) + ); + else + _e( 'Comments' );?> +

+
' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . ''; ?> +
-

cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -?>

+
+

+ cap->create_posts ) ) + echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + ?> +
+

Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 32958) +++ wp-admin/edit.php (working copy) @@ -283,13 +283,15 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

labels->name ); -if ( current_user_can( $post_type_object->cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; -if ( ! empty( $_REQUEST['s'] ) ) - printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); -?>

+
+

labels->name );?>

+ cap->create_posts ) ) + echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + if ( ! empty( $_REQUEST['s'] ) ) + printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); + ?> +
-

- - - - - %2$s', - esc_url( add_query_arg( - array( - array( 'autofocus' => array( 'panel' => 'menus' ) ), - 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) - ), - admin_url( 'customize.php' ) - ) ), - __( 'Manage in Customizer' ) - ); - } - ?> -

+
+

+ + + + + %2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'menus' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } + ?> +

+
-

- +

+ ' . $text . ''; } - echo ' ' . $text . ''; - } - ?> - + ?> +
-

- +
+

+ + +
' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> -

+ (' . $file_show . ')'; ?>
-

+
+

+
Index: wp-admin/theme-install.php =================================================================== --- wp-admin/theme-install.php (revision 32958) +++ wp-admin/theme-install.php (working copy) @@ -102,26 +102,27 @@ ?>
-

+

+ __( 'Upload Theme' ) ) ); + if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { + echo ' ' . __( 'Upload Theme' ) . ''; + echo ' ' . _x( 'Browse', 'themes' ) . ''; + } + ?> +
- /** - * Filter the tabs shown on the Add Themes screen. - * - * This filter is for backwards compatibility only, for the suppression - * of the upload tab. - * - * @since 2.8.0 - * - * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'. - */ - $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) ); - if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { - echo ' ' . __( 'Upload Theme' ) . ''; - echo ' ' . _x( 'Browse', 'themes' ) . ''; - } - ?> -
Index: wp-admin/themes.php =================================================================== --- wp-admin/themes.php (revision 32958) +++ wp-admin/themes.php (working copy) @@ -124,83 +124,84 @@ ?>
-

- - - - -

- -

- -

Visit site' ), home_url( '/' ) ); ?>

- -

Visit site' ), home_url( '/' ) ); ?>

-

- -

- +

+ + + + -$ct = wp_get_theme(); + +

+ +

Visit site' ), home_url( '/' ) ); ?>

+ +

Visit site' ), home_url( '/' ) ); ?>

+

+ +

+ errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { - echo '

' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '

'; -} + $ct = wp_get_theme(); -/* -// Certain error codes are less fatal than others. We can still display theme information in most cases. -if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) - && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?> -*/ + if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { + echo '

' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '

'; + } - // Pretend you didn't see this. - $current_theme_actions = array(); - if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) { - foreach ( (array) $submenu['themes.php'] as $item) { - $class = ''; - if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) - continue; - // 0 = name, 1 = capability, 2 = file - if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) - $class = ' current'; - if ( !empty($submenu[$item[2]]) ) { - $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. - $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); - if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) - $current_theme_actions[] = "{$item[0]}"; - else - $current_theme_actions[] = "{$item[0]}"; - } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { - $menu_file = $item[2]; + /* + // Certain error codes are less fatal than others. We can still display theme information in most cases. + if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) + && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?> + */ - if ( current_user_can( 'customize' ) ) { - if ( 'custom-header' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; - } elseif ( 'custom-background' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; + // Pretend you didn't see this. + $current_theme_actions = array(); + if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) { + foreach ( (array) $submenu['themes.php'] as $item) { + $class = ''; + if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) + continue; + // 0 = name, 1 = capability, 2 = file + if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) + $class = ' current'; + if ( !empty($submenu[$item[2]]) ) { + $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. + $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); + if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) + $current_theme_actions[] = "{$item[0]}"; + else + $current_theme_actions[] = "{$item[0]}"; + } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { + $menu_file = $item[2]; + + if ( current_user_can( 'customize' ) ) { + if ( 'custom-header' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } elseif ( 'custom-background' === $menu_file ) { + $current_theme_actions[] = "{$item[0]}"; + } } - } - if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) { - $menu_file = substr( $menu_file, 0, $pos ); - } + if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) { + $menu_file = substr( $menu_file, 0, $pos ); + } - if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { - $current_theme_actions[] = "{$item[0]}"; - } else { - $current_theme_actions[] = "{$item[0]}"; + if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { + $current_theme_actions[] = "{$item[0]}"; + } else { + $current_theme_actions[] = "{$item[0]}"; + } } } } - } -?> - + ?> +
Index: wp-admin/upload.php =================================================================== --- wp-admin/upload.php (revision 32958) +++ wp-admin/upload.php (working copy) @@ -71,14 +71,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

- - -

+
+

+ + +

Switch to the list view.' ); ?>

Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 32958) +++ wp-admin/users.php (working copy) @@ -443,18 +443,19 @@ } ?>
-

- - - - - +

+ + + + + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> - + if ( $usersearch ) + printf( '' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); + ?> +
views(); ?> Index: wp-admin/widgets.php =================================================================== --- wp-admin/widgets.php (revision 32958) +++ wp-admin/widgets.php (working copy) @@ -315,24 +315,24 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-%2$s', - esc_url( add_query_arg( - array( - array( 'autofocus' => array( 'panel' => 'widgets' ) ), - 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) - ), - admin_url( 'customize.php' ) - ) ), - __( 'Manage in Customizer' ) - ); - } -?> -

+
+

+ %2$s', + esc_url( add_query_arg( + array( + array( 'autofocus' => array( 'panel' => 'widgets' ) ), + 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) + ), + admin_url( 'customize.php' ) + ) ), + __( 'Manage in Customizer' ) + ); + } + ?> +