<!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>[12593] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php: Plugin Directory: Move the bulk actions dropdown actions into between the Bulk Action dropdown and it's Apply button.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/12593">12593</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12593","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-18 03:25:32 +0000 (Thu, 18 May 2023)</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'>Plugin Directory: Move the bulk actions dropdown actions into between the Bulk Action dropdown and it's Apply button.
This also causes the bulk action options to be available at the bottom of the table as well as the top.
See <a href="http://meta.trac.wordpress.org/ticket/6993">#6993</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php 2023-05-17 23:44:38 UTC (rev 12592)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php 2023-05-18 03:25:32 UTC (rev 12593)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,13 +548,12 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Display the "actions" fields below the filters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display the additional filter fields.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function extra_tablenav( $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::extra_tablenav( $which );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'top' === $which ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The first is the reviewer filter, the second is the assign review bulk action.
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="alignleft actions filter-reviewer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,39 +567,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Filter', 'wporg-plugins' ), 'secondary', false, false );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <fieldset class="alignleft actions hide-if-js bulk-plugin_assign" disabled="disabled">
- <?php
- wp_dropdown_users( [
- 'name' => 'reviewer',
- 'selected' => 0,
- 'show_option_none' => __( 'Assign Review to ...', 'wporg-plugins' ),
- 'option_none_value' => 0,
- 'role__in' => [ 'plugin_admin', 'plugin_reviewer' ],
- ] );
- submit_button( __( 'Assign', 'wporg-plugins' ), 'primary', false, false );
- ?>
- </fieldset>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">- // TODO: This shouldn't have inline CSS/JS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Display the additional bulk action fields.
+ */
+ protected function bulk_actions( $which = '' ) {
+ parent::bulk_actions( $which );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $maybe_dash_two = 'top' === $which ? '' : '-2';
+
+ ?>
+ <fieldset class="alignleft actions hide-if-js bulk-plugin_assign" disabled="disabled">
+ <?php
+ wp_dropdown_users( [
+ 'name' => 'reviewer',
+ 'id' => "reviewer{$maybe_dash_two}",
+ 'selected' => 0,
+ 'show_option_none' => __( 'Assign Review to ...', 'wporg-plugins' ),
+ 'option_none_value' => 0,
+ 'role__in' => [ 'plugin_admin', 'plugin_reviewer' ],
+ ] );
+ ?>
+ </fieldset>
+ <fieldset class="alignleft actions hide-if-js bulk-plugin_close bulk-plugin_disable" disabled="disabled">
+ <select name="close_reason" id="close_reason<?php echo $maybe_dash_two; ?>">
+ <option disabled="disabled" value='' selected="selected"><?php esc_html_e( 'Close/Disable Reason:', 'wporg-plugins' ); ?></option>
+ <?php foreach ( Template::get_close_reasons() as $key => $label ) : ?>
+ <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $label ); ?></option>
+ <?php endforeach; ?>
+ </select>
+ </fieldset>
+ <?php
+
+ // Output the JS+CSS needed
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'top' === $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <fieldset class="alignleft actions hide-if-js bulk-plugin_close bulk-plugin_disable" disabled="disabled">
- <select name="close_reason" id="close_reason">
- <option disabled="disabled" value='' selected="selected"><?php esc_html_e( 'Close/Disable Reason:', 'wporg-plugins' ); ?></option>
- <?php foreach ( Template::get_close_reasons() as $key => $label ) : ?>
- <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $label ); ?></option>
- <?php endforeach; ?>
- </select>
- <span class="actions bulk-plugin_close">
- <?php submit_button( __( 'Close', 'wporg-plugins' ), 'primary', 'bulk_close', false ); ?>
- </span>
- <span class="actions bulk-plugin_disable">
- <?php submit_button( __( 'Disable', 'wporg-plugins' ), 'primary', 'bulk_close', false ); ?>
- </span>
- </fieldset>
</del><span class="cx" style="display: block; padding: 0 10px"> <style>
</span><span class="cx" style="display: block; padding: 0 10px"> #posts-filter fieldset.bulk-plugin_close {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,11 +614,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.bulkactions' ).on( 'change', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var $this = $( this ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- val = $this.find(':selected').val(),
- $tablenav = $this.parents('form').find( '.tablenav.top' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $select = $this.find( 'select[name^=action]' ),
+ val = $select.find(':selected').val();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tablenav.find( '.actions.bulk-plugin_close, .actions.bulk-plugin_disable, .actions.bulk-plugin_assign' ).prop( 'disabled', true ).hide();
- $tablenav.find( '.actions.bulk-' + val ).prop( 'disabled', false ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.bulkactions .actions.bulk-plugin_close, .actions.bulk-plugin_disable, .actions.bulk-plugin_assign' ).prop( 'disabled', true ).hide();
+ $( '.bulkactions .actions.bulk-' + val ).prop( 'disabled', false ).show();
+
+ // Sync the values between the various selects in top+bottom.
+ $this.find('select').not( $select ).each( function() {
+ $( '.bulkactions' ).not( $this ).find( 'select[name="' + this.name + '"]' ).val( this.value );
+ } );
+
+ $( '.bulkactions input.action' ).toggleClass( 'button-primary', val != '-1' );
</ins><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"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>