Changeset 11352

Timestamp:

12/02/2021 12:59:04 AM (3 years ago)

Author:

tellyworth

Message:

WordPress.org Learn: sync with GitHub

Props hlashbrooke.

​https://github.com/WordPress/learn/compare/fa76b2cdf5c9b979585f3142d62949ae4c0ca91d...4b476da0d46f52c39505379eeb202561bf0d37db

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/wporg-learn/inc/blocks.php (modified) (1 diff)
• plugins/wporg-learn/views/block-workshop-details.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/functions.php (modified) (5 diffs)
• themes/pub/wporg-learn-2020/header.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/page.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/sidebar-lesson-plan.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/template-parts/component-taxonomy-item.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php

@@ -72 +72 @@
  */
 function workshop_details_render_callback( $attributes, $content ) {
-    $post     = get_post();
-    $topics   = wp_get_post_terms( $post->ID, 'topic', array( 'fields' => 'names' ) );
-    $level    = wp_get_post_terms( $post->ID, 'level', array( 'fields' => 'names' ) );
-    $captions = get_post_meta( $post->ID, 'video_caption_language' );
+    $post      = get_post();
+    $topic_ids = wp_get_post_terms( $post->ID, 'topic', array( 'fields' => 'ids' ) );
+    $level     = wp_get_post_terms( $post->ID, 'level', array( 'fields' => 'names' ) );
+    $captions  = get_post_meta( $post->ID, 'video_caption_language' );
+
+    $topic_names = array();
+    foreach ( $topic_ids as $id ) {
+        $topic_names[] = get_term( $id )->name;
+    }
 
     $fields = array(
-        __( 'Length', 'wporg-learn' )   => get_workshop_duration( $post, 'string' ),
-        __( 'Topic', 'wporg-learn' )    => implode( ', ', array_map( 'esc_html', $topics ) ),
-        __( 'Level', 'wporg-learn' )    => implode( ', ', array_map( 'esc_html', $level ) ),
-        __( 'Language', 'wporg-learn' ) => esc_html( get_locale_name_from_code( $post->video_language, 'native' ) ),
-        __( 'Subtitles', 'wporg-learn' ) => implode(
-            ', ',
-            array_map(
+        'length' => array(
+            'label' => __( 'Length', 'wporg-learn' ),
+            'param' => array(),
+            'value' => array( get_workshop_duration( $post, 'string' ) ),
+        ),
+        'topic' => array(
+            'label' => __( 'Topic', 'wporg-learn' ),
+            'param' => $topic_ids,
+            'value' => $topic_names,
+        ),
+        'level' => array(
+            'label' => __( 'Level', 'wporg-learn' ),
+            'param' => array(),
+            'value' => $level,
+        ),
+        'language' => array(
+            'label' => __( 'Language', 'wporg-learn' ),
+            'param' => array( $post->video_language ),
+            'value' => array( esc_html( get_locale_name_from_code( $post->video_language, 'native' ) ) ),
+        ),
+        'captions' => array(
+            'label' => __( 'Subtitles', 'wporg-learn' ),
+            'param' => $captions,
+            'value' => array_map(
                 function( $caption_lang ) {
                     return esc_html( get_locale_name_from_code( $caption_lang, 'native' ) );
                 },
                 $captions
-            )
-        ),
-    );
-
-    // Remove empty fields.
-    $fields = array_filter( $fields );
+            ),
+        ),
+    );
+
+    // Remove fields with empty values.
+    $fields = array_filter( $fields, function( $data ) {
+        return $data['value'];
+    } );
 
     $lesson_id = get_post_meta( $post->ID, 'linked_lesson_id', true );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/block-workshop-details.php

@@ -18 +18 @@
     <?php if ( ! empty( $fields ) ) : ?>
         <ul class="workshop-details-list">
-            <?php foreach ( $fields as $key => $value ) : ?>
+            <?php foreach ( $fields as $key => $field ) : ?>
                 <li>
