Ticket #3078: 3078.3.diff

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

@@ -30 +30 @@
                 add_action( 'admin_head',                         array( $mpt, 'meeting_column_width' ) );
                 add_action( 'admin_bar_menu',                     array( $mpt, 'add_edit_meetings_item_to_admin_bar' ), 80 );
                 add_action( 'wp_enqueue_scripts',                 array( $mpt, 'add_edit_meetings_icon_to_admin_bar' ) );
+                add_shortcode( 'meeting_time',                    array( $mpt, 'meeting_time_shortcode' ) );
         }
 
         public function meeting_column_width() { ?>
@@ -64 +65 @@
                 $query->set( 'nopaging', true );
 
                 // meta query to eliminate expired meetings from query
-                $query->set( 'meta_query', array(
-                        'relation'=>'OR',
-                                // not recurring  AND start_date >= CURDATE() = one-time meeting today or still in future
-                                array(
-                                        'relation'=>'AND',
-                                        array(
-                                                'key'=>'recurring',
-                                                'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
-                                                'compare'=>'NOT IN',
-                                        ),
-                                        array(
-                                                'key'=>'start_date',
-                                                'type'=>'DATE',
-                                                'compare'=>'>=',
-                                                'value'=>'CURDATE()',
-                                        )
-                                ),
-                                // recurring = 1 AND ( end_date = '' OR end_date > CURDATE() ) = recurring meeting that has no end or has not ended yet
-                                array(
-                                        'relation'=>'AND',
-                                        array(
-                                                'key'=>'recurring',
-                                                'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
-                                                'compare'=>'IN',
-                                        ),
-                                        array(
-                                                'relation'=>'OR',
-                                                array(
-                                                        'key'=>'end_date',
-                                                        'value'=>'',
-                                                        'compare'=>'=',
-                                                ),
-                                                array(
-                                                        'key'=>'end_date',
-                                                        'type'=>'DATE',
-                                                        'compare'=>'>',
-                                                        'value'=>'CURDATE()',
-                                                )
-                                        )
-                                ),
-                        )
-                );
+                $query->set( 'meta_query', $this->meeting_meta_query );
 
                 // WP doesn't understand CURDATE() and prepares it as a quoted string. Repair this:
                 add_filter( 'get_meta_sql', function ($sql) {
@@ -462 +422 @@
                 ' );
         }
 
+        /**
+         * Renders meeting information with the next meeting time based on user's local timezone. Used in Make homepage.
+         */
+        public function meeting_time_shortcode( $attr, $content = '' ) {
+
+                if ( empty( $attr['team'] ) ) {
+                        return '';
+                }
+
+                if ( $attr['team'] === 'Documentation' ) {
+                        $attr['team'] = 'Docs';
+                }
+
+                // turn off paging on the archive page, to show all meetings in the table
+                $query->set( 'nopaging', true );
+
+                // meta query to eliminate expired meetings from query
+                add_filter( 'get_meta_sql', function ($sql) {
+                        return str_replace( "'CURDATE()'", 'CURDATE()', $sql );
+                } );
+
+                $query = new WP_Query(
+                        array(
+                                'post_type' => 'meeting',
+                                'meta_query' => array(
+                                        'relation' => 'AND',
+                                        array(
+                                                'key'     => 'team',
+                                                'value'   => $attr['team'],
+                                                'compare' => 'EQUALS',
+                                        ),
+                                        $this->meeting_meta_query
+                                )
+                        )
+                );
+
+                if ( count( $query->posts ) > 0 ) {
+
+                        $post = $query->posts[0];
+                        $next_meeting_datestring = $post->next_date;
+                        $next_meeting_iso        = $next_meeting_datestring . 'T' . $post->time . ':00+00:00';
+                        $next_meeeting_timestamp = strtotime( $next_meeting_datestring . $post->time );
+        
+                        $out = '<p>';
+                        $out .= 'Next meeting: ' . __( $post->post_title );
+                        $display_count = count( $query->posts ) - 1;
+                        $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_count ) . '</a>';
+                        $out .= '</br>';
+                        $out .= '<time class="date" date-time="' . esc_attr( $next_meeting_iso ) . '">' . $next_meeting_iso . '</time> ';
+                        $out .= sprintf( __( '(%s from now)' ), human_time_diff( $next_meeeting_timestamp, current_time('timestamp') ) );
+                        $out .= empty( $post->location ) ? '' : ' ' . sprintf( __('at %s on Slack'), $post->location );
+                        $out .= '</p>';
+                }
+
+
+                return $out;
+        }
+
+        private $meeting_meta_query = array(
+                'relation'=>'OR',
+                        // not recurring  AND start_date >= CURDATE() = one-time meeting today or still in future
+                        array(
+                                'relation'=>'AND',
+                                array(
+                                        'key'=>'recurring',
+                                        'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
+                                        'compare'=>'NOT IN',
+                                ),
+                                array(
+                                        'key'=>'start_date',
+                                        'type'=>'DATE',
+                                        'compare'=>'>=',
+                                        'value'=>'CURDATE()',
+                                )
+                        ),
+                        // recurring = 1 AND ( end_date = '' OR end_date > CURDATE() ) = recurring meeting that has no end or has not ended yet
+                        array(
+                                'relation'=>'AND',
+                                array(
+                                        'key'=>'recurring',
+                                        'value'=>array( 'weekly', 'biweekly', 'occurrence', 'monthly', '1' ),
+                                        'compare'=>'IN',
+                                ),
+                                array(
+                                        'relation'=>'OR',
+                                        array(
+                                                'key'=>'end_date',
+                                                'value'=>'',
+                                                'compare'=>'=',
+                                        ),
+                                        array(
+                                                'key'=>'end_date',
+                                                'type'=>'DATE',
+                                                'compare'=>'>',
+                                                'value'=>'CURDATE()',
+                                        )
+                                )
+                        ),
+                );
 }
 
 // fire it up

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

