Ticket #24011: 24011.16.diff

wp-admin/edit-form-advanced.php

@@ -419 +419 @@
 <?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
-        <label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
+        <?php
+                // Third argument passed to filter denotes optional title field
+                $title_prompt          = apply_filters( 'enter_title_here', __( 'Enter title here'            ), $post, false );
+                $title_optional_prompt = apply_filters( 'enter_title_here', __( 'Enter title here (optional)' ), $post, true );
+        ?>
+        <label class="screen-reader-text" id="title-prompt-text" for="title" data-title="<?php echo esc_attr( $title_prompt ); ?>" data-title-optional="<?php echo esc_attr( $title_optional_prompt ); ?>"><?php echo in_array( $post_format, array( 'aside', 'status' ) ) ? $title_optional_prompt : $title_prompt; ?></label>
         <input type="text" name="post_title" size="30" value="<?php echo esc_attr( htmlspecialchars( $post->post_title ) ); ?>" id="title" autocomplete="off" />
 </div>
 <div class="inside">

wp-admin/css/wp-admin.css

@@ -4116 +4116 @@
 }
 
 .wp-post-format-show-ui.wp-format-image .attachment-display-settings,
-.wp-post-format-show-ui.wp-format-status #titlewrap,
 .wp-post-format-show-ui.wp-format-image #insert-media-button,
 .wp-post-format-show-ui.wp-format-audio #insert-media-button,
 .wp-post-format-show-ui.wp-format-video #insert-media-button,

wp-admin/js/post-formats.js

@@ -13 +13 @@
                 lastHeight = 360,
                 initialFormat = 'standard',
                 shortClass = 'short-format',
-                noTitleFormats = ['status'],
+                optionalTitleFormats = ['status', 'aside'],
                 noMediaFormats = ['status', 'aside', 'image', 'audio', 'video'],
                 shortContentFormats = ['status', 'aside'],
                 noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'];
@@ -132 +132 @@
                         insertMediaButton.fadeToggle( 200 ).css( 'display', 'inline-block' );
                 }
                 // Animate the title going away or coming back
-                formatTo = -1 < $.inArray( format, noTitleFormats );
-                formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noTitleFormats );
+                formatTo = -1 < $.inArray( format, optionalTitleFormats );
+                formatFrom = -1 < $.inArray( postFormats.currentPostFormat, optionalTitleFormats );
                 if ( formatFrom ? !formatTo : formatTo ) { // XOR
-                        $( '#titlewrap' ).fadeToggle( 200 );
+                        var o = formatTo ? 0.5 : 1;
+                        titlePrompt.text( titlePrompt.data('title' + ( formatTo ? '-optional' : '' ) ) );
+                        $( '#titlewrap' ).animate( {opacity: o}, 200 );
                 }
 
                 // Animate the fields moving going away or coming in
@@ -160 +162 @@
                 }
 
                 resizeContent( format );
-                postTitle.focus();
+                if( -1 < $.inArray( format, optionalTitleFormats ) )
+                        if( $('#content:visible').size() )
+                                $('#content').focus();
+                        else
+                                tinyMCE.activeEditor.focus();
+                else
+                        postTitle.focus();
 
                 if ( '' === postTitle.val() ) {
                         titlePrompt.removeClass( 'screen-reader-text' );
@@ -237 +245 @@
                         $(this).closest( 'p' ).find( 'span' ).toggle();
                 });
 
+                // Set opacity of title on focus
+                var optionalTitleFormatsSelector = '.wp-format-' + optionalTitleFormats.join( ' #title,.wp-format-' ) + ' #title';
+                $( 'html' ).on( 'focusin', optionalTitleFormatsSelector, function(e) {
+                        $( '#titlewrap' ).animate( {opacity:1}, 200 );
+                }).on( 'focusout', optionalTitleFormatsSelector, function(e) {
+                        $( '#titlewrap' ).animate( {opacity:.5}, 200 );
+                });
+                $( optionalTitleFormatsSelector ).parents( '#titlewrap' ).animate( {opacity:.5}, 200 );
+
                 // Media selection
                 $( '.wp-format-media-select' ).click( function (e) {
                         e.preventDefault();

wp-includes/class-wp-editor.php

@@ -732 +732 @@
 
         <div id="wp-fullscreen-wrap" style="width:<?php echo $dfw_width; ?>px;">
                 <?php if ( post_type_supports($post->post_type, 'title') ) { ?>
-                <label id="wp-fullscreen-title-prompt-text" for="wp-fullscreen-title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post ); ?></label>
+                <label id="wp-fullscreen-title-prompt-text" for="wp-fullscreen-title"><?php echo apply_filters( 'enter_title_here', __( 'Enter title here' ), $post, false ); ?></label>
                 <input type="text" id="wp-fullscreen-title" value="" autocomplete="off" />
                 <?php } ?>