<!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>[968] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php: WordCamp Post Types: Add a datepicker and time dropdowns for Sessions.</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/968">968</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/968","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>2014-11-07 19:27:05 +0000 (Fri, 07 Nov 2014)</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 Post Types: Add a datepicker and time dropdowns for Sessions.
This is a much better UX than asking users to type out `Y-m-d H:i:s`.
Fixes <a href="http://meta.trac.wordpress.org/ticket/205">#205</a>
props nvwd</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></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/plugins/wc-post-types/wc-post-types.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/plugins/wc-post-types/wc-post-types.php 2014-11-07 19:20:00 UTC (rev 967)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-11-07 19:27:05 UTC (rev 968)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_menu', array( $this, 'admin_menu' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_print_styles', array( $this, 'admin_css' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_scripts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( $this, 'save_post_speaker' ), 10, 2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,9 +194,41 @@
</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"> function admin_enqueue_scripts() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $post_type;
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'campicons', plugins_url( 'fonts/campicons.css', __FILE__ ), array(), 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Enqueues scripts and styles for session admin page
+ if ( 'wcb_session' == $post_type ) {
+ wp_enqueue_script( 'jquery-ui-datepicker' );
+ wp_enqueue_style( 'jquery-ui' );
+ wp_enqueue_style( 'wp-datepicker-skins' );
+ }
</ins><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">+
+ /*
+ * Print our JavaScript
+ */
+ function admin_print_scripts() {
+ global $post_type;
+
+ // DatePicker for Session posts
+ if ( 'wcb_session' == $post_type ) :
+ ?>
+
+ <script type="text/javascript">
+ jQuery( document ).ready( function( $ ) {
+ $( '#wcpt-session-date' ).datepicker( {
+ dateFormat: 'yy-mm-dd',
+ changeMonth: true,
+ changeYear: true
+ } );
+ } );
+ </script>
+
+ <?php
+ endif;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function wp_enqueue_scripts() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'wcb_shortcodes', plugins_url( 'css/shortcodes.css', __FILE__ ), array(), 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,21 +1049,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php while ( $sponsors->have_posts() ) : $sponsors->the_post(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $website = get_post_meta( get_the_ID(), '_wcpt_sponsor_website', true ); ?>
</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"> <div id="wcorg-sponsor-<?php the_ID(); ?>" class="wcorg-sponsor">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'website' == $attr['link'] && $website ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><a href="<?php echo esc_attr( esc_url( $website ) ); ?>"><?php the_title(); ?></a></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php the_title(); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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"> <div class="wcorg-sponsor-description">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'website' == $attr['link'] && $website ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_attr( esc_url( $website ) ); ?>"><?php the_post_thumbnail(); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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"> <?php the_content(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #sponsor -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,15 +1362,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function metabox_session_info() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px"> $session_time = absint( get_post_meta( $post->ID, '_wcpt_session_time', true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $session_time = ( $session_time ) ? date( 'Y-m-d H:i:s', $session_time ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $session_date = ( $session_time ) ? date( 'Y-m-d', $session_time ) : date( 'Y-m-d' );
+ $session_hours = ( $session_time ) ? date( 'g', $session_time ) : date( 'g' );
+ $session_minutes = ( $session_time ) ? date( 'i', $session_time ) : '00';
+ $session_meridiem = ( $session_time ) ? date( 'a', $session_time ) : 'am';
</ins><span class="cx" style="display: block; padding: 0 10px"> $session_type = get_post_meta( $post->ID, '_wcpt_session_type', true );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'edit-session-info', 'wcpt-meta-session-info' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="wcpt-session-time"><?php _e( 'When:', 'wordcamporg' ); ?></label>
- <input type="text" class="widefat" id="wcpt-session-time" name="wcpt-session-time" value="<?php echo esc_attr( $session_time ); ?>" />
- <span style="display: block; margin-top: 4px;" class="description">For example: <?php echo date( 'Y-m-d H:i:s' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="wcpt-session-date"><?php _e( 'Date:', 'wordcamporg' ); ?></label>
+ <input type="text" id="wcpt-session-date" data-date="<?php echo esc_attr( $session_date ); ?>" name="wcpt-session-date" value="<?php echo esc_attr( $session_date ); ?>" /><br />
+ <label><?php _e( 'Time:', 'wordcamporg' ); ?></label>
+
+ <select name="wcpt-session-hour" aria-label="<?php _e( 'Session Start Hour', 'wordcamporg' ); ?>">
+ <?php for ( $i = 1; $i <= 12; $i++ ) : ?>
+ <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, $session_hours ) ?>>
+ <?php echo esc_html( $i ); ?>
+ </option>
+ <?php endfor; ?>
+ </select> :
+
+ <select name="wcpt-session-minutes" aria-label="<?php _e( 'Session Start Minutes', 'wordcamporg' ); ?>">
+ <?php for ( $i = '00'; (int) $i <= 55; $i = sprintf( '%02d', (int) $i + 5 ) ) : ?>
+ <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, $session_minutes ) ?>>
+ <?php echo esc_html( $i ); ?>
+ </option>
+ <?php endfor; ?>
+ </select>
+
+ <select name="wcpt-session-meridiem" aria-label="<?php _e( 'Session Meridiem', 'wordcamporg' ); ?>">
+ <option value="am" <?php selected( 'am', $session_meridiem ) ?>>am</option>
+ <option value="pm" <?php selected( 'pm', $session_meridiem ) ?>>pm</option>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="wcpt-session-type"><?php _e( 'Type:', 'wordcamporg' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="wcpt-session-type" name="wcpt-session-type">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1354,14 +1412,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function metabox_sponsor_info( $sponsor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $website = get_post_meta( $sponsor->ID, '_wcpt_sponsor_website', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'edit-sponsor-info', 'wcpt-meta-sponsor-info' );
</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"> ?>
</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"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="_wcpt_sponsor_website"><?php _e( 'Website:', 'wordcampbase' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="widefat" id="_wcpt_sponsor_website" name="_wcpt_sponsor_website" value="<?php echo esc_attr( esc_url( $website ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</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"> <?php
</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">@@ -1438,8 +1496,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update session time.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['wcpt-meta-session-info'] ) && wp_verify_nonce( $_POST['wcpt-meta-session-info'], 'edit-session-info' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $session_time = sanitize_text_field( $_POST['wcpt-session-time'] );
- $session_time = strtotime( $session_time );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $session_time = strtotime( sprintf(
+ '%s %d:%02d %s',
+ sanitize_text_field( $_POST['wcpt-session-date'] ),
+ absint( $_POST['wcpt-session-hour'] ),
+ absint( $_POST['wcpt-session-minutes'] ),
+ 'am' == $_POST['wcpt-session-meridiem'] ? 'am' : 'pm'
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wcpt_session_time', $session_time );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $session_type = sanitize_text_field( $_POST['wcpt-session-type'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1482,13 +1545,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wcpt_speaker_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $speaker_ids as $speaker_id )
</span><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, '_wcpt_speaker_id', $speaker_id );
</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"> // Set the speaker as the author of the session post, so the single
</span><span class="cx" style="display: block; padding: 0 10px"> // view doesn't confuse users who see "posted by [organizer name]"
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $speaker_ids as $speaker_post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wporg_user_id = get_post_meta( $speaker_post, '_wcpt_user_id', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $wporg_user_id );
</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 ( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'save_post', array( $this, 'save_post_session' ), 10, 2 ); // avoid infinite recursion
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1496,7 +1559,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user->ID
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( $this, 'save_post_session' ), 10, 2 );
</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"> break;
</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">@@ -1512,7 +1575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['wcpt-meta-sponsor-info'] ) && wp_verify_nonce( $_POST['wcpt-meta-sponsor-info'], 'edit-sponsor-info' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $website = esc_url_raw( $_POST['_wcpt_sponsor_website'] );
</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"> // TODO: maybe only allows links to home page, depending on outcome of http://make.wordpress.org/community/2013/12/31/irs-rules-for-corporate-sponsorship-of-wordcamp/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $website ) {
</span></span></pre>
</div>
</div>
</body>
</html>