@@ -1 +1 @@
 <?php get_header(); ?>
 
 <div class="wrapper">
-        <h2 class="title"><?php _e( 'Upcoming WordPress Meetings', 'make-wporg' ); ?></h2>
+        <div class="header-section">
+                <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>
+        </div>
 <table class="schedule">
         <thead>
                 <tr>
@@ -111 +115 @@
                                 }
                         }
                 }
+
+                // Allow client side filtering using # in url
+                var hash = window.location.hash.replace('#','');
+                if (hash) {
+                        var rowsToRemove = $('.schedule').find('tr td:nth-child(1)').filter(function() {
+                                var reg = new RegExp(hash, "i");
+                                return !reg.test($(this).text());
+                        });
+
+                        for (var i = 0; i < rowsToRemove.length; i++) {
+                                $(rowsToRemove[i]).parent().remove();
+                        }
+
+                        $('.header-section').find('.team').show();
+                }
+                else {
+                        $('.header-section').find('.all').show();
+                }
+
+                // avoid page flickers on load
+                $('.schedule').show();
         });
         </script>
 <?php

wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/front-page.php

@@ -8 +8 @@
         <div class="wrapper">
                 <h2 class="section-title"><?php _e( 'There are many different ways for you to get involved with WordPress:', 'make-wporg' ); ?></h2>
                 <div class="js-masonry" data-masonry-options='{ "itemSelector": ".make_site" }'>
-                <?php 
+                <?php
                         $sites_query = new WP_Query( 'post_type=make_site&posts_per_page=-1&order=ASC' );
                         $makesites = make_site_get_network_sites();
                 ?>
-                <?php while( $sites_query->have_posts() ) : $sites_query->the_post(); ?>
-                <?php 
-                        $make_site_id = get_post_meta( $post->ID, 'make_site_id', true );
-                        $url = $makesites[$make_site_id];
-                ?>      
+                <?php while ( $sites_query->have_posts() ) : $sites_query->the_post(); ?>
+                        <?php
+                                $make_site_id = get_post_meta( $post->ID, 'make_site_id', true );
+                                $url          = $makesites[ $make_site_id ];
+                ?>
                         <article id="site-<?php the_ID(); ?>" <?php post_class(); ?>>
                                 <h2>
                                         <?php if ( $url ) : ?>
-                                                <a href="<?php echo esc_url( $url ); ?>"><?php the_title(); ?></a>
+                                                <a 
+                                                        title="<?php printf( esc_attr( 'Learn more about %s.', 'make-wporg' ), esc_html( get_the_title() ) ); ?>"
+                                                        href="<?php echo esc_url( $url ); ?>"
+                                                ><?php the_title(); ?></a>
                                         <?php else : ?>
                                                 <?php the_title(); ?>
                                         <?php endif; ?>
                                 </h2>
-                                
+
                                 <div class="team-description">
                                         <?php the_content(); ?>
-                                        <?php if ( $url ) : ?>
-                                                <p><a href="<?php echo esc_url( $url ); ?>"><?php printf( __( 'Learn more about %s &raquo;', 'make-wporg' ), get_the_title() ); ?></a></p>
-                                        <?php endif; ?>
                                 </div>
-                                
-                                <?php  if ( '1' == get_post_meta( get_the_ID(), 'weekly_meeting', true ) ) : ?>
-                                        <small>
-                                                <p><?php printf( __( 'Weekly chats: %s', 'make-wporg' ), get_post_meta( get_the_ID(), 'weekly_meeting_when', true ) ); ?></p>
-                                                <p><?php echo get_post_meta( get_the_ID(), 'weekly_meeting_where', true ); ?></p>
-                                        </small>
-                                <?php endif; /**/ ?>
+
+                                <div class="team-meeting">
+                                        <?php
+                                                echo do_shortcode( sprintf( '[meeting_time team="%s"][/meeting_time]', $post->post_title ) );
+                                        ?>
+                                </div>
                         </article>
                 <?php endwhile; ?>
                 </div>
         </div>
 </section>
 
