Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php =================================================================== --- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php (revision 3301) +++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php (working copy) @@ -42,7 +42,10 @@ if ( is_singular( 'post' ) ) { wp_list_comments(); } else { - wp_list_comments( array( 'callback' => 'wporg_developer_user_note' ) ); + $ordered_comments = wporg_developer_get_ordered_notes(); + if( $ordered_comments ) { + wp_list_comments(array( 'callback' => 'wporg_developer_user_note' ), $ordered_comments ); + } } ?> Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php =================================================================== --- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php (revision 3301) +++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php (working copy) @@ -72,70 +72,121 @@ } endif; - if ( ! function_exists( 'wporg_developer_user_note' ) ) : + if ( ! function_exists( 'wporg_developer_get_ordered_notes' ) ) : /** - * Template for user contributed notes. + * Get contibuted notes ordered by vote + * + * By default only top level comments are returned. + * If child notes are included use wp_list_comments() or a custom walker for display. + * unapproved notes for the current user are included. * - * Used as a callback by wp_list_comments() for displaying the notes. + * @param integer $post_id Optional. Post id to get comments for + * @param array $args Arguments used for get_comments(). + * @return array Array with comment objects */ - function wporg_developer_user_note( $comment, $args, $depth ) { - $GLOBALS['comment'] = $comment; + function wporg_developer_get_ordered_notes( $post_id = 0, $args = array() ) { - if ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) : ?> + $post_id = absint( $post_id ); -
  • > -
    - ', '' ); ?> -
    + if ( ! $post_id ) { + $post_id = get_the_ID(); + } - + $order = array(); + $defaults = array( + 'post__in' => array( $post_id ), + 'type' => 'comment', + 'status' => 'approve', + 'include_unapproved' => array_filter( array( get_current_user_id() ) ), + 'parent' => false, + ); -
  • > -
    -
    - -
    - + if( is_super_admin() ) { + $defaults['status'] = 'all'; + } -
    - -
    - - $comment ) { + $order[ $key ] = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' ); + } + + // sort the posts by votes + array_multisort( $order, SORT_DESC, $comments ); + + return $comments; + } + endif; + + if ( ! function_exists( 'wporg_developer_user_note' ) ) : + /** + * Template for user contributed notes. + */ + function wporg_developer_user_note( $comment, $args, $depth ) { + $GLOBALS['comment'] = $comment; + $count = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' ); + $comment_class = ( -1 > $count ) ? 'bad-note' : ''; + ?> + +
  • > +
    +
    + +
    + + + } ?> - user_id ) { - $commenter = get_user_by( 'id', $comment->user_id ); - $url = 'https://profiles.wordpress.org/' . esc_attr( $commenter->user_nicename ) . '/'; - $author = get_the_author_meta( 'display_name', $comment->user_id ); - $comment_author_link = "$author"; - } else { - $comment_author_link = ''; - } - printf( __( 'Contributed by %s', 'wporg' ), sprintf( '%s', $comment_author_link ) ); + user_id ) { + $commenter = get_user_by( 'id', $comment->user_id ); + $url = 'https://profiles.wordpress.org/' . esc_attr( $commenter->user_nicename ) . '/'; + $author = get_the_author_meta( 'display_name', $comment->user_id ); + $comment_author_link = "$author"; + } else { + $comment_author_link = ''; + } + printf( __( 'Contributed by %s', 'wporg' ), sprintf( '%s', $comment_author_link ) ); + ?> + + + — + + + + — ', '' ); ?> +
    +
    + - - — - Added on - - - — ', '' ); ?> -
    • - +
    + +
    + - comment_approved ) : ?> -

    —

    - + comment_approved ) : ?> +
    +

    - + + - 'div-comment', 'depth' => $depth, @@ -143,11 +194,9 @@ 'before' => '
    ', 'after' => '
    ', ) ) ); - ?> -
    - + ?> + '; + echo '
    '; // Up vote link $user_upvoted = self::has_user_upvoted_comment( $comment_id ); + $button_text = __('Vote up button', 'wporg'); if ( $can_vote ) { + $cancel = $user_upvoted ? '. ' . $cancel_str . '.' : ''; $title = $user_upvoted ? - __( 'You have voted to indicate this note was helpful', 'wporg' ) : + __( 'You have voted to indicate this note was helpful', 'wporg' ) . $cancel : __( 'Vote up if this note was helpful', 'wporg' ); - $tag = $user_upvoted ? 'span' : 'a'; + $tag = 'a'; } else { - $title = ! is_user_logged_in() ? - __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) : - ''; + $title = ! $logged_in ? $log_in_str : $disabled_str; + $button_text = __('Disabled vote down button', 'wporg'); $tag = 'span'; } + + // WAI-ARIA + echo "" . $title . ''; + echo "'; + echo "<{$tag} " . 'class="user-note-voting-up' . ( $user_upvoted ? ' user-voted' : '' ) . '" title="' . esc_attr( $title ) . '" data-id="' . esc_attr( $comment_id ) - . '" data-vote="up'; - if ( ! $user_upvoted ) { + . '" data-vote="up' + . '" aria-labelledby="vote-up-' . $comment_id; + if ( 'a' === $tag ) { echo '" href="' . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'up' ), $comment_link ) ); } @@ -299,32 +310,39 @@ $title = ( 0 == self::count_votes( $comment_id, 'total' ) ) ? '' : sprintf( __( '%s like this', 'wporg' ), self::count_votes( $comment_id, 'like_percentage' ) . '%' ); - $class = ''; echo '' + . 'class="user-note-voting-count" ' + . 'title="' . esc_attr( $title ) . '">' + . '' . __('User vote count', 'wporg') . '' . self::count_votes( $comment_id, 'difference' ) . ''; // Down vote link $user_downvoted = ( $user_upvoted ? false : self::has_user_downvoted_comment( $comment_id ) ); + $button_text = __('Vote down button', 'wporg'); if ( $can_vote ) { + $cancel = $user_downvoted ? '. ' . $cancel_str . '.' : ''; $title = $user_downvoted ? - __( 'You have voted to indicate this note was not helpful', 'wporg' ) : + __( 'You have voted to indicate this note was not helpful', 'wporg' ) . $cancel : __( 'Vote down if this note was not helpful', 'wporg' ); - $tag = $user_downvoted ? 'span' : 'a'; + $tag = 'a'; } else { - $title = ! is_user_logged_in() ? - __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) : - ''; + $title = ! $logged_in ? $log_in_str : $disabled_str; + $button_text = __('Disabled vote down button', 'wporg'); $tag = 'span'; } + + // WAI-ARIA + echo $title ? "" . $title . '' : ''; + echo "'; + echo "<{$tag} " . 'class="user-note-voting-down' . ( $user_downvoted ? ' user-voted' : '' ) . '" title="' . esc_attr( $title ) . '" data-id="' . esc_attr( $comment_id ) - . '" data-vote="down'; - if ( ! $user_downvoted ) { + . '" data-vote="down' + . '" aria-labelledby="vote-down-' . $comment_id; + if ( 'a' === $tag ) { echo '" href="' . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'down' ), $comment_link ) ); } @@ -443,9 +461,11 @@ // Get list of people who cast the same vote. $add_to_list = get_comment_meta( $comment_id, $add_to, true ); - // Don't do anything if user is recasting the same vote as before. + // Remove from list if recasting the same vote as before. if ( in_array( $user_id, (array) $add_to_list ) ) { - return false; + unset( $add_to_list[ array_search( $user_id, $add_to_list ) ] ); + update_comment_meta( $comment_id, $add_to, $add_to_list ); + return true; } // If the user had previously cast the opposite vote, undo that older vote. Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss =================================================================== --- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss (revision 3301) +++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss (working copy) @@ -1132,7 +1132,6 @@ } .source-code-container { - border-right: 1px solid #dfdfdf; overflow-x: auto; overflow-y: hidden; } @@ -1154,6 +1153,15 @@ // User contributed notes &.single-wp-parser-function, &.single-wp-parser-method, &.single-wp-parser-hook { + + .bad-note .comment-content { + opacity: .6; + } + + .bad-note .comment-content:hover { + opacity: 1; + } + .comment-list, .comment-list ol { list-style: none; @@ -1162,42 +1170,37 @@ } .comment-list li { - padding: 2rem 1.5rem 1rem; + margin-top: 2.5rem; background: #fff; overflow: auto; + border: 1px solid #dfdfdf; + border-radius: 2px; - &:first-child { - padding-top: 1rem; - } - article { - border-bottom: 1px solid #dfdfdf; - padding-bottom: 1em; overflow: auto; } } .comment-list .avatar { float: left; - width: 2.5em; - height: 2.5em; - margin: -0.5em 1em 0.5em 0; + margin: -2px 1em 0 0; padding: 0.125em; border: 1px solid #eee; } .comment-author-attribution { - font-weight: bold; } .comment-meta { - margin: 0 0 1.5em 0; - font-size: 0.75em; + padding: .5em 1em; + background-color: #f7f7f7; + overflow: auto; } .comment-meta .comment-author cite, .comment-meta .comment-author cite a { } + .comment-meta a { } @@ -1209,8 +1212,24 @@ margin-left: 3.75rem; margin-left: 0; clear: both; + padding: 2rem 1.5rem .5rem; } + .comment-footer { + margin: 0 1em; + padding: 0 0 1em 0; + position: relative; + overflow: auto; + + a { + float: right; + } + + p { + margin-bottom: 0; + } + } + .comment-content ol { list-style: decimal inside; margin: 0 0 1.5em 0; @@ -1267,7 +1286,12 @@ .comment-author { float: left; + line-height: 1.8; } + + #add-user-note { + font-size: 1.6rem; + } } &.single-post { @@ -1413,10 +1437,9 @@ } .user-note-voting { - font-size: 1.5em; + font-size: 1.2em; clear: left; float: left; - margin-top: -5px; margin-right: 10px; } .user-note-voting-up .dashicons, .user-note-voting-down .dashicons { @@ -1428,6 +1451,12 @@ .user-note-voting-up { margin-left: -9px; } + + span.user-note-voting-up, + span.user-note-voting-down { + cursor: default; + } + .user-note-voting-count { margin-right: -2px; } Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css =================================================================== --- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css (revision 3301) +++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css (working copy) @@ -1315,7 +1315,6 @@ padding-left: 0; } .devhub-wrap .source-code-container { - border-right: 1px solid #dfdfdf; overflow-x: auto; overflow-y: hidden; } @@ -1330,6 +1329,12 @@ .devhub-wrap .comment-content a { word-wrap: break-word; } +.devhub-wrap.single-wp-parser-function .bad-note .comment-content, .devhub-wrap.single-wp-parser-method .bad-note .comment-content, .devhub-wrap.single-wp-parser-hook .bad-note .comment-content { + opacity: .6; +} +.devhub-wrap.single-wp-parser-function .bad-note .comment-content:hover, .devhub-wrap.single-wp-parser-method .bad-note .comment-content:hover, .devhub-wrap.single-wp-parser-hook .bad-note .comment-content:hover { + opacity: 1; +} .devhub-wrap.single-wp-parser-function .comment-list, .devhub-wrap.single-wp-parser-function .comment-list ol, .devhub-wrap.single-wp-parser-method .comment-list, .devhub-wrap.single-wp-parser-method .comment-list ol, .devhub-wrap.single-wp-parser-hook .comment-list, @@ -1339,39 +1344,45 @@ padding: 0; } .devhub-wrap.single-wp-parser-function .comment-list li, .devhub-wrap.single-wp-parser-method .comment-list li, .devhub-wrap.single-wp-parser-hook .comment-list li { - padding: 2rem 1.5rem 1rem; + margin-top: 2.5rem; background: #fff; overflow: auto; + border: 1px solid #dfdfdf; + border-radius: 2px; } -.devhub-wrap.single-wp-parser-function .comment-list li:first-child, .devhub-wrap.single-wp-parser-method .comment-list li:first-child, .devhub-wrap.single-wp-parser-hook .comment-list li:first-child { - padding-top: 1rem; -} .devhub-wrap.single-wp-parser-function .comment-list li article, .devhub-wrap.single-wp-parser-method .comment-list li article, .devhub-wrap.single-wp-parser-hook .comment-list li article { - border-bottom: 1px solid #dfdfdf; - padding-bottom: 1em; overflow: auto; } .devhub-wrap.single-wp-parser-function .comment-list .avatar, .devhub-wrap.single-wp-parser-method .comment-list .avatar, .devhub-wrap.single-wp-parser-hook .comment-list .avatar { float: left; - width: 2.5em; - height: 2.5em; - margin: -0.5em 1em 0.5em 0; + margin: -2px 1em 0 0; padding: 0.125em; border: 1px solid #eee; } -.devhub-wrap.single-wp-parser-function .comment-author-attribution, .devhub-wrap.single-wp-parser-method .comment-author-attribution, .devhub-wrap.single-wp-parser-hook .comment-author-attribution { - font-weight: bold; -} .devhub-wrap.single-wp-parser-function .comment-meta, .devhub-wrap.single-wp-parser-method .comment-meta, .devhub-wrap.single-wp-parser-hook .comment-meta { - margin: 0 0 1.5em 0; - font-size: 0.75em; + padding: .5em 1em; + background-color: #f7f7f7; + overflow: auto; } .devhub-wrap.single-wp-parser-function .comment-content, .devhub-wrap.single-wp-parser-method .comment-content, .devhub-wrap.single-wp-parser-hook .comment-content { margin-left: 60px; margin-left: 3.75rem; margin-left: 0; clear: both; + padding: 2rem 1.5rem .5rem; } +.devhub-wrap.single-wp-parser-function .comment-footer, .devhub-wrap.single-wp-parser-method .comment-footer, .devhub-wrap.single-wp-parser-hook .comment-footer { + margin: 0 1em; + padding: 0 0 1em 0; + position: relative; + overflow: auto; +} +.devhub-wrap.single-wp-parser-function .comment-footer a, .devhub-wrap.single-wp-parser-method .comment-footer a, .devhub-wrap.single-wp-parser-hook .comment-footer a { + float: right; +} +.devhub-wrap.single-wp-parser-function .comment-footer p, .devhub-wrap.single-wp-parser-method .comment-footer p, .devhub-wrap.single-wp-parser-hook .comment-footer p { + margin-bottom: 0; +} .devhub-wrap.single-wp-parser-function .comment-content ol, .devhub-wrap.single-wp-parser-method .comment-content ol, .devhub-wrap.single-wp-parser-hook .comment-content ol { list-style: decimal inside; margin: 0 0 1.5em 0; @@ -1405,7 +1416,11 @@ } .devhub-wrap.single-wp-parser-function .comment-author, .devhub-wrap.single-wp-parser-method .comment-author, .devhub-wrap.single-wp-parser-hook .comment-author { float: left; + line-height: 1.8; } +.devhub-wrap.single-wp-parser-function #add-user-note, .devhub-wrap.single-wp-parser-method #add-user-note, .devhub-wrap.single-wp-parser-hook #add-user-note { + font-size: 1.6rem; +} .devhub-wrap.single-post .comment-list, .devhub-wrap.single-post .comment-list ol { list-style: none; @@ -1516,10 +1531,9 @@ color: #555 !important; } .devhub-wrap .user-note-voting { - font-size: 1.5em; + font-size: 1.2em; clear: left; float: left; - margin-top: -5px; margin-right: 10px; } .devhub-wrap .user-note-voting-up .dashicons, .devhub-wrap .user-note-voting-down .dashicons { @@ -1531,6 +1545,10 @@ .devhub-wrap .user-note-voting-up { margin-left: -9px; } +.devhub-wrap span.user-note-voting-up, +.devhub-wrap span.user-note-voting-down { + cursor: default; +} .devhub-wrap .user-note-voting-count { margin-right: -2px; }