Index: wp-includes/default-widgets.php
===================================================================
--- wp-includes/default-widgets.php (revision 26014)
+++ wp-includes/default-widgets.php (working copy)
@@ -904,7 +904,7 @@
if ( $link == '' ) {
echo "
$title{$date}{$summary}{$author}";
} else {
- echo "{$date}{$summary}{$author}";
+ echo "{$summary}{$author}";
}
}
echo '';
Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php (revision 26014)
+++ wp-admin/includes/ajax-actions.php (working copy)
@@ -234,18 +234,9 @@
require_once ABSPATH . 'wp-admin/includes/dashboard.php';
switch ( $_GET['widget'] ) {
- case 'dashboard_incoming_links' :
- wp_dashboard_incoming_links();
+ case 'dashboard_rss' :
+ wp_dashboard_rss();
break;
- case 'dashboard_primary' :
- wp_dashboard_primary();
- break;
- case 'dashboard_secondary' :
- wp_dashboard_secondary();
- break;
- case 'dashboard_plugins' :
- wp_dashboard_plugins();
- break;
}
wp_die();
}
Index: wp-admin/includes/dashboard.php
===================================================================
--- wp-admin/includes/dashboard.php (revision 26014)
+++ wp-admin/includes/dashboard.php (working copy)
@@ -6,6 +6,18 @@
* @subpackage Administration
*/
+/* Temporary hack until MP6 is in core
+ * MP6 currently unenqueues wp-admin/css/wp-admin.css
+ * After MP6 merges:
+ * - add the styles in temporary-dash-styles.css to wp-admin.css
+ * - add the styles in temporary-dash-styles-rtl.css to wp-admin-rtl.css
+ * - and DELETE THIS FUNCTION,
+ */
+function temporary_dash_styles() {
+ wp_add_inline_style( 'wp-admin', file_get_contents( ABSPATH . 'wp-admin/css/temporary-dash-styles.css' ) );
+}
+add_action( 'admin_enqueue_scripts', 'temporary_dash_styles' );
+
/**
* Registers dashboard widgets.
*
@@ -37,81 +49,21 @@
// Right Now
if ( is_blog_admin() && current_user_can('edit_posts') )
- wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' );
+ add_meta_box( 'dash-right-now', 'Site Content', 'dashboard_new_right_now', 'dashboard', 'normal', 'high' );
if ( is_network_admin() )
wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
- // Recent Comments Widget
- if ( is_blog_admin() && current_user_can('moderate_comments') ) {
- if ( !isset( $widget_options['dashboard_recent_comments'] ) || !isset( $widget_options['dashboard_recent_comments']['items'] ) ) {
- $update = true;
- $widget_options['dashboard_recent_comments'] = array(
- 'items' => 5,
- );
- }
- $recent_comments_title = __( 'Recent Comments' );
- wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments', 'wp_dashboard_recent_comments_control' );
- }
+ // Activity Widget
+ add_meta_box( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_activity', 'dashboard', 'normal', 'high' );
- // Incoming Links Widget
- if ( is_blog_admin() && current_user_can('publish_posts') ) {
- if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
- $update = true;
- $num_items = isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10;
- $widget_options['dashboard_incoming_links'] = array(
- 'home' => get_option('home'),
- 'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?scoring=d&ie=utf-8&num=' . $num_items . '&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'items' => $num_items,
- 'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
- );
- }
- wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
- }
-
- // WP Plugins Widget
- if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) )
- wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
-
// QuickPress Widget
- if ( is_blog_admin() && current_user_can('edit_posts') )
- wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
+ if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+ add_meta_box( 'dashboard_quick_draft', __( 'Quick Draft' ), 'wp_dashboard_quick_draft', 'dashboard', 'side', 'high' );
+
+ // WordPress News
+ add_meta_box( 'dashboard_rss', __( 'WordPress News' ), 'wp_dashboard_rss', 'dashboard', 'side', 'low' );
- // Recent Drafts
- if ( is_blog_admin() && current_user_can('edit_posts') )
- wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
-
- // Primary feed (Dev Blog) Widget
- if ( !isset( $widget_options['dashboard_primary'] ) ) {
- $update = true;
- $widget_options['dashboard_primary'] = array(
- 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
- 'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
- 'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
- 'items' => 2,
- 'show_summary' => 1,
- 'show_author' => 0,
- 'show_date' => 1,
- );
- }
- wp_add_dashboard_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_primary', 'wp_dashboard_primary_control' );
-
- // Secondary Feed (Planet) Widget
- if ( !isset( $widget_options['dashboard_secondary'] ) ) {
- $update = true;
- $widget_options['dashboard_secondary'] = array(
- 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
- 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
- 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
- 'items' => 5,
- 'show_summary' => 0,
- 'show_author' => 0,
- 'show_date' => 0,
- );
- }
- wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' );
-
// Hook to register new widgets
// Filter widget order
if ( is_network_admin() ) {
@@ -165,9 +117,9 @@
}
if ( is_blog_admin () )
- $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
+ $side_widgets = array('dashboard_quick_draft');
else if (is_network_admin() )
- $side_widgets = array('dashboard_primary', 'dashboard_secondary');
+ $side_widgets = array();
else
$side_widgets = array();
@@ -224,191 +176,68 @@
/* Dashboard Widgets */
-function wp_dashboard_right_now() {
- global $wp_registered_sidebars;
-
- $num_posts = wp_count_posts( 'post' );
- $num_pages = wp_count_posts( 'page' );
-
- $num_cats = wp_count_terms('category');
-
- $num_tags = wp_count_terms('post_tag');
-
- $num_comm = wp_count_comments();
-
- echo "\n\t".'';
- echo "\n\t".'
' . __('Content') . '
'."\n\t".'
';
- echo "\n\t".'';
-
- // Posts
- $num = number_format_i18n( $num_posts->publish );
- $text = _n( 'Post', 'Posts', intval($num_posts->publish) );
- if ( current_user_can( 'edit_posts' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
- /* TODO: Show status breakdown on hover
- if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
- $post_type_texts[] = ''.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'';
- }
- if ( $can_edit_posts && !empty($num_posts->draft) ) {
- $post_type_texts[] = ''.sprintf( _n( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'';
- }
- if ( $can_edit_posts && !empty($num_posts->future) ) {
- $post_type_texts[] = ''.sprintf( _n( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'';
- }
- if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) {
- $pending_text = sprintf( _n( 'There is %2$s post pending your review.', 'There are %2$s posts pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) );
- } else {
- $pending_text = '';
- }
- */
-
- // Pages
- $num = number_format_i18n( $num_pages->publish );
- $text = _n( 'Page', 'Pages', $num_pages->publish );
- if ( current_user_can( 'edit_pages' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
-
- // Categories
- $num = number_format_i18n( $num_cats );
- $text = _n( 'Category', 'Categories', $num_cats );
- if ( current_user_can( 'manage_categories' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo '
';
-
- // Tags
- $num = number_format_i18n( $num_tags );
- $text = _n( 'Tag', 'Tags', $num_tags );
- if ( current_user_can( 'manage_categories' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
";
- do_action('right_now_content_table_end');
- echo "\n\t
\n\t
";
-
- echo "\n\t".'';
- echo "\n\t".'
' . __('Discussion') . '
'."\n\t".'
';
- echo "\n\t".'';
-
- // Total Comments
- $num = '' . number_format_i18n($num_comm->total_comments) . '';
- $text = _n( 'Comment', 'Comments', $num_comm->total_comments );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = '' . $num . '';
- $text = '' . $text . '';
- }
- echo '';
- echo '';
-
- echo '
';
-
- // Approved Comments
- $num = '' . number_format_i18n($num_comm->approved) . '';
- $text = _nx( 'Approved', 'Approved', $num_comm->approved, 'Right Now' );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
\n\t";
-
- // Pending Comments
- $num = '' . number_format_i18n($num_comm->moderated) . '';
- $text = _n( 'Pending', 'Pending', $num_comm->moderated );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
\n\t";
-
- // Spam Comments
- $num = number_format_i18n($num_comm->spam);
- $text = _nx( 'Spam', 'Spam', $num_comm->spam, 'comment' );
- if ( current_user_can( 'moderate_comments' ) ) {
- $num = "$num";
- $text = "$text";
- }
- echo '' . $num . ' | ';
- echo '' . $text . ' | ';
-
- echo "
";
- do_action('right_now_table_end');
- do_action('right_now_discussion_table_end');
- echo "\n\t
\n\t
";
-
- echo "\n\t".'';
+function dashboard_new_right_now() {
$theme = wp_get_theme();
-
- echo "\n\t
";
-
- if ( $theme->errors() ) {
- if ( ! is_multisite() || is_super_admin() )
- echo '' . sprintf( __( 'ERROR: %s' ), $theme->errors()->get_error_message() ) . '';
- } elseif ( ! empty($wp_registered_sidebars) ) {
- $sidebars_widgets = wp_get_sidebars_widgets();
- $num_widgets = 0;
- foreach ( (array) $sidebars_widgets as $k => $v ) {
- if ( 'wp_inactive_widgets' == $k || 'orphaned_widgets' == substr( $k, 0, 16 ) )
- continue;
- if ( is_array($v) )
- $num_widgets = $num_widgets + count($v);
+ if ( current_user_can( 'switch_themes' ) )
+ $theme_name = sprintf( '%1$s', $theme->display('Name') );
+ else
+ $theme_name = $theme->display('Name');
+?>
+
+
+ true ), 'objects' );
+ $post_types = (array) apply_filters( 'rightnow_post_types', $post_types );
+ foreach ( $post_types as $post_type => $post_type_obj ){
+ $num_posts = wp_count_posts( $post_type );
+ if ( $num_posts && $num_posts->publish ) {
+ printf(
+ '- %2$s %3$s
',
+ $post_type,
+ number_format_i18n( $num_posts->publish ),
+ $post_type_obj->label
+ );
}
- $num = number_format_i18n( $num_widgets );
-
- $switch_themes = $theme->display('Name');
- if ( current_user_can( 'switch_themes') )
- $switch_themes = '' . $switch_themes . '';
- if ( current_user_can( 'edit_theme_options' ) ) {
- printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num);
- } else {
- printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num);
+ }
+ // Comments
+ $num_comm = wp_count_comments();
+ if ( $num_comm && $num_comm->total_comments ) {
+ $text = _n( 'comment', 'comments', $num_comm->total_comments );
+ printf(
+ '',
+ number_format_i18n( $num_comm->total_comments ),
+ $text
+ );
+ if ( $num_comm->moderated ) {
+ $text = _n( 'in moderation', 'in moderation', $num_comm->total_comments );
+ printf(
+ '',
+ number_format_i18n( $num_comm->moderated ),
+ $text
+ );
}
- } else {
- if ( current_user_can( 'switch_themes' ) )
- printf( __('Theme %1$s'), $theme->display('Name') );
- else
- printf( __('Theme %1$s'), $theme->display('Name') );
}
- echo '';
+ do_action( 'rightnow_list_end' );
+ ?>
+
+
+
- // Check if search engines are asked not to index this site.
- if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ) {
- $title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') );
- $content = apply_filters('privacy_on_link_text', __('Search Engines Discouraged') );
-
- echo "
$content
";
- }
-
- update_right_now_message();
-
- echo "\n\t".'
';
+
+
+
+
+ ' . __( 'Post published. View post | Edit post' ) . '
', esc_url( $view ), $edit );
- else
- printf( '', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
- } else {
- printf( '', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
- $drafts_query = new WP_Query( array(
- 'post_type' => 'post',
- 'post_status' => 'draft',
- 'author' => $GLOBALS['current_user']->ID,
- 'posts_per_page' => 1,
- 'orderby' => 'modified',
- 'order' => 'DESC'
- ) );
-
- if ( $drafts_query->posts )
- $drafts =& $drafts_query->posts;
- }
- printf('' . __('You can also try %s, easy blogging from anywhere on the Web.') . '
', '' . __('Press This') . '' );
- $_REQUEST = array(); // hack for get_default_post_to_edit()
- }
-
/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
if ( $last_post_id ) {
$post = get_post( $last_post_id );
if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
- $post = get_default_post_to_edit('post', true);
+ $post = get_default_post_to_edit( 'post', true );
update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
} else {
$post->post_title = ''; // Remove the auto draft title
@@ -507,153 +317,97 @@
}
$post_ID = (int) $post->ID;
-
- $media_settings = array(
- 'id' => $post->ID,
- 'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
- );
-
- if ( current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' ) ) {
- $featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
- $media_settings['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
- }
+
+ do_action( 'dashboard_quickdraft_beginning', $post );
?>
-