Ticket #9777: 9777.10.diff

src/wp-admin/css/common.css

@@ -874 +874 @@
 .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;
 }
 
@@ -890 +891 @@
 .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;
         border: none;
 }
@@ -915 +917 @@
         line-height: 28px;
 }
 
+#delete-link {
+        line-height: 28px;
+        vertical-align: middle;
+        text-align: left;
+        margin-left: 8px;
+}
+
+#delete-link a {
+        text-decoration: none;
+}
+
 #publishing-action {
         text-align: right;
         float: right;

src/wp-admin/css/edit.css

@@ -1113 +1113 @@
         text-decoration: underline;
 }
 
+#edittag {
+        max-width: 800px;
+}
+
+.edit-tag-actions {
+        margin-top: 20px;
+        overflow: hidden;
+        padding: 10px;
+        margin-right: 10px;
+}
+
 /* Comments */
 
 .comment-php .wp-editor-area {
@@ -1369 +1380 @@
 }
 
 @media screen and ( max-width: 782px ) {
+        .wp-core-ui .edit-tag-actions .button-primary {
+                margin-bottom: 0;
+        }
+
         #post-body-content {
                 min-width: 0;
         }

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

@@ -254 +254 @@
  * @param string $taxonomy Current taxonomy slug.
  */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
+?>
 
-submit_button( __('Update') );
-?>
+<div class="edit-tag-actions">
+
+        <?php submit_button( __( 'Update' ), 'primary', null, false ); ?>
+
+        <?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
+                <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; ?>
+
+</div>
+
 </form>
 </div>
 

src/wp-admin/edit-tags.php

@@ -65 +65 @@
         $referer = wp_unslash( $_SERVER['REQUEST_URI'] );
 }
 $referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
-
 switch ( $wp_list_table->current_action() ) {
 
 case 'add-tag':
@@ -107 +106 @@
 
         $location = add_query_arg( 'message', 2, $referer );
 
+        // When deleting a term, prevent the action from redirecting back to a term that no longer exists.
+        $location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
+
         break;
 
 case 'bulk-delete':

src/wp-admin/js/tags.js

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

src/wp-admin/term.php

@@ -62 +62 @@
         'heading_pagination' => $tax->labels->items_list_navigation,
         'heading_list'       => $tax->labels->items_list,
 ) );
-
+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' );