Changeset 40655

Timestamp:

05/12/2017 07:25:43 PM (8 years ago)

Author:

adamsilverstein

Message:

Taxonomy: Add a "delete" button on term edit page.

Add a 'delete' link next to the update button on the term edit screen so you can delete a term while you are reviewing it's details.

Props cklosows, bradt, ocean90, johnbillion, DrewAPicture, ryan, MatheusGimenez, maguiar.
Fixes #9777.

Location:

trunk/src/wp-admin

Files:

• css/common.css (modified) (3 diffs)
• css/edit.css (modified) (2 diffs)
• edit-tag-form.php (modified) (1 diff)
• edit-tags.php (modified) (2 diffs)
• js/tags.js (modified) (1 diff)
• term.php (modified) (1 diff)

trunk/src/wp-admin/css/common.css

@@ -875 +875 @@
 #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;
 }
@@ -891 +892 @@
 #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: #dc3232;
     border: none;
@@ -910 +912 @@
     float: left;
     line-height: 28px;
+}
+
+#delete-link {
+    line-height: 28px;
+    vertical-align: middle;
+    text-align: left;
+    margin-left: 8px;
+}
+
+#delete-link a {
+    text-decoration: none;
 }
 

trunk/src/wp-admin/css/edit.css

@@ -1091 +1091 @@
 .ac_match {
     text-decoration: underline;
+}
+
+#edittag {
+    max-width: 800px;
+}
+
+.edit-tag-actions {
+    margin-top: 20px;
+    overflow: hidden;
+    padding: 10px;
+    margin-right: 10px;
 }
 
@@ -1349 +1360 @@
 
 @media screen and ( max-width: 782px ) {
+    .wp-core-ui .edit-tag-actions .button-primary {
+        margin-bottom: 0;
+    }
+
     #post-body-content {
         min-width: 0;

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

@@ -255 +255 @@
  */
 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>

trunk/src/wp-admin/edit-tags.php

@@ -66 +66 @@
 }
 $referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
-
 switch ( $wp_list_table->current_action() ) {
 
@@ -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;

trunk/src/wp-admin/js/tags.js

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

trunk/src/wp-admin/term.php

@@ -63 +63 @@
     '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' );