<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[40655] trunk/src/wp-admin: Taxonomy: Add a "delete" button on term edit page.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40655">40655</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40655","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-12 19:25:43 +0000 (Fri, 12 May 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/9777">#9777</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadminjstagsjs">trunk/src/wp-admin/js/tags.js</a></li>
<li><a href="#trunksrcwpadmintermphp">trunk/src/wp-admin/term.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/css/common.css 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +874,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .submitbox .submitdelete,
</span><span class="cx" style="display: block; padding: 0 10px"> #media-items a.delete,
</span><span class="cx" style="display: block; padding: 0 10px"> #media-items a.delete-permanently,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#nav-menu-footer .menu-delete {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#nav-menu-footer .menu-delete,
+#delete-link a.delete {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #a00;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +891,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .submitbox .submitdelete:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> #media-items a.delete:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> #media-items a.delete-permanently:hover,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#nav-menu-footer .menu-delete:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#nav-menu-footer .menu-delete:hover,
+#delete-link a.delete:hover {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #dc3232;
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,6 +913,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 28px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#delete-link {
+ line-height: 28px;
+ vertical-align: middle;
+ text-align: left;
+ margin-left: 8px;
+}
+
+#delete-link a {
+ text-decoration: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #publishing-action {
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: right;
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span></span></pre></div>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/css/edit.css 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,6 +1092,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: underline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#edittag {
+ max-width: 800px;
+}
+
+.edit-tag-actions {
+ margin-top: 20px;
+ overflow: hidden;
+ padding: 10px;
+ margin-right: 10px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Comments */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .comment-php .wp-editor-area {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1348,6 +1359,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @media screen and ( max-width: 782px ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .wp-core-ui .edit-tag-actions .button-primary {
+ margin-bottom: 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #post-body-content {
</span><span class="cx" style="display: block; padding: 0 10px"> min-width: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminedittagformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tag-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/edit-tag-form.php 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,9 +254,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Current taxonomy slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-submit_button( __('Update') );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<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>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/edit-tags.php 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = wp_unslash( $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> switch ( $wp_list_table->current_action() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'add-tag':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +106,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $location = add_query_arg( 'message', 2, $referer );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'bulk-delete':
</span></span></pre></div>
<a id="trunksrcwpadminjstagsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/tags.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/tags.js 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/js/tags.js 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#edittag' ).on( 'click', '.delete', function( e ) {
+ if ( 'undefined' === typeof showNotice ) {
+ return true;
+ }
+
+ var response = showNotice.warn();
+ if ( ! response ) {
+ e.preventDefault();
+ }
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#submit').click(function(){
</span><span class="cx" style="display: block; padding: 0 10px"> var form = $(this).parents('form');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmintermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/term.php 2017-05-12 18:05:21 UTC (rev 40654)
+++ trunk/src/wp-admin/term.php 2017-05-12 19:25:43 UTC (rev 40655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'heading_pagination' => $tax->labels->items_list_navigation,
</span><span class="cx" style="display: block; padding: 0 10px"> 'heading_list' => $tax->labels->items_list,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_script( 'admin-tags' );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/edit-tag-form.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>