Index: wp-includes/widgets.php =================================================================== --- wp-includes/widgets.php (revision 9216) +++ wp-includes/widgets.php (working copy) @@ -1581,11 +1581,13 @@ if ( empty($title) ) $title = __('Untitled'); $desc = ''; - $summary = ''; if ( isset( $item['description'] ) && is_string( $item['description'] ) ) - $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES)))); + $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES)))); elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) ) - $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES)))); + $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES)))); + if ( 360 < strlen( $desc ) ) + $desc = substr( $desc, 0, 360 ) . ' […]'; + $summary = $desc; if ( $show_summary ) { $desc = ''; Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 9216) +++ wp-includes/script-loader.php (working copy) @@ -155,7 +155,7 @@ 'good' => __('Medium'), 'strong' => __('Strong') ) ); - $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20081014' ); + $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20081007' . mt_rand() ); $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( 'pending' => __('%i% pending'), // must look like: "# blah blah" 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), @@ -196,7 +196,7 @@ 'edit' => __('Edit'), ) ); $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' ); - $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080723' ); + $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080723' . mt_rand() ); $scripts->localize( 'upload', 'uploadL10n', array( 'browseTitle' => attribute_escape(__('Browse your files')), 'back' => __('« Back'), @@ -273,7 +273,7 @@ $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20080925' ); - $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081008' ); + $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081008' . mt_rand() ); $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20070327' ); $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081013' ); @@ -321,7 +321,7 @@ $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081013' ); $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); - $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081008' ); + $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081008' . mt_rand() ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' ); @@ -435,4 +435,4 @@ add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); add_action( 'wp_default_styles', 'wp_default_styles' ); -add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 ); \ No newline at end of file +add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 ); Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 9216) +++ wp-admin/includes/dashboard.php (working copy) @@ -28,7 +28,7 @@ wp_add_dashboard_widget( 'dashboard_recent_comments', __( 'Recent Comments' ), 'wp_dashboard_recent_comments' ); // QuickPress Widget - wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press', 'wp_dashboard_empty_control' ); + wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' ); // Recent Drafts wp_add_dashboard_widget( 'dashboard_recent_drafts', __( 'Recent Drafts' ), 'wp_dashboard_recent_drafts' ); @@ -184,9 +184,13 @@ -

+
+ +
+ +

- +

@@ -315,7 +319,8 @@ $actions['edit'] = "". __('Edit') . ''; $actions['spam'] = "" . __( 'Spam' ) . ''; $actions['delete'] = "" . __('Delete') . ''; - $actions['reply'] = '' . __('Reply') . ''; + $actions['quickedit'] = '' . __('Quick Edit') . ''; + $actions['reply'] = '' . __('Reply') . ''; $actions = apply_filters( 'comment_row_actions', $actions, $comment ); @@ -326,8 +331,10 @@ ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; // Reply and quickedit need a hide-if-no-js span - if ( 'reply' == $action || 'quickedit' == $action ) + if ( 'reply' == $action ) $action .= ' hide-if-no-js'; + elseif ( 'quickedit' == $action ) + $action .= ' hide-if-no-js hide-if-js'; // hah $actions_string .= "$sep$link"; } @@ -361,6 +368,15 @@

+ + + "; wp_widget_rss_output( $widgets[$widget_id] ); + echo ""; } function wp_dashboard_secondary() { @@ -462,7 +480,7 @@ } function wp_dashboard_secondary_control() { - wp_dashboard_rss_control( 'dashboard_secondary', array( 'show_summary' => false, 'show_author' => false, 'show_date' => false ) ); + wp_dashboard_rss_control( 'dashboard_secondary' ); } /** @@ -476,21 +494,23 @@ $widgets = get_option( 'dashboard_widget_options' ); @extract( @$widgets['dashboard_secondary'], EXTR_SKIP ); $rss = @fetch_rss( $url ); + if ( !isset($rss->items) || 0 == count($rss->items) ) return false; - echo "\n
\n"; + echo "
"; + wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] ); + echo "
"; } function wp_dashboard_plugins() { @@ -605,11 +625,6 @@ /* Dashboard Widgets Controls */ -// Temp -function wp_dashboard_empty_control() { - echo "This feature isn't enabled in this prototype."; -} - // Calls widget_control callback /** * Calls widget control callback. Index: wp-admin/js/edit-comments.js =================================================================== --- wp-admin/js/edit-comments.js (revision 9216) +++ wp-admin/js/edit-comments.js (working copy) @@ -89,6 +89,8 @@ init : function() { this.rows = $('#the-comment-list tr'); + if ( !this.rows.size() ) + this.rows = $('#the-comment-list > div.comment-item'); var row = $('#replyrow'); $('a.cancel', row).click(function() { return commentReply.revert(); }); Index: wp-admin/js/dashboard.js =================================================================== --- wp-admin/js/dashboard.js (revision 9216) +++ wp-admin/js/dashboard.js (working copy) @@ -1,3 +1,5 @@ +var edCanvas; + jQuery( function($) { // close postboxes that should be closed @@ -42,6 +44,8 @@ } ); $('#publish').click( function() { act.val( 'post-quickpress-publish' ); } ); + + edCanvas = jQuery('#content'); }; quickPressLoad(); Index: wp-admin/js/media-upload.js =================================================================== --- wp-admin/js/media-upload.js (revision 9216) +++ wp-admin/js/media-upload.js (working copy) @@ -9,8 +9,11 @@ h = ed.plugins.wpeditimage._do_shcode(h); ed.execCommand('mceInsertContent', false, h); - } else + } else if ( jQuery.isFunction( 'edInsertContent' ) ) { edInsertContent(edCanvas, h); + } else { + jQuery( edCanvas ).val( jQuery( edCanvas ).val() + h ); + } tb_remove(); } Index: wp-admin/index.php =================================================================== --- wp-admin/index.php (revision 9216) +++ wp-admin/index.php (working copy) @@ -16,6 +16,7 @@ wp_enqueue_script( 'dashboard' ); wp_enqueue_script( 'plugin-install' ); +wp_enqueue_script( 'media-upload' ); wp_admin_css( 'dashboard' ); wp_admin_css( 'plugin-install' ); add_thickbox(); Index: wp-admin/css/dashboard.css =================================================================== --- wp-admin/css/dashboard.css (revision 9216) +++ wp-admin/css/dashboard.css (working copy) @@ -108,6 +108,20 @@ padding: 0; } +/* QuickPress */ + +#quick-press #add-media-button { + margin: .5em 0; +} + +#quick-press #content-label { + margin-top: 1em; +} + +#quick-press .textarea-wrap { + clear: both; +} + /* Recent Drafts */ #dashboard_recent_drafts ul { margin: 0; @@ -115,19 +129,37 @@ list-style: none; } -/* Primary Feed */ +/* Feeds */ -#dashboard_primary a.rsswidget, #dashboard_plugins h5 { +.rss-widget ul { + margin: 0; + padding: 0; + list-style: none; +} + +.rss-widget a.rsswidget { font-size: 14px; } -#dashboard_primary span.rss-date { +.rss-widget span.rss-date { font-size: 14px; } +.rss-widget cite { + display: block; + text-align: right; + margin: 0 0 1em; + padding: 0; +} + +.rss-widget cite:before { + content: '\2014'; +} + /* Plugins */ #dashboard_plugins h5 { + font-size: 14px; margin: 0; display: inline; line-height: 1.4em;