Changeset 1095

Timestamp:

01/07/2015 07:25:01 PM (12 years ago)

Author:

iandunn

Message:

Official WordPress Events: Make event list easier to scan.

Props mj12982 for the design

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events

Files:

• official-wordpress-events.css (added)
• official-wordpress-events.php (modified) (5 diffs)
• template-events.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

@@ -27 +27 @@
          */
         public function __construct() {
+                add_action( 'wp_enqueue_scripts',           array( $this, 'enqueue_scripts' ) );
                 add_shortcode( 'official_wordpress_events', array( $this, 'render_events' ) );
         }
 
         /**
+         * Enqueue scripts and styles
+         */
+        public function enqueue_scripts() {
+                global $post;
+
+                wp_register_style( 'official-wordpress-events', plugins_url( 'official-wordpress-events.css', __FILE__ ), array(), 1 );
+
+                if ( is_a( $post, 'WP_Post' ) && has_shortcode( $post->post_content, 'official_wordpress_events' ) ) {
+                        wp_enqueue_style( 'official-wordpress-events' );
+                }
+
+        }
+
+        /**
          * Gather the events data and render the events template with it
          */
         public function render_events() {
-                $events = $this->get_all_events();
+                $events = $this->group_events_by_date( $this->get_all_events() );
                 
                 if ( $events ) {
@@ -68 +83 @@
                         return $a->start_timestamp > $b->start_timestamp ? 1 : -1;
                 }
+        }
+
+        /**
+         * Group a list of events by the date
+         *
+         * @param array $events
+         *
+         * @return array
+         */
+        protected function group_events_by_date( $events ) {
+                $grouped_events = array();
+
+                foreach ( $events as $event ) {
+                        $grouped_events[ date( 'Y-m-d', (int) $event->start_timestamp ) ][] = $event;
+                }
+
+                return $grouped_events;
         }
 
@@ -129 +161 @@
                         $meetups = array();
                 }
-                
+
                 if ( $meetups ) {
                         foreach ( $meetups as $meetup ) {
                                 $location        = array();
                                 $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 );    // convert to seconds
-                                
-                                foreach ( array( 'city', 'state', 'country' ) as $part ) {
-                                        if ( ! empty( $meetup->venue->$part ) ) {
-                                                if ( in_array( $part, array( 'state', 'country' ) ) ) {
-                                                        $location[] = strtoupper( $meetup->venue->$part );
-                                                } else {
-                                                        $location[] = $meetup->venue->$part;
+
+                                if ( isset( $meetup->venue ) ) {
+                                        foreach ( array( 'city', 'state', 'country' ) as $part ) {
+                                                if ( ! empty( $meetup->venue->$part ) ) {
+                                                        if ( in_array( $part, array( 'state', 'country' ) ) ) {
+                                                                $location[] = strtoupper( $meetup->venue->$part );
+                                                        } else {
+                                                                $location[] = $meetup->venue->$part;
+                                                        }
                                                 }
                                         }
+                                        $location = implode( ', ', $location );
+                                } else {
+                                        $location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
+                                        $location = $this->format_reverse_geocode_address( $location->address_components );
                                 }
                                 
@@ -151 +189 @@
                                         'start_timestamp' => $start_timestamp,
                                         'end_timestamp'   => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ),      // convert to seconds
-                                        'location'        => empty( $location ) ? '' : implode( ' ', $location )
+                                        'location'        => $location,
                                 ) );
                         }
@@ -188 +226 @@
                 
                 return $group_ids;
+        }
+
+        /**
+         * Reverse-geocodes a set of coordinates
+         *
+         * @param string $latitude
+         * @param string $longitude
+         *
+         * @return false | object
+         */
+        protected function reverse_geocode( $latitude, $longitude ) {
+                $address  = false;
+                $response = $this->remote_get( sprintf( 'https://maps.googleapis.com/maps/api/geocode/json?latlng=%s,%s&sensor=false', $latitude, $longitude ) );
+
+                if ( ! is_wp_error( $response ) ) {
+                        $body = json_decode( wp_remote_retrieve_body( $response ) );
+
+                        if ( isset( $body->results[0] ) ) {
+                                $address = $body->results[0];
+                        }
+                }
+
+                return $address;
+        }
+
+        /**
+         * Formats an address returned from Google's reverse-geocode API
+         *
+         * @param array $address_components
+         *
+         * @return string
+         */
+        protected function format_reverse_geocode_address( $address_components ) {
+                $address = array();
+
+                foreach ( $address_components as $component ) {
+                        if ( 'locality' == $component->types[0] ) {
+                                $address['city'] = $component->short_name;
+                        } elseif ( 'administrative_area_level_1' == $component->types[0] ) {
+                                $address['state'] = $component->short_name;
+                        } elseif ( 'country' == $component->types[0] ) {
+                                $address['country'] = $component->short_name;
+                        }
+                }
+
+                return implode( ', ', $address );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/template-events.php

@@ -1 @@
-<div id="ofe_events">
-        <ul>
-                <?php foreach ( $events as $event ) : ?>
+<div id="ofe-events">
+        <?php foreach ( $events as $date => $day_events ) : ?>
 
-                        <li>
-                                <a href="<?php echo esc_attr( esc_url( $event->url ) ); ?>">
-                                        <?php echo esc_html( $event->title ); ?>
-                                </a><br />
+                <h3>
+                        <?php echo date( 'F j', strtotime( $date ) ); ?>
+                        <span class="owe-day-of-week"><?php echo date( '(l)', strtotime( $date ) ); ?></span>
+                </h3>
 
-                                <?php echo esc_html( date( 'l, F jS | g:i a', (int) $event->start_timestamp ) ); ?><br />
+                <ul class="ofe-event-list">
+                        <?php foreach ( $day_events as $event ) : ?>
+                                <li>
+                                        <?php if ( $event->location ) : ?>
+                                                <?php echo esc_html( $event->location ); ?>
+                                                <span class="owe-separator"></span>
+                                        <?php endif; ?>
 
-                                <?php echo esc_html( $event->location ); ?>
-                        </li>
+                                        <a href="<?php echo esc_attr( esc_url( $event->url ) ); ?>">
+                                                <?php echo esc_html( $event->title ); ?>
+                                        </a>
+                                        <span class="owe-separator"></span>
 
-                <?php endforeach; ?>
-        </ul>
-</div> <!-- end #ofe_events -->
+                                        <?php echo date( 'g:i a', $event->start_timestamp ); ?>
+                                </li>
+                        <?php endforeach; ?>
+                </ul>
+
+        <?php endforeach; ?>
+</div> <!-- end #ofe-events -->