Changeset 9219 for trunk/wp-admin/includes/dashboard.php

Timestamp:

10/16/2008 10:35:53 PM (17 years ago)

Author:

ryan

Message:

Dashboard updates from mdawaffe. see #7552

File:

• trunk/wp-admin/includes/dashboard.php (modified) (9 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -29 +29 @@
 
     // 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
@@ -185 +185 @@
         </div>
 
-        <h4><label for="quickpress-content"><?php _e('Post') ?></label></h4>
+        <div id="add-media-button" class="alignright">
+            <a class="thickbox button" href="http://hacek.local/wordpress/wp-admin/media-upload.php?TB_iframe=true" id="add-media-link"><?php _e( 'Insert Media' ); ?></a>
+        </div>
+
+        <h4 id="content-label"><label for="content"><?php _e('Post') ?></label></h4>
         <div class="textarea-wrap">
-            <textarea name="content" id="quickpress-content" class="mceEditor" rows="3" cols="15"><?php echo $post->post_content; ?></textarea>
+            <textarea name="content" id="content" class="mceEditor" rows="3" cols="15"><?php echo $post->post_content; ?></textarea>
         </div>
 
@@ -316 +320 @@
         $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>';
         $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
-        $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
+        $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>';
+        $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
 
         $actions = apply_filters( 'comment_row_actions', $actions, $comment );
@@ -327 +332 @@
 
             // 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 .= "<span class='$action'>$sep$link</span>";
@@ -362 +369 @@
             <blockquote><p><?php comment_excerpt(); ?></p></blockquote>
             <p class="comment-actions"><?php echo $actions_string; ?></p>
+
+            <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
+                <textarea class="comment"><?php echo $comment->comment_content; ?></textarea>
+                <div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
+                <div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
+                <div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
+                <div class="comment_status"><?php echo $comment->comment_approved; ?></div>
+            </div>
+
         </div>
 <?php
@@ -455 +471 @@
 function wp_dashboard_rss_output( $widget_id ) {
     $widgets = get_option( 'dashboard_widget_options' );
+    echo "<div class='rss-widget'>";
     wp_widget_rss_output( $widgets[$widget_id] );
+    echo "</div>";
 }
 
@@ -463 +481 @@
 
 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' );
 }
 
@@ -477 +495 @@
     @extract( @$widgets['dashboard_secondary'], EXTR_SKIP );
     $rss = @fetch_rss( $url );
+
     if ( !isset($rss->items) || 0 == count($rss->items) )
         return false;
 
-    echo "<ul id='planetnews'>\n";
-
     $rss->items = array_slice($rss->items, 0, $items);
-    foreach ($rss->items as $item ) {
-        $title = wp_specialchars($item['title']);
-        list($author,$post) = explode( ':', $title, 2 );
-        $link = clean_url($item['link']);
-
-        echo "\t<li><a href='$link'><span class='post'>$post</span><span class='hidden'> - </span><cite>$author</cite></a></li>\n";
-    }
-
-    echo "</ul>\n<br class='clear' />\n";
+
+    if ( 'http://planet.wordpress.org/' == $rss->channel['link'] ) {
+        foreach ( array_keys($rss->items) as $i ) {
+            list($site, $description) = explode( ':', wp_specialchars($rss->items[$i]['title']), 2 );
+            $rss->items[$i]['dc']['creator'] = trim($site);
+            $rss->items[$i]['title'] = trim($description);
+        }
+    }
+
+    echo "<div class='rss-widget'>";
+    wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
+    echo "</div>";
 }
 
@@ -605 +625 @@
 
 /* Dashboard Widgets Controls */
-
-// Temp
-function wp_dashboard_empty_control() {
-    echo "This feature isn't enabled in this prototype.";
-}
 
 // Calls widget_control callback