Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 96 deletions

diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index c6b709b..263783a 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -3,9 +3,13 @@ require_once('admin.php');
 $title = __('Create New Post');
 $parent_file = 'post-new.php';
 $editing = true;
-wp_enqueue_script('prototype');
-wp_enqueue_script('interface');
 wp_enqueue_script('autosave');
+wp_enqueue_script('post');
+if ( user_can_richedit() )
+	wp_enqueue_script('editor');
+wp_enqueue_script('thickbox');
+wp_enqueue_script('media-upload');
+
 require_once ('./admin-header.php');
 
 if ( ! current_user_can('edit_posts') ) { ?>
@@ -20,109 +24,18 @@ When you’re promoted, just reload this page and you’ll be able to bl
 	exit();
 }
 
-if ( isset($_GET['posted']) && $_GET['posted'] ) : ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Post saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post &raquo;'); ?></a></p></div>
+if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
+<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div>
 <?php
 endif;
 ?>
 
 
 <?php
-$my_drafts = get_users_drafts($user_ID);
-$pending = get_others_pending($user_ID);
-$others_drafts = get_others_drafts($user_ID);
-
-$nag_posts_limit = (int) apply_filters('nag_posts_limit', 3);
-
-$nag_posts = array(
-	array(
-		'my_drafts',
-		__('Your Drafts:'),
-		'edit.php?post_status=draft&amp;author=' . $user_ID,
-		count($my_drafts)),
-	array(
-		'pending',
-		__('Pending Review:'),
-		'edit.php?post_status=pending',
-		count($pending)),
-	array(
-		'others_drafts',
-		__('Others&#8217; Drafts:'),
-		'edit.php?post_status=draft&author=-' . $user_ID,
-		count($others_drafts))
-	);
-
-if ( !empty($my_drafts) || !empty($pending) || !empty($others_drafts) ) {
-	echo '<div class="wrap" id="draft-nag">';
-
-	foreach ( $nag_posts as $nag ) {
-		if ( ${$nag[0]} ) {
-			echo '<p><strong>' . wp_specialchars($nag[1]) . '</strong> ';
-			$i = 0;
-			foreach ( ${$nag[0]} as $post ) {
-				$i++;
-				if ( $i > $nag_posts_limit )
-					break;
-				echo '<a href="post.php?action=edit&amp;post=' . $post->ID . '">';
-				( '' == the_title('', '', FALSE) ) ? printf( __('Post #%s'), $post->ID ) : the_title();
-				echo '</a>';
-				if ( $i < min($nag[3], $nag_posts_limit) )
-					echo ', ';
-			}
-			if ( $nag[3] > $nag_posts_limit )
-				printf(__(', and <a href="%s">%d more</a>'), $nag[2], $nag[3] - $nag_posts_limit);
-			echo '.</p>';
-		}
-	}
-	echo "</div>\n";
-}
-?>
 
-
-<?php
 // Show post form.
 $post = get_default_post_to_edit();
 include('edit-form-advanced.php');
-?>
 
-<?php if ( $is_NS4 || $is_gecko || $is_winIE ) { ?>
-<div id="wp-bookmarklet" class="wrap">
-<h3><?php _e('WordPress Bookmarklet'); ?></h3>
-<p><?php _e('Right click on the following link and choose &#0147;Bookmark This Link...&#0148; or &#0147;Add to Favorites...&#0148; to create a posting shortcut.'); ?></p>
-<p>
-
-<?php
-if ($is_NS4 || $is_gecko) {
+include('admin-footer.php');
 ?>
-<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_option('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), get_bloginfo('name', 'display')); ?></a>
-<?php
-} else if ($is_winIE) {
-?>
-<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_option('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_bloginfo('name', 'display')); ?></a>
-<script type="text/javascript">
-<!--
-function oneclickbookmarklet(blah) {
-window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=500, height=450, location=0, menubar=0, resizable=0, scrollbars=1, status=1, titlebar=0, toolbar=0, screenX=120, left=120, screenY=120, top=120");
-}
-// -->
-</script>
-<br />
-<br />
-<?php _e('One-click bookmarklet:') ?><br />
-<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
-<?php
-} else if ($is_opera) {
-?>
-<a href="javascript:location.href='<?php echo get_option('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_option('blogname')); ?></a>
-<?php
-} else if ($is_macIE) {
-?>
-<a href="javascript:Q='';location.href='<?php echo get_option('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_option('blogname')); ?></a>
-<?php
-}
-?>
-</p>
-</div>
-<?php } ?>
-
-<?php include('admin-footer.php'); ?>