<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1095] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events: Official WordPress Events: Make event list easier to scan.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1095">1095</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1095","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-07 19:25:01 +0000 (Wed, 07 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Official WordPress Events: Make event list easier to scan.
Props mj12982 for the design</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventstemplateeventsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/template-events.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventscss">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventscss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.css (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.css 2015-01-07 19:25:01 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,29 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#ofe-events h3 {
+ margin-bottom: 1.3em;
+ text-transform: uppercase;
+}
+
+ .owe-day-of-week {
+ color: #a1a1a1;
+ }
+
+ul.ofe-event-list {
+ margin-left: 0;
+ margin-bottom: 3em;
+ padding-bottom: 2em;
+ border-bottom: 1px solid #dfdfdf;
+}
+
+ ul.ofe-event-list li {
+ list-style-type: none;
+ margin-bottom: 1.5em;
+ }
+
+ .owe-separator {
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+ .owe-separator::before {
+ content: "\2022";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2015-01-06 18:24:12 UTC (rev 1094)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php 2015-01-07 19:25:01 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,14 +26,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'official_wordpress_events', array( $this, 'render_events' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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' );
+ }
+
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Gather the events data and render the events template with it
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_events() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $events = $this->get_all_events();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $events = $this->group_events_by_date( $this->get_all_events() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $events ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/template-events.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,6 +85,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieve events fromm the WordCamp.org API
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,20 +160,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $meetups = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $meetups ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meetups as $meetup ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 ); // convert to seconds
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $events[] = new Official_WordPress_Event( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $meetup->event_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_timestamp' => $start_timestamp,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_timestamp' => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location' => empty( $location ) ? '' : implode( ' ', $location )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location' => $location,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +228,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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 );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Wrapper for wp_remote_get()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This adds caching and error logging/notification
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventstemplateeventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/template-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/template-events.php 2015-01-06 18:24:12 UTC (rev 1094)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/template-events.php 2015-01-07 19:25:01 UTC (rev 1095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,17 +1,28 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="ofe_events">
- <ul>
- <?php foreach ( $events as $event ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="ofe-events">
+ <?php foreach ( $events as $date => $day_events ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li>
- <a href="<?php echo esc_attr( esc_url( $event->url ) ); ?>">
- <?php echo esc_html( $event->title ); ?>
- </a><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3>
+ <?php echo date( 'F j', strtotime( $date ) ); ?>
+ <span class="owe-day-of-week"><?php echo date( '(l)', strtotime( $date ) ); ?></span>
+ </h3>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html( date( 'l, F jS | g:i a', (int) $event->start_timestamp ) ); ?><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html( $event->location ); ?>
- </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_attr( esc_url( $event->url ) ); ?>">
+ <?php echo esc_html( $event->title ); ?>
+ </a>
+ <span class="owe-separator"></span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endforeach; ?>
- </ul>
-</div> <!-- end #ofe_events -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo date( 'g:i a', $event->start_timestamp ); ?>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+
+ <?php endforeach; ?>
+</div> <!-- end #ofe-events -->
</ins></span></pre>
</div>
</div>
</body>
</html>