Changeset 7754 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php

Timestamp:

10/19/2018 10:56:22 PM (6 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Allow users to edit their own submitted notes that are still in moderation.

Props keesiemeijer.
Fixes #3572.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php

@@ -46 +46 @@
                     $ordered_comments = wporg_developer_get_ordered_notes();
                     if ( $ordered_comments ) {
-                        $feedback_editor = array_filter(  wp_list_pluck( $ordered_comments, 'show_editor') );
                         wporg_developer_list_notes( $ordered_comments, array( 'avatar_size' => 32 ) ); 
                     }
@@ -65 +64 @@
     <?php if ( \DevHub\is_parsed_post_type() && DevHub\can_user_post_note( true, get_the_ID() ) ) : ?>
 
-        <?php $add_note_style = empty( $feedback_editor ) ? 'display:none;' : ''; ?>
-        <p id="add-user-note" style="<?php echo $add_note_style; ?>"><a href="<?php echo user_trailingslashit( get_permalink() ) . '#respond'; ?>"><?php _e( 'Have a note or feedback to contribute?', 'wporg' ); ?></a></p>
+        <?php if ( is_user_logged_in() ) : ?>
+            <?php 
+                /* Hide the add user note link by default.
+                 * It will be displayed by Javascript.
+                 * If Javascript is disabled the comment form is displayed and the link stays hidden.
+                 */
+            ?>
+            <p id="add-user-note" style="display: none;"><a href="<?php echo user_trailingslashit( get_permalink() ) . '#respond'; ?>"><?php _e( 'Have a note or feedback to contribute?', 'wporg' ); ?></a></p>
+        <?php endif; ?>
 
         <?php 
-        $args = array(
-            'logged_in_as'        => '<p class="logged-in-as">'
-                . sprintf(
-                    /* translators: 1: user profile link, 2: accessibility text, 3: user name, 4: logout URL */
-                    __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-                    'https://profiles.wordpress.org/' . esc_attr( wp_get_current_user()->user_nicename ),
-                    /* translators: %s: user name */
-                    esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-                    $user_identity,
-                    wp_logout_url( apply_filters( 'the_permalink', get_permalink() ) )
-                )
-                . '</p><p><ul><li>'
-                . __( 'Notes should supplement code reference entries, for example examples, tips, explanations, use-cases, and best practices.', 'wporg' )
-                . '</li><li>'
-                . __( 'Feedback can be to report errors or omissions with the documentation on this page. Such feedback will not be publicly posted.', 'wporg' )
-                . '</li><li>'
-                /* translators: 1: php button, 2: js button, 3: inline code button */
-                . sprintf(
-                    __( 'You can enter text and code. Use the %1$s, %2$s, or %3$s buttons to wrap code snippets.', 'wporg' ),
-                    '<span class="text-button">php</span>',
-                    '<span class="text-button">js</span>',
-                    '<span class="text-button">' . __( 'inline code', 'wporg' ) . '</span>'
-                )
-                . '</li></ul></p>',
-            'comment_notes_after' => '<p>'
-                . __( 'Submission Notes:', 'wporg' )
-                . '<ul><li>'
-                . __( 'This form is not for support requests, discussions, spam, bug reports, complaints, or self-promotion. Entries of this nature will be deleted.', 'wporg' )
-                . '</li><li>'
-                . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.', 'wporg' )
-                . '</li><li class="user-notes-are-gpl">'
-                . sprintf(
-                    /* translators: 1: GFDL link */
-                    __( '<strong>NOTE:</strong> All contributions are licensed under %s and are moderated before appearing on the site.', 'wporg' ),
-                    '<a href="https://gnu.org/licenses/fdl.html">GFDL</a>'
-                )
-                . '</li></ul></p>',
-            'label_submit'        => __( 'Add Note or Feedback', 'wporg' ),
-            'cancel_reply_link'   => '',
-            'must_log_in'         => '<p>' . sprintf(
-                __( 'You must <a href="%s">log in</a> before being able to contribute a note or feedback.', 'wporg' ),
-                'https://login.wordpress.org/?redirect_to=' . urlencode( get_comments_link() )
-            ) . '</p>',
-            'title_reply'         => '', //'Add Example'
-            'title_reply_to'      => '',
-        );
-
-        if ( class_exists( 'DevHub_Note_Preview' ) ) {
-            $args['comment_notes_after'] = DevHub_Note_Preview::comment_preview() . $args['comment_notes_after'];
-            $args['class_form']          = 'comment-form tab-container';
-        }
-
-        if ( class_exists( 'DevHub_User_Submitted_Content' ) ) {
-            $args['comment_field'] = DevHub_User_Submitted_Content::wp_editor_comments();
-        }
-
-        // Insert comment form if feedback form is not already used.
-        if ( empty( $feedback_editor ) ) {
+        if ( class_exists( 'DevHub_User_Submitted_Content' ) )  {
+            $args = \DevHub_User_Submitted_Content::comment_form_args();
             comment_form( $args );
         }