<!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>[3230] sites/trunk/wordpress.org/public_html/wp-content: Plugins Directory: Add a banner to show plugin queue volume.</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="http://meta.trac.wordpress.org/changeset/3230">3230</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/3230","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-24 16:01:00 +0000 (Tue, 24 May 2016)</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'>Plugins Directory: Add a banner to show plugin queue volume.
Also improves notices on the upload page in general.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1727">#1727</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginscssstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginssasselements_elementsscss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/elements/_elements.scss</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginssassforms_fieldsscss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/forms/_fields.scss</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryshortcodesclassuploadphp"></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/shortcodes/class-upload.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/shortcodes/class-upload.php 2016-05-24 15:04:02 UTC (rev 3229)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php 2016-05-24 16:01:00 UTC (rev 3230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,21 +7,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Renders the upload shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function display() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ob_start();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) :
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) {
- if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
+ if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> $uploader = new Upload_Handler;
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $uploader->process_upload();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ else :
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Error in file upload.', 'wporg-plugins' );
</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">+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $message ) ) {
- echo "<div class='notice notice-warning'><p>{$message}</p></div>\n";
- }
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $message ) ) :
+ echo "<div class='notice notice-warning notice-alt'><p>{$message}</p></div>\n";
+ endif;
+
+ else :
+ $plugins = wp_count_posts( 'plugin', 'readable' );
+ ?>
+
+ <div class="plugin-queue-message notice notice-info notice-alt">
+ <p>
+ <?php
+ printf( _n( 'Currently there is %1$s plugin in the review queue.', 'Currently there are %1$s plugins in the review queue, %2$s of which are awaiting their initial review.', ( $plugins->draft + $plugins->pending ), 'wporg-plugins' ),
+ '<strong>' . ( $plugins->draft + $plugins->pending ) . '</strong>',
+ '<strong>' . $plugins->draft . '</strong>'
+ );
+ ?>
+ </p>
+ </div>
+
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <form enctype="multipart/form-data" id="upload_form" method="POST" action="">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="upload"/>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,10 +50,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-plugins' ), esc_html( self::get_max_allowed_file_size() ) ); ?></small>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'Before you can upload a new plugin, <a href="%s">please log in</a>.', 'wporg-plugins' ), esc_url( 'https://login.wordpress.org/' ) ); ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p><?php printf( __( 'Before you can upload a new plugin, <a href="%s">please log in</a>.', 'wporg-plugins' ), esc_url( 'https://login.wordpress.org/' ) ); ?></p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return ob_get_clean();
</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></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginscssstylecss"></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/themes/pub/wporg-plugins/css/style.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/themes/pub/wporg-plugins/css/style.css 2016-05-24 15:04:02 UTC (rev 3229)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/css/style.css 2016-05-24 16:01:00 UTC (rev 3230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,6 +439,61 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</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">+.notice {
+ background: #fff;
+ border-left: 4px solid #fff;
+ box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
+ margin: 1em 0;
+ padding: 1px 12px;
+}
+
+.notice p {
+ font-size: 12.8px;
+ font-size: 0.8rem;
+ margin: 0.5em 0;
+ padding: 2px;
+}
+
+.notice.notice-alt {
+ box-shadow: none;
+}
+
+.notice.notice-large {
+ padding: 10px 20px;
+}
+
+.notice.notice-success {
+ border-left-color: #46b450;
+}
+
+.notice.notice-success.notice-alt {
+ background-color: #ecf7ed;
+}
+
+.notice.notice-warning {
+ border-left-color: #ffb900;
+}
+
+.notice.notice-warning.notice-alt {
+ background-color: #fff8e5;
+}
+
+.notice.notice-error {
+ border-left-color: #dc3232;
+}
+
+.notice.notice-error.notice-alt {
+ background-color: #fbeaea;
+}
+
+.notice.notice-info {
+ border-left-color: #00a0d2;
+}
+
+.notice.notice-info.notice-alt {
+ background-color: #e5f5fa;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*--------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> # Forms
</span><span class="cx" style="display: block; padding: 0 10px"> --------------------------------------------------------------*/
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginssasselements_elementsscss"></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/themes/pub/wporg-plugins/sass/elements/_elements.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/elements/_elements.scss 2016-05-24 15:04:02 UTC (rev 3229)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/elements/_elements.scss 2016-05-24 16:01:00 UTC (rev 3230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,4 +37,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%; /* Adhere to container width. */
</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">-@import "tables";
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@import "tables";
+@import "notices";
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginssassforms_fieldsscss"></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/themes/pub/wporg-plugins/sass/forms/_fields.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/forms/_fields.scss 2016-05-24 15:04:02 UTC (rev 3229)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/sass/forms/_fields.scss 2016-05-24 16:01:00 UTC (rev 3230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,4 +49,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> textarea {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-left: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre>
</div>
</div>
</body>
</html>