Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php (revision 21304)
+++ wp-admin/includes/post.php (working copy)
@@ -1091,11 +1091,11 @@
}
if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
+ if ( isset( $view_post ) )
+ $permalink = '' . $permalink . '';
$return = '' . __('Permalink:') . "\n" . '' . $permalink . "\n";
if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
$return .= '' . __('Change Permalinks') . "\n";
- if ( isset($view_post) )
- $return .= "$view_post\n";
$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
@@ -1116,16 +1116,16 @@
}
}
- $post_name_html = '' . $post_name_abridged . '';
+ $post_name_html = '' . $post_name_abridged . '';
$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
$view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
+ if ( isset( $view_post ) )
+ $display_link = '' . $display_link . '';
$return = '' . __('Permalink:') . "\n";
$return .= '' . $display_link . "\n";
$return .= ''; // Fix bi-directional text display defect in RTL languages.
$return .= '' . __('Edit') . "\n";
$return .= '' . $post_name . "\n";
- if ( isset($view_post) )
- $return .= "$view_post\n";
$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
Index: wp-admin/js/post.dev.js
===================================================================
--- wp-admin/js/post.dev.js (revision 21304)
+++ wp-admin/js/post.dev.js (working copy)
@@ -611,7 +611,12 @@
makeSlugeditClickable = function() {
$('#editable-post-name').click(function() {
- $('#edit-slug-buttons').children('.edit-slug').click();
+ var newSlugField = $('#new-post-slug');
+
+ if (newSlugField.length != 0) {
+ newSlugField.focus();
+ return false;
+ }
});
}
makeSlugeditClickable();
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css (revision 21304)
+++ wp-admin/css/wp-admin.dev.css (working copy)
@@ -2932,6 +2932,14 @@
padding: 0 10px;
}
+#sample-permalink a {
+ text-decoration: none;
+}
+
+#sample-permalink a:hover {
+ text-decoration: underline;
+}
+
#editable-post-name-full {
display: none;
}
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css (revision 21304)
+++ wp-admin/css/colors-classic.dev.css (working copy)
@@ -590,7 +590,8 @@
#media-upload a.del-link,
#media-items a.delete,
.plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
color: #21759b;
}
@@ -646,10 +647,6 @@
background-image: linear-gradient(bottom, #e5f0f8, #fff); /* proposed W3C Markup */
}
-#editable-post-name {
- background-color: #fffbcc;
-}
-
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on,
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css (revision 21304)
+++ wp-admin/css/colors-fresh.dev.css (working copy)
@@ -581,7 +581,8 @@
#media-upload a.del-link,
#media-items a.delete,
.plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
color: #21759b;
}
@@ -627,10 +628,6 @@
background-color: #ddd;
}
-#editable-post-name {
- background-color: #fffbcc;
-}
-
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on,