<!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>[10867] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts: Learn Theme: Sync with Git.</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 { white-space: pre-line; 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/10867">10867</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/10867","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>2021-04-01 21:01:44 +0000 (Thu, 01 Apr 2021)</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'>Learn Theme: Sync with Git.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020singlewporg_workshopphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/single-wporg_workshop.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglehardcodedphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single-hardcoded.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020 2021-04-01 21:01:06 UTC (rev 10866)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020  2021-04-01 21:01:44 UTC (rev 10867)
</ins><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:ignore</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> node_modules
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+package-lock.json
</ins><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020singlewporg_workshopphp"></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/themes/pub/wporg-learn-2020/single-wporg_workshop.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/themes/pub/wporg-learn-2020/single-wporg_workshop.php    2021-04-01 21:01:06 UTC (rev 10866)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/single-wporg_workshop.php      2021-04-01 21:01:44 UTC (rev 10867)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</span><span class="cx" style="display: block; padding: 0 10px">                while ( have_posts() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        the_post();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        get_template_part( 'template-parts/content', 'workshop-single' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       /*
+                        * Old posts have the layout and presentation of meta data hardcoded into `post_content`, but
+                        * newer posts only store prose there. Meta data, layout, etc is handled in
+                        * `content-workshop-single.php`.
+                        */
+                       $layout_hardcoded = has_block( 'core/columns' )
+                               && has_block( 'wporg-learn/workshop-details' )
+                               && has_block( 'core/separator' );
+
+                       if ( $layout_hardcoded ) {
+                               get_template_part( 'template-parts/content', 'workshop-single-hardcoded' );
+                       } else {
+                               get_template_part( 'template-parts/content', 'workshop-single' );
+                       }
</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">        </main><!-- #main -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglehardcodedphp"></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/themes/pub/wporg-learn-2020/template-parts/content-workshop-single-hardcoded.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/themes/pub/wporg-learn-2020/template-parts/content-workshop-single-hardcoded.php                         (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single-hardcoded.php   2021-04-01 21:01:44 UTC (rev 10867)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,40 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/*
+ * This deprecated template is for old posts that have Column/Embed/etc blocks hardcoded into `post_content`.
+ * See `single-wporg_workshop.php`.
+ */
+
+?>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+       <section>
+               <div class="row align-middle between section-heading section-heading--with-space">
+                       <h1 class="section-heading_title h2"><?php the_title(); ?></h1>
+               </div>
+               <hr>
+               <div class="workshop-page">
+                       <?php the_content(); ?>
+                       <?php if ( is_object_in_term( get_the_ID(), 'wporg_workshop_series' ) ) : ?>
+                               <?php get_template_part( 'template-parts/component', 'series-navigation' ); ?>
+                               <hr class="wp-block-separator" />
+                       <?php endif; ?>
+                       <?php foreach ( wporg_get_workshop_presenters() as $presenter ) : ?>
+                               <section class="row workshop-page_section"">
+                                       <div class="col-4">
+                                               <?php
+                                               get_template_part(
+                                                       'template-parts/component',
+                                                       'workshop-presenter',
+                                                       array(
+                                                               'presenter' => $presenter,
+                                                       )
+                                               );
+                                               ?>
+                                       </div>
+                                       <div class="col-8 workshop-page_biography">
+                                               <?php echo wp_kses_data( wpautop( wporg_get_workshop_presenter_bio( $presenter ) ) ); ?>
+                                       </div>
+                               </section>
+                       <?php endforeach; ?>
+               </div>
+       </section>
+</article>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscontentworkshopsinglephp"></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/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.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/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.php   2021-04-01 21:01:06 UTC (rev 10866)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/content-workshop-single.php     2021-04-01 21:01:44 UTC (rev 10867)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,60 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+global $wp_embed;
+
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">        <section>
</span><span class="cx" style="display: block; padding: 0 10px">                <div class="row align-middle between section-heading section-heading--with-space">
</span><span class="cx" style="display: block; padding: 0 10px">                        <h1 class="section-heading_title h2"><?php the_title(); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">                </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <hr>
</span><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="workshop-page">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php the_content(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php if ( $post->video_url ) : ?>
+                               <figure class="workshop-page_video">
+                                       <?php echo $wp_embed->autoembed( $post->video_url ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+                               </figure>
+                       <?php endif; ?>
+
+                       <div class="wp-block-columns workshop-page_content">
+                               <div class="wp-block-column" style="flex-basis:66.66%">
+                                       <?php the_content(); ?>
+                               </div>
+
+                               <div class="wp-block-column workshop-page_sidebar" style="flex-basis:33.333%">
+                                       <div>
+                                               <?php echo render_block( array( 'blockName' => 'wporg-learn/workshop-details' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+                                       </div>
+
+                                       <div class="wp-block-button is-style-secondary-full-width">
+                                               <a
+                                                       class="wp-block-button__link"
+                                                       href="https://www.meetup.com/learn-wordpress-discussions/events/"
+                                                       style="border-radius:5px"
+                                               >
+                                                       <?php esc_html_e( 'Join a Group Discussion', 'wporg-learn' ); ?>
+                                               </a>
+                                       </div>
+
+                                       <p class="terms">
+                                               <?php printf(
+                                                       wp_kses_data( __( 'You must agree to our <a href="%s">Code of Conduct</a> in order to participate.', 'wporg-learn' ) ),
+                                                       esc_url( get_permalink( get_page_by_path( 'code-of-conduct' ) ) )
+                                               ); ?>
+                                       </p>
+
+                               </div> <!-- end sidebar column -->
+                       </div> <!-- end columns -->
+
+                       <hr class="wp-block-separator">
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php if ( is_object_in_term( get_the_ID(), 'wporg_workshop_series' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php get_template_part( 'template-parts/component', 'series-navigation' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <hr class="wp-block-separator" />
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php foreach ( wporg_get_workshop_presenters() as $presenter ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="row workshop-page_section"">
</span><span class="cx" style="display: block; padding: 0 10px">                                        <div class="col-4">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +68,13 @@
</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">                                        </div>
</span><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="col-8 workshop-page_biography">
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php echo wp_kses_post( wpautop( wporg_get_workshop_presenter_bio( $presenter ) ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </section>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endforeach; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               </div> <!-- end workshop-page -->
</ins><span class="cx" style="display: block; padding: 0 10px">         </section>
</span><span class="cx" style="display: block; padding: 0 10px"> </article>
</span></span></pre>
</div>
</div>

</body>
</html>