Ticket #9777: 9777.7.diff

src/wp-admin/css/common.css

@@ -794 +794 @@
 .submitbox .submitdelete,
 #media-items a.delete,
 #media-items a.delete-permanently,
-#nav-menu-footer .menu-delete {
+#nav-menu-footer .menu-delete,
+#delete-link a.delete  {
         color: #a00;
 }
 
@@ -810 +811 @@
 .submitbox .submitdelete:hover,
 #media-items a.delete:hover,
 #media-items a.delete-permanently:hover,
-#nav-menu-footer .menu-delete:hover {
+#nav-menu-footer .menu-delete:hover,
+#delete-link a.delete:hover {
         color: #f00;
         text-decoration: none;
         border: none;
@@ -834 +836 @@
         float: left;
 }
 
+#delete-link {
+        line-height: 28px;
+        vertical-align: middle;
+        text-align: left;
+        margin-left: 15px;
+}
+
+#delete-link a {
+        text-decoration: none;
+}
+
 #publishing-action {
         text-align: right;
         float: right;

src/wp-admin/edit-tag-form.php

@@ -211 +211 @@
  */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 
-submit_button( __('Update') );
+submit_button( __( 'Update' ), 'primary', null, false );
 ?>
+
+<?php if ( $tag_ID !== (int) get_option( 'default_category' ) ) : ?>
+        <span id="delete-link">
+                <a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"'><?php _e( 'Delete' ); ?></a>
+        </span>
+<?php endif; ?>
 </form>
 </div>
 

src/wp-admin/edit-tags.php

@@ -91 +91 @@
         wp_delete_term( $tag_ID, $taxonomy );
 
         $location = add_query_arg( 'message', 2, $location );
+        $location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
 
         break;
 
@@ -123 +124 @@
         $tag_ID = (int) $_REQUEST['tag_ID'];
 
         $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-        if ( ! $tag )
+        if ( ! $tag ) {
                 wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+        }
+
+        wp_enqueue_script( 'admin-tags' );
+
         require_once( ABSPATH . 'wp-admin/admin-header.php' );
         include( ABSPATH . 'wp-admin/edit-tag-form.php' );
         include( ABSPATH . 'wp-admin/admin-footer.php' );

src/wp-admin/js/tags.js

@@ -28 +28 @@
                 return false;
         });
 
+        $( '#edittag' ).on( 'click', '.delete', function() {
+                if ( 'undefined' === typeof showNotice ) {
+                        return true;
+                }
+                return showNotice.warn();
+        });
+
         $('#submit').click(function(){
                 var form = $(this).parents('form');