Changeset 10003 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php

Timestamp:

07/03/2020 04:10:55 AM (6 years ago)

Author:

tellyworth

Message:

Block directory: initial UI improvements for block validator.

Props ryelle.
See #5303.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-block-validator.php

@@ -7 +7 @@
 
         /**
-         * Displays a form to validate block plugins.   
+         * Displays a form to validate block plugins.
          */
         public static function display() {
+                $plugin_url = $_REQUEST['plugin_url'] ?? '';
                 ?>
                 <div class="wrap">
-<?php
-                if ( $_POST && wp_verify_nonce( $_POST['block-nonce'], 'validate-block-plugin' ) ) {
-
-                                self::validate_block( $_POST['plugin_url'] );
-                        }
-
-                        $plugin_url      = $_REQUEST['plugin_url'] ?? '';
-                        ?>
-
                         <form method="post" action="">
                                 <p>
-                                        <input type="text" name="plugin_url" size="70" placeholder="https://plugins.svn.wordpress.org/" value="<?php echo esc_url( $plugin_url ); ?>" />
+                                        <label for="plugin_url"><?php _e( 'Plugin repo URL', 'wporg-plugins' ); ?></label>
+                                </p>
+                                <p>
+                                        <input type="text" id="plugin_url" name="plugin_url" size="70" placeholder="https://plugins.svn.wordpress.org/" value="<?php echo esc_url( $plugin_url ); ?>" />
                                         <input type="submit" class="button button-secondary" value="<?php esc_attr_e( 'Validate!', 'wporg-plugins' ); ?>" />
                                         <?php wp_nonce_field( 'validate-block-plugin', 'block-nonce' ); ?>
@@ -29 +24 @@
                         </form>
 
+                        <?php
+                        if ( $_POST && wp_verify_nonce( $_POST['block-nonce'], 'validate-block-plugin' ) ) {
+                                self::validate_block( $_POST['plugin_url'] );
+                        }
+                        ?>
                 </div>
                 <?php
@@ -35 +35 @@
         /**
          * Validates readme.txt contents and adds feedback.
+         *
+         * @param string $plugin_url The URL of a Subversion or GitHub repository.
          */
         protected static function validate_block( $plugin_url ) {
@@ -41 +43 @@
                 $results = $checker->run_check_plugin_repo( $plugin_url );
 
+                echo '<h2>' . __( 'Results', 'wporg-plugins' ) . '</h2>';
+
                 if ( $checker->repo_url && $checker->repo_revision ) {
-                        echo '<h2>Validating..</h2>';
-                        echo '<p>Results for ' . esc_url( $checker->repo_url ) . ' revision ' . esc_html( $checker->repo_revision ) . '</p>';
+                        echo '<p>';
+                        printf(
+                                'Results for %1$s revision %2$s',
+                                '<code>' . esc_url( $checker->repo_url ) . '</code>',
+                                esc_html( $checker->repo_revision )
+                        );
+                        echo '</p>';
                 }
 
@@ -50 +59 @@
                         $results_by_type[ $item->type ][] = $item;
                 }
-
 
                 $output = '';
@@ -60 +68 @@
                 );
                 foreach ( $error_types as $type => $warning_label ) {
+                        if ( empty( $results_by_type[ $type ] ) ) {
+                                continue;
+                        }
 
-                                if ( empty( $results_by_type[ $type ] ) )
-                                        continue;
-
-                                $output .= "<h3>{$warning_label}</h3>\n";
-                                $output .= "<div class='notice notice-{$type} notice-alt'>\n";
-                                $output .= "<ul class='{$type}'>\n";
-                                foreach ( $results_by_type[ $type ] as $item ) {
-                                        $output .= "<li title='{$item->check_name}'><a href='/hypothetical/doc/page#{$item->check_name}'><span class='dashicons dashicons-info'></span></a> {$item->message}</li>\n";
+                        $output .= "<h3>{$warning_label}</h3>\n";
+                        $output .= "<div class='notice notice-{$type} notice-alt'>\n";
+                        $output .= "<ul class='{$type}'>\n";
+                        foreach ( $results_by_type[ $type ] as $item ) {
+                                $docs_link = '';
+                                if ( 'check' === substr( $item->check_name, 0, 5 ) ) {
+                                        $docs_link = "<a href='/hypothetical/doc/page#{$item->check_name}'>" . __( 'More about this.', 'wporg-plugins' ) . '</a>';
                                 }
-                                $output .= "</ul>\n";
-                                $output .= "</div>\n";
+                                $output .= "<li class='{$item->check_name}'>{$item->message} {$docs_link}</li>\n";
+                        }
+                        $output .= "</ul>\n";
+                        $output .= "</div>\n";
                 }