diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 8375ea890..ec221dd66 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -108,6 +108,20 @@ div.postbox div.inside { 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 @@ div.postbox div.inside { 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; diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 0515622ae..2de4493a5 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -28,7 +28,7 @@ function wp_dashboard_setup() { 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 @@ function wp_dashboard_quick_press( $dashboard, $meta_box ) { -

+
+ +
+ +

- +

@@ -315,7 +319,8 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $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 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { ( ( ('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 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {

+ + + "; wp_widget_rss_output( $widgets[$widget_id] ); + echo ""; } function wp_dashboard_secondary() { @@ -462,7 +480,7 @@ function wp_dashboard_secondary() { } 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 @@ function wp_dashboard_secondary_output() { $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 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar /* 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. diff --git a/wp-admin/index.php b/wp-admin/index.php index 941953391..2fee73403 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -16,6 +16,7 @@ wp_dashboard_setup(); 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(); diff --git a/wp-admin/js/dashboard.js b/wp-admin/js/dashboard.js index 89990f5de..5156e3ab8 100644 --- a/wp-admin/js/dashboard.js +++ b/wp-admin/js/dashboard.js @@ -1,3 +1,5 @@ +var edCanvas; + jQuery( function($) { // close postboxes that should be closed @@ -42,6 +44,8 @@ var quickPressLoad = function() { } ); $('#publish').click( function() { act.val( 'post-quickpress-publish' ); } ); + + edCanvas = jQuery('#content'); }; quickPressLoad(); diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index b06e066cf..6e6ac7dbe 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -89,6 +89,8 @@ commentReply = { 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(); }); diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js index cceeb22d3..949378a45 100644 --- a/wp-admin/js/media-upload.js +++ b/wp-admin/js/media-upload.js @@ -9,8 +9,11 @@ function send_to_editor(h) { 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(); } diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 9b929fbad..f4d731cc5 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -1581,11 +1581,13 @@ function wp_widget_rss_output( $rss, $args = array() ) { 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 = '';