Changeset 9037

Timestamp:

07/10/2019 11:03:12 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Make/Meetings: Allow filtering the list of meetings by clicking on a team name.

Props mikeschroder, garrett-eclipse, SergeyBiryukov.
Fixes #4595.

Location:

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

Files:

• plugins/wporg-meeting-posttype/wporg-meeting-posttype.php (modified) (2 diffs)
• themes/pub/wporg-makehome/archive-meeting.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php

@@ -182 +182 @@
             'singular_name'       => _x( 'Meeting', 'Post Type Singular Name', 'wporg' ),
             'menu_name'           => __( 'Meetings', 'wporg' ),
-            'name_admin_bar'      => __( 'Meetings', 'wporg' ),
+            'name_admin_bar'      => __( 'Meeting', 'wporg' ),
             'parent_item_colon'   => __( 'Parent Meeting:', 'wporg' ),
             'all_items'           => __( 'All Meetings', 'wporg' ),
@@ -492 +492 @@
             $display_more = $query->found_posts - intval( $limit );
             if ( $display_more > 0 ) {
-                $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_more ) . '</a>';
+                $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings/#' . esc_attr( strtolower( $attr['team'] ) ) . '">' . sprintf( __( '(+%s more)'), $display_more ) . '</a>';
             }
             $out .= '</br>';

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/archive-meeting.php

@@ -5 +5 @@
         <h2 class="title all"><?php _e( 'Upcoming WordPress Meetings', 'make-wporg' ); ?></h2>
         <h2 class="title team"><?php _e( 'Upcoming Team Meetings', 'make-wporg' ); ?></h2>
-        <a class="team" href="/meetings"><?php _e( 'Show meetings for other teams', 'make-wporg' ); ?></a>
+        <a class="team" href="/meetings/"><?php _e( 'Show meetings for other teams', 'make-wporg' ); ?></a>
     </div>
 <table class="schedule">
@@ -19 +19 @@
     <?php while( have_posts() ): the_post(); ?>
         <tr id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-            <td><?php echo $post->team; ?></td>
+            <td class="team"><?php
+                printf(
+                    '<a href="#%s">%s</a>',
+                    esc_attr( strtolower( $post->team ) ),
+                    $post->team
+                );
+            ?></td>
             <td><?php
                 $title = get_the_title();
@@ -118 +124 @@
 
         // Allow client side filtering using # in url
-        var hash = window.location.hash.replace('#','');
-        if (hash) {
+        var filterByTeam = function(team) {
+            team = team.replace('#','');
+
             var rowsToRemove = $('.schedule').find('tr td:nth-child(1)').filter(function() {
-                var reg = new RegExp(hash, "i");
+                var reg = new RegExp(team, "i");
                 return !reg.test($(this).text());
             });
 
             for (var i = 0; i < rowsToRemove.length; i++) {
-                $(rowsToRemove[i]).parent().remove();
+                $(rowsToRemove[i]).parent().hide();
             }
 
+            $('.header-section').find('.all').hide();
             $('.header-section').find('.team').show();
+        }
+
+        var showAllMeetings = function() {
+            $('.schedule').find('tr').each(function() {
+                $(this).show();
+            });
+
+            $('.header-section').find('.team').hide();
+            $('.header-section').find('.all').show();
+        }
+
+        if (window.location.hash) {
+            filterByTeam(window.location.hash);
         }
         else {
             $('.header-section').find('.all').show();
         }
+
+        $('.schedule .team a').click(function() {
+            var team = $(this).attr('href');
+            filterByTeam(team);
+            window.location.hash = team;
+            return false;
+        });
+
+        $('.header-section a.team').click(function() {
+            showAllMeetings();
+            window.location.hash = '';
+            return false;
+        });
 
         // avoid page flickers on load