Index: wp-includes/js/autosave.js
===================================================================
--- wp-includes/js/autosave.js (revision 22029)
+++ wp-includes/js/autosave.js (working copy)
@@ -205,7 +205,7 @@
function autosave_update_slug(post_id) {
// create slug area only if not already there
- if ( 'undefined' != makeSlugeditClickable && jQuery.isFunction(makeSlugeditClickable) && !jQuery('#edit-slug-box > *').size() ) {
+ if ( !jQuery('#edit-slug-box > *').size() ) {
jQuery.post( ajaxurl, {
action: 'sample-permalink',
post_id: post_id,
@@ -215,7 +215,6 @@
function(data) {
if ( data !== '-1' ) {
jQuery('#edit-slug-box').html(data);
- makeSlugeditClickable();
}
}
);
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php (revision 22029)
+++ wp-admin/includes/post.php (working copy)
@@ -1073,11 +1073,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);
@@ -1098,16 +1098,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.js
===================================================================
--- wp-admin/js/post.js (revision 22029)
+++ wp-admin/js/post.js (working copy)
@@ -1,4 +1,4 @@
-var tagBox, commentsBox, editPermalink, makeSlugeditClickable, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
+var tagBox, commentsBox, editPermalink, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
// return an array with any duplicate, whitespace or values removed
function array_unique_noempty(a) {
@@ -562,7 +562,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 i, c = 0, e = $('#editable-post-name'), real_slug = $('#post_name'), revert_slug = real_slug.val(), b = $('#edit-slug-buttons'), revert_b = b.html(), full = $('#editable-post-name-full').html(), s = $('#sample-permalink'), revert_s = s.html();
$('#view-post-btn').hide();
b.html(''+postL10n.ok+' '+postL10n.cancel+'');
@@ -581,7 +581,6 @@
$('#edit-slug-box').html(data);
b.html(revert_b);
real_slug.val(new_slug);
- makeSlugeditClickable();
$('#view-post-btn').show();
});
return false;
@@ -589,7 +588,7 @@
$('.cancel', '#edit-slug-buttons').click(function() {
$('#view-post-btn').show();
- e.html(revert_e);
+ s.html(revert_s);
b.html(revert_b);
real_slug.val(revert_slug);
return false;
@@ -601,6 +600,7 @@
}
slug_value = ( c > full.length / 4 ) ? '' : full;
+ e.parent('a').contents().unwrap();
e.html('').children('input').keypress(function(e){
var key = e.keyCode || 0;
// on enter, just save the new slug, don't save the post
@@ -615,13 +615,6 @@
real_slug.val(this.value);
}).focus();
}
-
- makeSlugeditClickable = function() {
- $('#editable-post-name').click(function() {
- $('#edit-slug-buttons').children('.edit-slug').click();
- });
- }
- makeSlugeditClickable();
}
// word count
Index: wp-admin/css/colors-fresh.css
===================================================================
--- wp-admin/css/colors-fresh.css (revision 22029)
+++ wp-admin/css/colors-fresh.css (working copy)
@@ -713,7 +713,8 @@
#media-items a.delete,
#media-items a.delete-permanently,
.plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
color: #21759b;
}
@@ -757,10 +758,6 @@
background-color: #ddd;
}
-#editable-post-name {
- background-color: #fffbcc;
-}
-
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on,
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css (revision 22029)
+++ wp-admin/css/wp-admin.css (working copy)
@@ -2921,12 +2921,25 @@
font-size: 11px;
}
+#editable-post-name {
+ font-weight: bold;
+}
+
+#sample-permalink a {
+ text-decoration: none;
+}
+
+#sample-permalink a:hover {
+ text-decoration: underline;
+}
+
#editable-post-name-full {
display: none;
}
#editable-post-name input {
width: 16em;
+ font-weight: normal;
}
.postarea h3 label {
Index: wp-admin/css/colors-classic.css
===================================================================
--- wp-admin/css/colors-classic.css (revision 22029)
+++ wp-admin/css/colors-classic.css (working copy)
@@ -722,7 +722,8 @@
#media-items a.delete,
#media-items a.delete-permanently,
.plugins a.delete,
-.ui-tabs-nav a {
+.ui-tabs-nav a,
+#sample-permalink a:hover {
color: #21759b;
}
@@ -766,10 +767,6 @@
background-color: #ddd;
}
-#editable-post-name {
- background-color: #fffbcc;
-}
-
#edit-slug-box strong,
.tablenav .displaying-num,
#submitted-on,