+<script type="text/javascript">
+
+        var parse_date = function (text) {
+                var m = /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\+00:00$/.exec(text);
+                var d = new Date();
+                d.setUTCFullYear(+m[1]);
+                d.setUTCDate(+m[3]);
+                d.setUTCMonth(+m[2]-1);
+                d.setUTCHours(+m[4]);
+                d.setUTCMinutes(+m[5]);
+                d.setUTCSeconds(+m[6]);
+                return d;
+        }
+        var format_time = function (d) {
+                return d.toLocaleTimeString(navigator.language, {weekday: 'long'});
+        }
+
+        var nodes = document.getElementsByTagName('time');
+        for (var i=0; i<nodes.length; ++i) {
+                var node = nodes[i];
+                if (node.className === 'date') {
+                        var d = parse_date(node.getAttribute('date-time'));
+                        if (d) {
+                                node.textContent = format_time(d);
+                        }
+                }
+        }
+</script>
 <?php get_footer(); ?>

wordpress.org/public_html/wp-content/themes/pub/wporg-makehome/style.css

@@ -203 +203 @@
         clear: left;
 }
 
-section.get-involved article h2:before {
+section.get-involved article h2 a:before {
         font-family: 'dashicons';
         content: '\f109';
         margin-right: 0.4em;
@@ -214 +214 @@
         -moz-osx-font-smoothing: grayscale;
 }
 
-section.get-involved article.make-core          h2:before { content: "\f475"; }
-section.get-involved article.make-design        h2:before { content: "\f309"; }
-section.get-involved article.make-mobile        h2:before { content: "\f470"; }
-section.get-involved article.make-accessibility h2:before { content: "\f483"; }
-section.get-involved article.make-polyglots     h2:before { content: '\f326'; }
-section.get-involved article.make-support       h2:before { content: "\f125"; }
-section.get-involved article.make-themes        h2:before { content: '\f100'; }
-section.get-involved article.make-plugins       h2:before { content: '\f106'; }
-section.get-involved article.make-docs          h2:before { content: '\f105'; }
-section.get-involved article.make-community     h2:before { content: '\f307'; }
-section.get-involved article.make-meta          h2:before { content: '\f325'; }
-section.get-involved article.make-training      h2:before { content: '\f118'; }
-section.get-involved article.make-flow          h2:before { content: '\f115'; }
-section.get-involved article.make-tv            h2:before { content: '\f235'; }
-section.get-involved article.make-marketing     h2:before { content: '\f130'; }
-section.get-involved article.make-cli           h2:before { content: '\f345'; }
-section.get-involved article.make-hosting       h2:before { content: '\f176'; }
-section.get-involved article.make-tide          h2:before { content: '\f10d'; }
+section.get-involved article.make-core          h2 a:before { content: "\f475"; }
+section.get-involved article.make-mobile        h2 a:before { content: "\f470"; }
+section.get-involved article.make-design        h2 a:before { content: "\f309"; }
+section.get-involved article.make-accessibility h2 a:before { content: "\f483"; }
+section.get-involved article.make-polyglots     h2 a:before { content: '\f326'; }
+section.get-involved article.make-support       h2 a:before { content: "\f125"; }
+section.get-involved article.make-themes        h2 a:before { content: '\f100'; }
+section.get-involved article.make-plugins       h2 a:before { content: '\f106'; }
+section.get-involved article.make-docs          h2 a:before { content: '\f105'; }
+section.get-involved article.make-community     h2 a:before { content: '\f307'; }
+section.get-involved article.make-meta          h2 a:before { content: '\f325'; }
+section.get-involved article.make-training      h2 a:before { content: '\f118'; }
+section.get-involved article.make-flow          h2 a:before { content: '\f115'; }
+section.get-involved article.make-tv            h2 a:before { content: '\f235'; }
+section.get-involved article.make-marketing     h2 a:before { content: '\f130'; }
+section.get-involved article.make-cli           h2 a:before { content: '\f345'; }
+section.get-involved article.make-hosting       h2 a:before { content: '\f176'; }
+section.get-involved article.make-tide          h2 a:before { content: '\f10d'; }
 
 section.get-involved article.featured-group h2:after {
         display: block;
@@ -243 +243 @@
 
 section.get-involved article h2 a {
         font-weight: 600;
-        color: #444444;
+}
+
+section.get-involved article h2 a {
+        font-weight: 600;
 }
 
 section.get-involved article div.team-description p {
@@ -252 +255 @@
         line-height: 1.5;
 }
 
-section.get-involved article small {
+div.team-meeting {
         display: block;
         font-size: 0.8em;
         font-style: italic;
-        opacity: 0.5;
+        opacity: 0.75;
         padding-top: 0.5em;
 }
 
-section.get-involved article small p {
+section.get-involved article .team-meeting {
         line-height: 1.5;
 }
 
@@ -304 +307 @@
 body.post-type-archive-meeting {
         background-color: white;
 }
-h2.title {
+
+.header-section{
         margin: 30px 10px;
+        font-size: 14px;
+}
+.header-section h2.title {
         font-size: 36px;
         font-weight: 300;
         line-height: 1.3;
 }
+
+.header-section * {
+        display: none;
+}
+
 table.schedule {
+  /* table is set to show after JS is completed to avoid fickering */
+  display: none;
   width: 100%;
   margin: 30px 10px;
   font-size: 1.4em;