Ticket #2850: 2850.2.diff

wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php

@@ -281 +281 @@
                         'order'          => 'desc',
                         'track'          => '',
                         'speaker_link'   => '',
+                        'groups'         => '',
                 ), $attr );
 
                 foreach ( array( 'orderby', 'order', 'track', 'speaker_link' ) as $key_for_case_sensitive_value ) {
@@ -292 +293 @@
                 $attr['order']        = in_array( $attr['order'],        array( 'asc', 'desc'           ) ) ? $attr['order']        : 'desc';
                 $attr['speaker_link'] = in_array( $attr['speaker_link'], array( 'permalink'             ) ) ? $attr['speaker_link'] : '';
                 $attr['track']        = array_map( 'trim', explode( ',', $attr['track'] ) );
+                $attr['groups']       = array_map( 'trim', explode( ',', $attr['groups'] ) );
 
                 // Fetch all the relevant sessions
                 $session_args = array(
@@ -347 +349 @@
                         $speaker_args['post__in'] = $speaker_ids;
                 }
 
+                if ( ! empty( $attr['groups'] ) ) {
+                        $speaker_args['tax_query'] = array(
+                                array(
+                                        'taxonomy' => 'wcb_speaker_group',
+                                        'field'    => 'slug',
+                                        'terms'    => $attr['groups'],
+                                ),
+                        );
+                }
+
                 $speakers = new WP_Query( $speaker_args );
 
                 if ( ! $speakers->have_posts() )
@@ -861 +873 @@
         /**
          * The [sessions] shortcode handler
          */
+
         function shortcode_sessions( $attr, $content ) {
                 global $post;
 
@@ -1384 +1397 @@
                         )
                 );
 
-                $sessions_html .= '<ul id="speaker-session-names">';
                 while ( $sessions->have_posts() ) {
                         $sessions->the_post();
-                        $sessions_html .= sprintf( '<li><a href="%s">%s</a></li>', get_the_permalink(), get_the_title() );
+
+                        $links = array();
+
+                        if ( $url = get_post_meta( get_the_ID(), '_wcpt_session_slides', true ) ) {
+                                $links['slides'] = array(
+                                        'url'   => $url,
+                                        'label' => __( 'Slides', 'wordcamporg' ),
+                                );
+                        }
+
+                        if ( $url = get_post_meta( get_the_ID(), '_wcpt_session_video', true ) ) {
+                                $links['video'] = array(
+                                        'url'   => $url,
+                                        'label' => __( 'Video', 'wordcamporg' ),
+                                );
+                        }
+
+                        $sessions_html .= sprintf( '<div id="wcorg-session-%s" class="wcorg-session">', absint( get_the_ID() ) );
+                        $sessions_html .= sprintf( '<h3 class="wcorg-session-title"><a href="%s">%s</a></h3>', esc_url( get_permalink() ), esc_html( get_the_title() ) );
+                        $sessions_html .= '<div class="wcorg-session-description">';
+                        $sessions_html .= get_the_excerpt();
+
+                        if ( $links ) {
+                                $sessions_html .= '<ul class="wcorg-session-links">';
+
+                                foreach ( $links as $link ) {
+                                        $sessions_html .= sprintf(
+                                                '<li>
+                                                        <a href="%s">%s</a>
+                                                </li>',
+                                                esc_url( $link['url'] ),
+                                                esc_html( $link['label'] )
+                                        );
+                                }
+
+                                $sessions_html .= '</ul>';
+                        }
+
+                        $sessions_html .= '</div></div>';
+
                 }
-                $sessions_html .= '</ul>';
 
                 wp_reset_postdata();
 
@@ -2056 +2106 @@
                                 'show_ui'      => true,
                         )
                 );
+
+                // Labels for speaker groups.
+                $labels = array(
+                        'name'          => __( 'Groups',         'wordcamporg' ),
+                        'singular_name' => __( 'Group',          'wordcamporg' ),
+                        'search_items'  => __( 'Search Groups',  'wordcamporg' ),
+                        'popular_items' => __( 'Popular Groups', 'wordcamporg' ),
+                        'all_items'     => __( 'All Groups',     'wordcamporg' ),
+                        'edit_item'     => __( 'Edit Group',     'wordcamporg' ),
+                        'update_item'   => __( 'Update Group',   'wordcamporg' ),
+                        'add_new_item'  => __( 'Add Group',      'wordcamporg' ),
+                        'new_item_name' => __( 'New Group',      'wordcamporg' ),
+                );
+
+                // Register speaker groups taxonomy
+                register_taxonomy(
+                        'wcb_speaker_group',
+                        'wcb_speaker',
+                        array(
+                                'labels'       => $labels,
+                                'rewrite'      => array( 'slug' => 'speaker-group' ),
+                                'query_var'    => 'group',
+                                'hierarchical' => true,
+                                'public'       => true,
+                                'show_ui'      => true,
+                        )
+                );
         }
 
         /**