<!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>[5530] sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012: WordCamp Central: Add year to camp dates on the schedule</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/5530">5530</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/5530","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-31 22:18:31 +0000 (Wed, 31 May 2017)</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'>WordCamp Central: Add year to camp dates on the schedule
Changes the Schedule page template to emulate the organization on the
Past Camps page template, by grouping camps under a year header and
including the year in each camp's date.
This also adds a param to `WordCamp_Central_Theme::the_wordcamp_date` to
include the year in the camp date output. The default is to not include
it, for backcompat.
Props frq
Fixes <a href="http://meta.trac.wordpress.org/ticket/2065">#2065</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012functionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatepastwordcampsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templateschedulephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php 2017-05-31 17:06:01 UTC (rev 5529)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php 2017-05-31 22:18:31 UTC (rev 5530)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,19 +717,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $query;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function the_wordcamp_date( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Output the date or date range of a WordCamp event.
+ *
+ * @param int $wordcamp_id The ID of the WordCamp post.
+ * @param bool $show_year Optional. True to include the year in the date output.
+ */
+ public static function the_wordcamp_date( $wordcamp_id = 0, $show_year = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $start_day = wcpt_get_wordcamp_start_date( $wordcamp_id, 'j' );
</span><span class="cx" style="display: block; padding: 0 10px"> $start_month = wcpt_get_wordcamp_start_date( $wordcamp_id, 'F' );
</span><span class="cx" style="display: block; padding: 0 10px"> $end_day = wcpt_get_wordcamp_end_date( $wordcamp_id, 'j' );
</span><span class="cx" style="display: block; padding: 0 10px"> $end_month = wcpt_get_wordcamp_end_date( $wordcamp_id, 'F' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $show_year ) {
+ $start_year = wcpt_get_wordcamp_start_date( $wordcamp_id, 'Y' );
+ $end_year = wcpt_get_wordcamp_end_date( $wordcamp_id, 'Y' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "$start_month $start_day";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $end_day ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '-';
- if ( $start_month != $end_month )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $show_year && $start_year !== $end_year ) {
+ echo ", $start_year";
+ }
+
+ echo '–';
+
+ if ( $start_month !== $end_month ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "$end_month ";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $end_day;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $show_year ) {
+ echo ", $end_year";
+ }
+ } elseif ( $show_year ) {
+ echo ", $start_year";
</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></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templatepastwordcampsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php 2017-05-31 17:06:01 UTC (rev 5529)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-past-wordcamps.php 2017-05-31 22:18:31 UTC (rev 5530)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="wc-country"><?php wcpt_wordcamp_location( $post->ID ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="wc-date">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php WordCamp_Central_Theme::the_wordcamp_date( $post->ID ); ?>,
- <?php wcpt_wordcamp_start_date( $post->ID, 'Y' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php WordCamp_Central_Theme::the_wordcamp_date( $post->ID, true ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012templateschedulephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php 2017-05-31 17:06:01 UTC (rev 5529)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/template-schedule.php 2017-05-31 22:18:31 UTC (rev 5530)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,29 +37,37 @@
</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">+ global $wcpt_template;
+ $wordcamps = WordCamp_Central_Theme::group_wordcamps_by_year( $wcpt_template->posts );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul class="wc-schedule-list">
- <?php while ( wcpt_wordcamps() ) : wcpt_the_wordcamp(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $wordcamps as $year => $posts ) : ?>
+ <h3 class="wc-schedule-year"><?php echo esc_html( $year ); ?></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">- <li>
- <a href="<?php echo esc_url( wcpt_get_wordcamp_url() ); ?>">
- <?php if ( has_post_thumbnail() ) : ?>
- <?php the_post_thumbnail( 'wccentral-thumbnail-small', array( 'class' => 'wc-image' ) ); ?>
- <?php else : ?>
- <div class="wc-image wp-post-image wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="wc-schedule-list">
+ <?php foreach ( $posts as $post ) : setup_postdata( $post ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
- <span class="wc-country"><?php wcpt_wordcamp_location(); ?></span>
- <span class="wc-date">
- <?php WordCamp_Central_Theme::the_wordcamp_date(); ?>
- </span>
- </a>
- </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>
+ <a href="<?php echo esc_url( WordCamp_Central_Theme::get_best_wordcamp_url( $post->ID ) ); ?>">
+ <?php if ( has_post_thumbnail() ) : ?>
+ <?php the_post_thumbnail( 'wccentral-thumbnail-small', array( 'class' => 'wc-image' ) ); ?>
+ <?php else : ?>
+ <div class="wc-image wp-post-image wordcamp-placeholder-thumb" title="<?php the_title(); ?>"></div>
+ <?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 endwhile; // wcpt_wordcamps ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="wc-title"><?php wcpt_wordcamp_title(); ?></h2>
+ <span class="wc-country"><?php wcpt_wordcamp_location( $post->ID ); ?></span>
+
+ <span class="wc-date">
+ <?php WordCamp_Central_Theme::the_wordcamp_date( $post->ID, true ); ?>
+ </span>
+ </a>
+ </li>
+
+ <?php endforeach; // $posts as post ?>
+ </ul>
+ <?php wp_reset_postdata(); endforeach; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo home_url( '/schedule/past-wordcamps/' ); ?>" class="wc-schedule-more">Past WordCamps →</a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // wcpt_has_wordcamps ?>
</span></span></pre>
</div>
</div>
</body>
</html>