-                    <b><?php echo esc_html( $key ); ?></b>
-                    <span><?php echo esc_html( $value ); ?></span>
+                    <b><?php echo esc_html( $field['label'] ); ?></b>
+                    <span>
+                        <?php
+                        $i = 0;
+                        foreach ( $field['value'] as $field_key => $value ) {
+                            $url = '';
+                            if ( ! empty( $field['param'] ) ) {
+                                $url = trailingslashit( site_url() ) . 'workshops/?' . $key . '=' . $field['param'][ $field_key ];
+                            }
+
+                            if ( 0 < $i ) {
+                                echo ', ';
+                            }
+
+                            if ( $url ) {
+                                echo '<a href="' . esc_url( $url ) . '">' . esc_html( $value ) . '</a>';
+                            } else {
+                                echo esc_html( $value );
+                            }
+                            $i++;
+                        }
+                        ?>
+                    </span>
                 </li>
             <?php endforeach; ?>

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

@@ -166 +166 @@
 
 /**
- * Get the values associated to the page/post
+ * Get the values associated to the page/post formatted as a string
  *
  * @param string $post_id Id of the post.
@@ -180 +180 @@
 
 /**
+ * Get the values associated to the page/post formatted as an array
+ *
+ * @param string $post_id Id of the post.
+ * @param string $tax_slug The slug for the custom taxonomy.
+ *
+ * @return array
+ */
+function wporg_learn_get_taxonomy_terms_array( $post_id, $tax_slug ) {
+    $term_ids = wp_get_post_terms( $post_id, $tax_slug, array( 'fields' => 'ids' ) );
+
+    $terms = array();
+    foreach ( $term_ids as $id ) {
+        $terms[ $id ] = get_term( $id )->name;
+    }
+
+    return $terms;
+}
+
+/**
+ * Get the values associated to the page/post according to the context
+ *
+ * @param  int    $post_id  ID of the post.
+ * @param  string $tax_slug The slug for the custom taxonomy.
+ * @param  string $context  The context for display.
+ *
+ * @return array|string
+ */
+function wporg_learn_get_taxonomy_terms( $post_id, $tax_slug, $context ) {
+    switch ( $context ) {
+        case 'archive':
+            return wporg_learn_get_taxonomy_terms_string( $post_id, $tax_slug );
+            break;
+        case 'single':
+            return wporg_learn_get_taxonomy_terms_array( $post_id, $tax_slug );
+            break;
+    }
+}
+
+/**
  * Returns the taxonomies associated to a lesson or workshop
  *
@@ -186 +225 @@
  * @return array
  */
