Index: src/wp-admin/includes/post.php
===================================================================
--- src/wp-admin/includes/post.php	(revision 25017)
+++ src/wp-admin/includes/post.php	(working copy)
@@ -1097,7 +1097,11 @@
 		}
 	}
 
-	$post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
+	$post_name_html = '<span id="editable-post-name" title="' . $title . '">';
+	$post_name_html .= '<span class="hide-if-no-js">' . $post_name_abridged . '</span>';
+	$post_name_html .= '<input class="hide-if-js" name="post_name" type="text" id="post_name" value="' . $post_name . '" />';
+	$post_name_html .= '</span>';
+
 	$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
 	$view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
 	$return =  '<strong>' . __('Permalink:') . "</strong>\n";
Index: src/wp-admin/includes/meta-boxes.php
===================================================================
--- src/wp-admin/includes/meta-boxes.php	(revision 25017)
+++ src/wp-admin/includes/meta-boxes.php	(working copy)
@@ -581,19 +581,6 @@
 }
 
 /**
- * Display slug form fields.
- *
- * @since 2.6.0
- *
- * @param object $post
- */
-function post_slug_meta_box($post) {
-?>
-<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( apply_filters('editable_slug', $post->post_name) ); ?>" />
-<?php
-}
-
-/**
  * Display form field with list of authors.
  *
  * @since 2.6.0
Index: src/wp-admin/includes/screen.php
===================================================================
--- src/wp-admin/includes/screen.php	(revision 25017)
+++ src/wp-admin/includes/screen.php	(working copy)
@@ -95,11 +95,8 @@
 	// Hide slug boxes by default
 	if ( $use_defaults ) {
 		$hidden = array();
-		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-			else
-				$hidden = array( 'slugdiv' );
+		if ( 'post' == $screen->base && in_array( $screen->post_type, array( 'post', 'page', 'attachment' ) ) ) {
+			$hidden = array( 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv' );
 		}
 		$hidden = apply_filters( 'default_hidden_meta_boxes', $hidden, $screen );
 	}
Index: src/wp-admin/js/post.js
===================================================================
--- src/wp-admin/js/post.js	(revision 25017)
+++ src/wp-admin/js/post.js	(working copy)
@@ -682,7 +682,7 @@
 	// permalink
 	if ( $('#edit-slug-box').length ) {
 		editPermalink = function(post_id) {
-			var i, c = 0, e = $('#editable-post-name'), revert_e = e.html(), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html();
+			var e = $('#editable-post-name'), revert_e = e.html(), b = $('#edit-slug-buttons'), revert_b = b.html();
 
 			$('#view-post-btn').hide();
 			b.html('<a href="#" class="save button button-small">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
@@ -706,7 +706,6 @@
 						});
 					}
 					b.html(revert_b);
-					real_slug.val(new_slug);
 					makeSlugeditClickable();
 					$('#view-post-btn').show();
 				});
@@ -717,17 +716,11 @@
 				$('#view-post-btn').show();
 				e.html(revert_e);
 				b.html(revert_b);
-				real_slug.val(revert_slug);
 				return false;
 			});
 
-			for ( i = 0; i < full.length; ++i ) {
-				if ( '%' == full.charAt(i) )
-					c++;
-			}
-
-			slug_value = ( c > full.length / 4 ) ? '' : full;
-			e.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children('input').keypress(function(e) {
+			$('span', e).hide();
+			$('input', e).show().keypress(function(e) {
 				var key = e.keyCode || 0;
 				// on enter, just save the new slug, don't save the post
 				if ( 13 == key ) {
@@ -738,8 +731,6 @@
 					b.children('.cancel').click();
 					return false;
 				}
-			}).keyup(function(e) {
-				real_slug.val(this.value);
 			}).focus();
 		}
 
Index: src/wp-admin/edit-form-advanced.php
===================================================================
--- src/wp-admin/edit-form-advanced.php	(revision 25017)
+++ src/wp-admin/edit-form-advanced.php	(working copy)
@@ -181,9 +181,6 @@
 if ( ( 'publish' == get_post_status( $post ) || 'private' == get_post_status( $post ) ) && post_type_supports($post_type, 'comments') )
 	add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
-	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
-
 if ( post_type_supports($post_type, 'author') ) {
 	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
 		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
@@ -369,12 +366,12 @@
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 $shortlink = wp_get_shortlink($post->ID, 'post');
 if ( !empty($shortlink) )
-    $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small hide-if-no-js" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
 
 if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
 	$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
 ?>
-	<div id="edit-slug-box" class="hide-if-no-js">
+	<div id="edit-slug-box">
 	<?php
 		if ( $has_sample_permalink )
 			echo $sample_permalink_html;