<!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>[1573] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: WordCamp Post Types: Collect and display URLs for session slides and videos.</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/1573">1573</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/1573","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-05-14 22:53:59 +0000 (Thu, 14 May 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'>WordCamp Post Types: Collect and display URLs for session slides and videos.
Fixes <a href="http://meta.trac.wordpress.org/ticket/508">#508</a>
Props BrashRebel</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssshortcodescss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css</a></li>
<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_htmlwpcontentpluginswcposttypescssshortcodescss"></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/css/shortcodes.css</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/css/shortcodes.css 2015-05-14 07:01:22 UTC (rev 1572)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css 2015-05-14 22:53:59 UTC (rev 1573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,3 +87,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #speaker-session-names li {
</span><span class="cx" style="display: block; padding: 0 10px"> list-style-type: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/*
+ * [sessions]
+ */
+.wcorg-session-links {
+ margin-left: 0;
+}
+
+.wcorg-session-links li {
+ display: inline;
+ list-style-type: none;
+}
+
+.wcorg-session-links li::after {
+ content: '|';
+}
+
+.wcorg-session-links li:last-child::after {
+ content: '';
+}
</ins></span></pre></div>
<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 2015-05-14 07:01:22 UTC (rev 1572)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2015-05-14 22:53:59 UTC (rev 1573)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -951,6 +951,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Things to be output, or not.
</span><span class="cx" style="display: block; padding: 0 10px"> $session_meta = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $speakers_avatars = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $links = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch speakers associated with this session.
</span><span class="cx" style="display: block; padding: 0 10px"> $speakers = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,6 +1009,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $session_meta ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $session_meta = sprintf( '<p class="wcpt-session-meta">%s</p>', $session_meta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Gather data for list of links
+ if ( $url = get_post_meta( $post->ID, '_wcpt_session_slides', true ) ) {
+ $links['slides'] = array(
+ 'url' => $url,
+ 'label' => __( 'Slides', 'wordcamporg' ),
+ );
+ }
+
+ if ( $url = get_post_meta( $post->ID, '_wcpt_session_video', true ) ) {
+ $links['video'] = array(
+ 'url' => $url,
+ 'label' => __( 'Video', 'wordcamporg' ),
+ );
+ }
+
</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"> <div id="wcorg-session-<?php the_ID(); ?>" class="wcorg-session" >
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,6 +1034,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $session_meta; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $speakers_avatars; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( $links ) : ?>
+ <ul class="wcorg-session-links">
+ <?php foreach( $links as $link ) : ?>
+ <li>
+ <a href="<?php echo esc_url( $link['url'] ); ?>">
+ <?php echo esc_html( $link['label'] ); ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,7 +1305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'speaker-info', __( 'Speaker Info', 'wordcamporg' ), array( $this, 'metabox_speaker_info' ), 'wcb_speaker', 'side' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'organizer-info', __( 'Organizer Info', 'wordcamporg' ), array( $this, 'metabox_organizer_info' ), 'wcb_organizer', 'side' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'speakers-list', __( 'Speakers', 'wordcamporg' ), array( $this, 'metabox_speakers_list' ), 'wcb_session', 'side' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_meta_box( 'session-info', __( 'Session Info', 'wordcamporg' ), array( $this, 'metabox_session_info' ), 'wcb_session', 'side' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_meta_box( 'session-info', __( 'Session Info', 'wordcamporg' ), array( $this, 'metabox_session_info' ), 'wcb_session', 'normal' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'sponsor-info', __( 'Sponsor Info', 'wordcampbase' ), array( $this, 'metabox_sponsor_info' ), 'wcb_sponsor', 'side' );
</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">@@ -1414,6 +1443,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $session_minutes = ( $session_time ) ? date( 'i', $session_time ) : '00';
</span><span class="cx" style="display: block; padding: 0 10px"> $session_meridiem = ( $session_time ) ? date( 'a', $session_time ) : 'am';
</span><span class="cx" style="display: block; padding: 0 10px"> $session_type = get_post_meta( $post->ID, '_wcpt_session_type', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $session_slides = get_post_meta( $post->ID, '_wcpt_session_slides', true );
+ $session_video = get_post_meta( $post->ID, '_wcpt_session_video', true );
</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"> <?php wp_nonce_field( 'edit-session-info', 'wcpt-meta-session-info' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1453,6 +1484,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <label for="wcpt-session-slides"><?php _e( 'Slides URL:', 'wordcamporg' ); ?></label>
+ <input type="text" class="widefat" id="wcpt-session-slides" name="wcpt-session-slides" value="<?php echo esc_url( $session_slides ); ?>" />
+ </p>
+
+ <p>
+ <label for="wcpt-session-video"><?php _e( 'WordPress.TV URL:', 'wordcamporg' ); ?></label>
+ <input type="text" class="widefat" id="wcpt-session-video" name="wcpt-session-video" value="<?php echo esc_url( $session_video ); ?>" />
+ </p>
+
</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">@@ -1544,8 +1585,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wcb_session_speakers', $speakers );
</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">- // Update session time.
</del><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update session time
</ins><span class="cx" style="display: block; padding: 0 10px"> $session_time = strtotime( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s %d:%02d %s',
</span><span class="cx" style="display: block; padding: 0 10px"> sanitize_text_field( $_POST['wcpt-session-date'] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1555,11 +1596,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update session type
</ins><span class="cx" style="display: block; padding: 0 10px"> $session_type = sanitize_text_field( $_POST['wcpt-session-type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $session_type, array( 'session', 'custom' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $session_type = 'session';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wcpt_session_type', $session_type );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Update session slides link
+ update_post_meta( $post_id, '_wcpt_session_slides', esc_url_raw( $_POST['wcpt-session-slides'] ) );
+
+ // Update session video link
+ if ( 'wordpress.tv' == str_replace( 'www.', '', strtolower( parse_url( $_POST['wcpt-session-video'], PHP_URL_HOST ) ) ) ) {
+ update_post_meta( $post_id, '_wcpt_session_video', esc_url_raw( $_POST['wcpt-session-video'] ) );
+ }
</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"> // Allowed outside of $_POST. If anything updates a session, make sure
</span></span></pre>
</div>
</div>
</body>
</html>