-function wporg_learn_get_lesson_plan_taxonomy_data( $post_id ) {
+function wporg_learn_get_lesson_plan_taxonomy_data( $post_id, $context ) {
     return array(
         array(
             'icon'  => 'clock',
+            'slug'  => 'duration',
             'label' => wporg_label_with_colon( get_taxonomy_labels( get_taxonomy( 'duration' ) )->singular_name ),
-            'value' => wporg_learn_get_taxonomy_terms_string( $post_id, 'duration' ),
+            'value' => wporg_learn_get_taxonomy_terms( $post_id, 'duration', $context ),
         ),
         array(
             'icon'  => 'admin-users',
+            'slug'  => 'audience',
             'label' => wporg_label_with_colon( get_taxonomy_labels( get_taxonomy( 'audience' ) )->singular_name ),
-            'value' => wporg_learn_get_taxonomy_terms_string( $post_id, 'audience' ),
+            'value' => wporg_learn_get_taxonomy_terms( $post_id, 'audience', $context ),
         ),
         array(
             'icon'  => 'dashboard',
+            'slug'  => 'level',
             'label' => wporg_label_with_colon( get_taxonomy_labels( get_taxonomy( 'level' ) )->singular_name ),
-            'value' => wporg_learn_get_taxonomy_terms_string( $post_id, 'level' ),
+            'value' => wporg_learn_get_taxonomy_terms( $post_id, 'level', $context ),
         ),
         array(
             'icon'  => 'welcome-learn-more',
+            'slug'  => 'type',
             'label' => wporg_label_with_colon( get_taxonomy_labels( get_taxonomy( 'instruction_type' ) )->singular_name ),
-            'value' => wporg_learn_get_taxonomy_terms_string( $post_id, 'instruction_type' ),
+            'value' => wporg_learn_get_taxonomy_terms( $post_id, 'instruction_type', $context ),
         ),
     );
@@ -301 +344 @@
     if ( $query->is_main_query() && $query->is_search() ) {
         $public_post_types = array_keys( get_post_types( array( 'public' => true ) ) );
-        $omit_from_search = array( 'attachment', 'lesson', 'quiz', 'sensei_message', 'meeting' );
+        $omit_from_search = array( 'attachment', 'page', 'lesson', 'quiz', 'sensei_message', 'meeting' );
         $searchable_post_types = array_diff( $public_post_types, $omit_from_search );
+
+        // Only show featured courses, but don't limit other post types
+        $query->set(
+            'meta_query',
+            array(
+                'relation' => 'OR',
+                array(
+                    'key'   => '_course_featured',
+                    'value' => 'featured',
+                ),
+                array(
+                    'key'      => '_course_featured',
+                    'compare'  => 'NOT EXISTS',
+                ),
+            )
+        );
 
         $query->set( 'post_type', $searchable_post_types );
@@ -564 +623 @@
 
         case 'lesson-plan':
-            $args['meta'] = wporg_learn_get_lesson_plan_taxonomy_data( $post_id );
+            $args['meta'] = wporg_learn_get_lesson_plan_taxonomy_data( $post_id, 'archive' );
             break;
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php

@@ -50 +50 @@
                     <?php get_search_form(); ?>
                 </div>
-                <?php elseif ( is_page() ) : ?>
-                <h1 class="site-title"><a href="<?php echo esc_url( get_the_permalink() ); ?>" rel="home"><?php the_title(); ?></a></h1>
                 <?php else : ?>
                 <p class="site-title">

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/page.php

@@ -21 +21 @@
         <?php get_template_part( 'template-parts/component', 'breadcrumbs' ); ?>
 
+        <div class="row align-middle between section-heading section-heading--with-space">
+            <?php the_title( '<h1 class="section-heading_title h2">', '</h1>' ); ?>
+        </div>
+        <hr>
+
         <div id="main-content">
             <?php

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/sidebar-lesson-plan.php

@@ -15 +15 @@
         <ul>
             <?php
-            foreach ( wporg_learn_get_lesson_plan_taxonomy_data( get_the_ID() ) as $detail ) {
+            foreach ( wporg_learn_get_lesson_plan_taxonomy_data( get_the_ID(), 'single' ) as $detail ) {
                 if ( ! empty( $detail['value'] ) ) {
                     include locate_template( 'template-parts/component-taxonomy-item.php' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-taxonomy-item.php

@@ -14 +14 @@
     <span><?php echo esc_html( $detail['label'] ); ?></span>
     <strong>
-        <span><?php echo esc_html( $detail['value'] ); ?></span>
+        <span>
+            <?php //echo esc_html( $detail['value'] ); ?>
+
+            <?php
+            $i = 0;
+            foreach ( $detail['value'] as $key => $value ) {
+                $url = trailingslashit( site_url() ) . 'lesson-plans/?' . $detail['slug'] . '[]=' . $key;
+
+                if ( 0 < $i ) {
+                    echo ', ';
+                }
+
+                echo '<a href="' . esc_attr( $url ) . '">' . esc_html( $value ) . '</a>';
+                $i++;
+            }
+            ?>
+        </span>
     </strong>
 </li>