Changeset 813

Timestamp:

08/26/2014 08:04:21 AM (10 years ago)

Author:

coffee2code

Message:

Code Reference: allow for mixed text and code in examples

• Enable shortcode support in comments
• Allow for mixed code and text in examples
• Move functions and handling related to user submitted content into inc/user-content.php
• Add padding around comments

Location:

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

Files:

• functions.php (modified) (4 diffs)
• inc/template-tags.php (modified) (1 diff)
• inc/user-content.php (added)
• scss/main.scss (modified) (1 diff)
• stylesheets/main.css (modified) (1 diff)

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

@@ -30 +30 @@
     require __DIR__ . '/inc/breadcrumb-trail.php';
 }
+
+/**
+ * User-submitted content (comments, examples, etc).
+ */
+require __DIR__ . '/inc/user-content.php';
 
 /**
@@ -58 +63 @@
     add_filter( 'the_excerpt', __NAMESPACE__ . '\\lowercase_P_dangit_just_once' );
     add_filter( 'the_content', __NAMESPACE__ . '\\make_doclink_clickable', 10, 5 );
-    add_filter( 'comments_open', __NAMESPACE__ . '\\can_user_post_example', 10, 2 );
 
     // Add the handbook's 'Watch' action link.
@@ -65 +69 @@
     }
 
-    // Temporarily disable comments
-    //add_filter( 'comments_open', '__return_false' );
-
     add_filter( 'breadcrumb_trail_items',  __NAMESPACE__ . '\\breadcrumb_trail_items', 10, 2 );
 
-    treat_comments_as_examples();
 }
 
@@ -356 +356 @@
     wp_enqueue_script( 'wporg-developer-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120206', true );
     wp_enqueue_script( 'wporg-developer-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
-
-    if ( is_singular() && ( '0' != get_comments_number() || post_type_has_source_code() ) ) {
-        wp_enqueue_script( 'wporg-developer-function-reference', get_template_directory_uri() . '/js/function-reference.js', array( 'jquery', 'syntaxhighlighter-core', 'syntaxhighlighter-brush-php' ), '20140515', true );
-        wp_enqueue_style( 'syntaxhighlighter-core' );
-        wp_enqueue_style( 'syntaxhighlighter-theme-default' );
-
-        wp_enqueue_script( 'wporg-developer-code-examples', get_template_directory_uri() . '/js/code-example.js', array(), '20140423', true );
-        if ( get_option( 'thread_comments' ) ) {
-            wp_enqueue_script( 'comment-reply' );
-        }
-    }
-}
-
-/**
- * Handles adding/removing hooks to enable comments as examples.
- *
- * Mostly gives users greater permissions in terms of comment content.
- *
- * In order to submit code examples, users must be able to post with less restrictions.
- */
-function treat_comments_as_examples() {
-    // Restricts commenting to logged in users.
-    add_filter( 'comments_open', __NAMESPACE__ . '\\prevent_invalid_comment_submissions', 10, 2 );
-
-    if ( ! current_user_can( 'unfiltered_html' ) ) {
-        remove_filter( 'pre_comment_content', 'wp_filter_kses'      );
-        add_filter(    'pre_comment_content', 'wp_filter_post_kses' );
-    }
-
-    // Force comment registration to be true
-    add_filter( 'pre_option_comment_registration', '__return_true' );
-
-    // Force comment moderation to be true
-    add_filter( 'pre_option_comment_moderation',   '__return_true' );
-
-    // Remove reply to link
-    add_filter( 'comment_reply_link',              '__return_empty_string' );
-
-/*  foreach ( array( 'comment_save_pre', 'pre_comment_content' ) as $filter ) {
-        add_filter( $filter, 'balanceTags', 50 );
-    }*/
-
-    remove_filter( 'comment_text',        'capital_P_dangit',   31 );
-
-    remove_filter( 'comment_text',        'wptexturize'            );
-    remove_filter( 'comment_text',        'convert_chars'          );
-    remove_filter( 'comment_text',        'make_clickable',      9 );
-    remove_filter( 'comment_text',        'force_balance_tags', 25 );
-    remove_filter( 'comment_text',        'convert_smilies',    20 );
-    remove_filter( 'comment_text',        'wpautop',            30 );
-
-    remove_filter( 'pre_comment_content', 'wp_rel_nofollow',    15 );
-
-    // Be more permissive with content of examples.
-    // Note: the content gets fully escaped via 'get_comment_text'.
-    if ( post_type_supports_examples() ) {
-        if ( current_user_can( 'unfiltered_html' ) ) {
-            remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-        } else {
-            remove_filter( 'pre_comment_content', 'wp_filter_kses' );
-        }
-    }
-
-    add_filter( 'get_comment_text',  __NAMESPACE__ . '\\escape_example_content' );
-}
-
-/**
- * Escapes the entirety of the content for examples.
- *
- * @param  string $text The comment/example content.
- * @return string
- */
-function escape_example_content( $text ) {
-    // Only proceed if the post type is one that has examples.
-    if ( ! post_type_supports_examples() ) {
-        return $text;
-    }
-
-    return htmlentities( $text );
-}
-
-/**
- * Disables commenting to invalid or non-users.
- *
- * @param bool  $status Default commenting status for post.
- * @return bool False if commenter isn't a user, otherwise the passed in status.
- */
-function prevent_invalid_comment_submissions( $status, $post_id ) {
-    if ( $_POST && ( ! is_user_logged_in() || ! is_user_member_of_blog() ) ) {
-        return false;
-    }
-
-    return $status;
 }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php

@@ -93 +93 @@
                 <li id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
                 <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
-                    <div class="comment-content code-example-container">
-                        <pre class="brush: php; toolbar: false;"><?php comment_text(); /* Fully escaped via filter */ ?></pre>
+                    <div class="comment-content">
+                        <?php comment_text(); ?>
                     </div>
                     <!-- .comment-content -->

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss

@@ -973 +973 @@
 
     .comment-list li {
-        padding: 24px 24px 0 24px;
-        padding: 1.5rem 1.5rem 0 1.5rem;
+        padding: 2rem 1.5rem 1rem;
         border: 0 solid #eee;
         border-bottom-width: 1px;
         background: #fff;
-    }
-
-    .comment-list li:first-child {
-        padding-top: 0;
+
+        &:first-child {
+            padding-top: 1rem;
+        }
     }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css

@@ -1162 +1162 @@
 }
 .devhub-wrap .comment-list li {
-  padding: 24px 24px 0 24px;
-  padding: 1.5rem 1.5rem 0 1.5rem;
+  padding: 2rem 1.5rem 1rem;
   border: 0 solid #eee;
   border-bottom-width: 1px;
   background: #fff;
 }
-.devhub-wrap .comment-list li {
-  padding-top: 0;
+.devhub-wrap .comment-list li:first-child {
+  padding-top: 1rem;
 }
 .devhub-wrap .comment-list .avatar {