Changeset 26144 for trunk/src/wp-admin/index.php

Timestamp:

11/13/2013 10:08:47 PM (12 years ago)

Author:

nacin

Message:

Merge the new dashboard design into core.

Merges ​https://github.com/growthdesigner/wp-dash.

props lessbloat, joen, helen, dbernar1, kraftbj, ryelle, tillkruess, grapplerulrich, markjaquith.
see #25824.

File:

• trunk/src/wp-admin/index.php (modified) (5 diffs)

trunk/src/wp-admin/index.php

@@ -30 +30 @@
 $parent_file = 'index.php';
 
-if ( is_user_admin() )
-    add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
-else
-    add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
-
 $help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '</p>';
 
@@ -48 +43 @@
 // Help tabs
 
-$help  = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>';
-$help .= '<p>' . __('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
+$help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';
+$help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';
 
 $screen->add_help_tab( array(
     'id'      => 'help-navigation',
-    'title'   => __('Navigation'),
+    'title'   => __( 'Navigation' ),
     'content' => $help,
 ) );
 
-$help  = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>';
-$help .= '<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>';
-$help .= '<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>';
-$help .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some boxes have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
+$help  = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
+$help .= '<p>' . __( '<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
+$help .= '<p>' . __( '<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
+$help .= '<p>' . __( '<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some boxes have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';
 
 $screen->add_help_tab( array(
     'id'      => 'help-layout',
-    'title'   => __('Layout'),
+    'title'   => __( 'Layout' ),
     'content' => $help,
 ) );
 
-$help  = '<p>' . __('The boxes on your Dashboard screen are:') . '</p>';
+$help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
 if ( current_user_can( 'edit_posts' ) )
-    $help .= '<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>';
-if ( current_user_can( 'moderate_comments' ) )
-    $help .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
-if ( current_user_can( 'publish_posts' ) )
-    $help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-    $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
-    $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
-}
-$help .= '<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>';
-$help .= '<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>';
+    $help .= '<p>' . __( '<strong>Site Content</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
+$help .= '<p>' . __( '<strong>Activity</strong> - Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+    $help .= '<p>' . __( "<strong>Quick Draft</strong> - Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
 if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
-    $help .= '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
+    $help .= '<p>' . __( '<strong>WordPress News</strong> - Latest news from the official WordPress project, the <a href="http://planet.wordpress.org/">WordPress Planet</a>, and popular and recent plugins.' ) . '</p>';
+else
+    $help .= '<p>' . __( '<strong>WordPress News</strong> - Latest news from the official WordPress project, the <a href="http://planet.wordpress.org/">WordPress Planet</a>.' ) . '</p>';
 if ( current_user_can( 'edit_theme_options' ) )
-    $help .= '<p>' . __('<strong>Welcome</strong> - Shows links for some of the most common tasks when setting up a new site.') . '</p>';
+    $help .= '<p>' . __( '<strong>Welcome</strong> - Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
 
 $screen->add_help_tab( array(
     'id'      => 'help-content',
-    'title'   => __('Content'),
+    'title'   => __( 'Content' ),
     'content' => $help,
 ) );
@@ -100 +90 @@
 );
 
-include (ABSPATH . 'wp-admin/admin-header.php');
+include ( ABSPATH . 'wp-admin/admin-header.php' );
 
-$today = current_time('mysql', 1);
+$today = current_time( 'mysql', 1 );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+    <?php screen_icon(); ?>
+    <h2><?php echo esc_html( $title ); ?></h2>
 
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+    <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
     $classes = 'welcome-panel';
 
@@ -118 +108 @@
         $classes .= ' hidden'; ?>
 
-    <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
-        <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
+    <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
+        <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
         <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e( 'Dismiss' ); ?></a>
         <?php
@@ -133 +123 @@
         ?>
     </div>
-<?php endif; ?>
+    <?php endif; ?>
 
-<div id="dashboard-widgets-wrap">
-
-<?php wp_dashboard(); ?>
-
-<div class="clear"></div>
-</div><!-- dashboard-widgets-wrap -->
+    <div id="dashboard-widgets-wrap">
+    <?php wp_dashboard(); ?>
+    </div><!-- dashboard-widgets-wrap -->
 
 </div><!-- wrap -->
 
-<?php require(ABSPATH . 'wp-admin/admin-footer.php'); ?>
+<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>