Ticket #9777: 9777.4.diff

wp-admin/css/common.css

@@ -822 +822 @@
 .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;
 }
 
@@ -838 +839 @@
 .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;
@@ -862 +864 @@
         float: left;
 }
 
+#delete-link {
+        line-height: 28px;
+        vertical-align: middle;
+        text-align: left;
+}
+
 #publishing-action {
         text-align: right;
         float: right;

wp-admin/edit-tag-form.php

@@ -195 +195 @@
  */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 
-submit_button( __('Update') );
+submit_button( __('Update'), 'primary', NULL, false, NULL );
 ?>
+
+<?php if ( (int) get_option( 'default_category' ) !== $tag_ID ) : ?>
+<span id="delete-link">
+        <a class="delete" onclick='return showNotice.warn();'" 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>
 <script type="text/javascript">

wp-admin/edit-tags.php

@@ -88 +88 @@
         wp_delete_term( $tag_ID, $taxonomy );
 
         $location = add_query_arg( 'message', 2, $location );
+        $location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
 
         break;