Ticket #18306: 18306.4.diff

wp-admin/includes/post.php

@@ -1089 +1089 @@
         }
 
         if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
+                if ( isset( $view_post ) )
+                        $permalink = '<a href="' . $permalink . '" title="' . esc_attr( $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);
 
@@ -1114 +1114 @@
                 }
         }
 
-        $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="' . esc_attr( $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);
 

wp-admin/js/post.dev.js

@@ -610 +610 @@
                 makeSlugeditClickable = function() {
                         $('#editable-post-name').click(function() {
                                 $('#edit-slug-buttons').children('.edit-slug').click();
+                                return false;
                         });
                 }
                 makeSlugeditClickable();

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

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

wp-admin/css/colors-fresh.dev.css

@@ -311 +311 @@
 .howto,
 .nonessential,
 #edit-slug-box,
+#editable-post-name,
 .form-input-tip,
 .subsubsub {
         color: #666;