Ticket #18306: 18306.3.diff

wp-admin/css/wp-admin.dev.css

@@ -2801 +2801 @@
         padding: 0 7px;
 }
 
+#sample-permalink a {
+        text-decoration: none;
+}
+
 #editable-post-name-full {
         display: none;
 }

wp-admin/includes/post.php

@@ -1130 +1130 @@
         }
 
         if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
+                if ( isset( $view_post ) )
+                        $permalink = "<a href='$permalink' title='$view_post' target='_blank'>$permalink</a>";
+
                 $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
                 if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
                         $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
-                if ( isset($view_post) )
-                        $return .= "<span id='view-post-btn'><a href='$permalink' class='button' target='_blank'>$view_post</a></span>\n";
 
                 $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1155 +1156 @@
                 }
         }
 
-        $post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
+        $post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
         $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 = "<a href='$view_link' title='$view_post' target='_blank'>$display_link</a>";
+
         $return =  '<strong>' . __('Permalink:') . "</strong>\n";
         $return .= '<span id="sample-permalink">' . $display_link . "</span>\n";
         $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
         $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
         $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
-        if ( isset($view_post) )
-                $return .= "<span id='view-post-btn'><a href='$view_link' class='button' target='_blank'>$view_post</a></span>\n";
-
         $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
         return $return;

wp-admin/js/post.dev.js

@@ -1 @@
-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) {
@@ -557 +557 @@
                                         $('#edit-slug-box').html(data);
                                         b.html(revert_b);
                                         real_slug.val(new_slug);
-                                        makeSlugeditClickable();
                                         $('#view-post-btn').show();
                                 });
                                 return false;
@@ -591 +590 @@
                                 real_slug.val(this.value);
                         }).focus();
                 }
-
-                makeSlugeditClickable = function() {
-                        $('#editable-post-name').click(function() {
-                                $('#edit-slug-buttons').children('.edit-slug').click();
-                        });
-                }
-                makeSlugeditClickable();
         }
 
         // word count

wp-includes/js/autosave.dev.js

@@ -160 +160 @@
 
 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,
@@ -170 +170 @@
                         function(data) {
                                 if ( data !== '-1' ) {
                                         jQuery('#edit-slug-box').html(data);
-                                        makeSlugeditClickable();
                                 }
                         }
                 );