Ticket #21340: 21340.7.diff

wp-includes/class-wp-editor.php

@@ -843 +843 @@
                 </div>
         </div>
         <div class="submitbox">
+                <div id="wp-link-update">
+                        <input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button-primary" id="wp-link-submit" name="wp-link-submit">
+                </div>
                 <div id="wp-link-cancel">
                         <a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
                 </div>
-                <div id="wp-link-update">
-                        <input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button-primary" id="wp-link-submit" name="wp-link-submit">
-                </div>
         </div>
         </form>
         </div>

wp-admin/includes/dashboard.php

@@ -527 +527 @@
                 </div>
 
                 <p class="submit">
+                        <span id="publishing-action">
+                                <input type="submit" name="publish" id="publish" accesskey="p" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
+                                <span class="spinner"></span>
+                        </span>
                         <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" />
                         <input type="hidden" name="post_ID" value="<?php echo $post_ID; ?>" />
                         <input type="hidden" name="post_type" value="post" />
                         <?php wp_nonce_field('add-post'); ?>
                         <?php submit_button( __( 'Save Draft' ), 'button', 'save', false, array( 'id' => 'save-post' ) ); ?>
                         <input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
-                        <span id="publishing-action">
-                                <input type="submit" name="publish" id="publish" accesskey="p" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
-                                <span class="spinner"></span>
-                        </span>
                         <br class="clear" />
                 </p>
 

wp-admin/js/post.js

@@ -510 +510 @@
                 $('#timestampdiv').siblings('a.edit-timestamp').click(function() {
                         if ($('#timestampdiv').is(":hidden")) {
                                 $('#timestampdiv').slideDown('fast');
+                                $('#mm').focus();
                                 $(this).hide();
                         }
                         return false;