<!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>[13209] sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory: Photo Directory, Admin: Add 'Skip' button to allow skipping current photo and loading next photo in queue.</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/13209">13209</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/13209","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-12 22:58:02 +0000 (Mon, 12 Feb 2024)</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'>Photo Directory, Admin: Add 'Skip' button to allow skipping current photo and loading next photo in queue.
If JS is disabled, the 'Skip Photo' link will appear in a metabox.
Props markmemayank, coffee2code.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7308">#7308</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetscssadmincss">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetsjsadminjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/js/admin.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincadminphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetscssadmincss"></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/photo-directory/assets/css/admin.css</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/photo-directory/assets/css/admin.css 2024-02-12 22:21:20 UTC (rev 13208)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/css/admin.css 2024-02-12 22:58:02 UTC (rev 13209)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,3 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #photos_info dd {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 1.5rem;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.wp-heading-inline #photo-dir-skip-photo {
+ margin-left: 1rem;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryassetsjsadminjs"></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/photo-directory/assets/js/admin.js</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/photo-directory/assets/js/admin.js 2024-02-12 22:21:20 UTC (rev 13208)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/assets/js/admin.js 2024-02-12 22:58:02 UTC (rev 13209)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,6 +84,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> photoRejectionReason?.addEventListener('change', e => setNoteToUserHighlight());
</span><span class="cx" style="display: block; padding: 0 10px"> photoRejectionNoteToUser?.addEventListener('input', e => setNoteToUserHighlight());
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move the skip button out of its metabox and into the top of the page. Also remove the metabox and its display toggle.
+ const skipButton = document.getElementById('photo-dir-skip-photo');
+ if (skipButton) {
+ document.querySelector('#wpbody-content .wrap h1')?.appendChild(skipButton);
+ document.querySelector('#photoskip')?.remove();
+ document.querySelector('label[for="photoskip-hide"]')?.remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }, false);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsphotodirectoryincadminphp"></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/photo-directory/inc/admin.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/photo-directory/inc/admin.php 2024-02-12 22:21:20 UTC (rev 13208)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/admin.php 2024-02-12 22:58:02 UTC (rev 13209)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,6 +83,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Randomize the queue.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query_vars', [ __CLASS__, 'add_query_var_for_random' ] );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', [ __CLASS__, 'randomize_the_queue' ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add button to skip current photo in the queue.
+ add_action( "add_meta_boxes_{$post_type}", [ __CLASS__, 'add_skip_queued_photo_meta_box' ], 10, 2 );
+ add_action( 'admin_init', [ __CLASS__, 'admin_redirect_to_next_photo' ] );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1484,6 +1488,68 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Registers meta box used for the 'skip' button to load another photo.
+ *
+ * @param WP_Post $post Post object.
+ */
+ public static function add_skip_queued_photo_meta_box( $post ) {
+ if ( ! $post ) {
+ return;
+ }
+
+ if ( 'pending' === $post->post_status ) {
+ add_meta_box(
+ 'photoskip',
+ __( 'Skip Photo', 'wporg-photos' ),
+ [ __CLASS__, 'output_skip_queued_photo_meta_box' ],
+ $post->post_type,
+ 'side',
+ 'core'
+ );
+ }
+
+ }
+
+ /**
+ * Outputs the metabox for the skip button.
+ *
+ * @param WP_Post $post Current post object.
+ */
+ public static function output_skip_queued_photo_meta_box( $post ) {
+ printf(
+ '<a href="%s" id="photo-dir-skip-photo" class="page-title-action" title="%s">%s</a>',
+ esc_url( add_query_arg( 'skipphoto', '1' ) ),
+ esc_attr__( 'Skip this photo and load another.', 'wporg-photos' ),
+ __( 'Skip Photo', 'wporg-photos')
+ );
+ }
+
+ /**
+ * Redirects to the next photo in the queue when the current one is being skipped.
+ */
+ public static function admin_redirect_to_next_photo() {
+ $post_type = Registrations::get_post_type();
+
+ // If a random photo is being requested, then redirect to one.
+ if (
+ '1' === ( $_GET['skipphoto'] ?? false )
+ &&
+ 'edit' === ( $_GET['action'] ?? false )
+ &&
+ ! empty( $_GET['post'] )
+ ) {
+ $exclude_photos = [ intval( $_GET['post'] ) ];
+
+ $next_photo = Posts::get_next_post_in_queue( 'rand', '', $exclude_photos );
+
+ if ( $next_photo ) {
+ wp_redirect( get_edit_post_link( $next_photo->ID, 'url' ), 302 );
+ exit;
+ }
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds 'random' as a custom query variable for photo queue listings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $vars The array of allowed query variable names.
</span></span></pre>
</div>
</div>
</body>
</html>