<!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>[10147] sites/trunk/wordpress.org/public_html/wp-content: WP.org Learn: Sync with GitHub</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/10147">10147</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/10147","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>2020-08-12 01:23:13 +0000 (Wed, 12 Aug 2020)</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'>WP.org Learn: Sync with GitHub
https://github.com/WordPress/learn/compare/826f579465d0a1689ef260161158b585197d6112...fbb4955f0cff52e01350d2ff38e636e1c9c17645</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincblocksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincclassmarkdownimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/class-markdown-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincpostmetaphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincposttypephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-type.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020frontpagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/front-page.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020headerphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnviewsmetaboxworkshopfacilitatorsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-facilitators.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020csscomponents_workshopauthorscss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/css/components/_workshop-author.scss</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentauthorphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-author.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincblocksphp"></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/wporg-learn/inc/blocks.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/wporg-learn/inc/blocks.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,12 +54,32 @@
</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">+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Build the html output based on input fields
+ *
+ * @param array $fields
+ * @return string HTML output.
+ */
+function get_workshop_details_html_output( $fields ) {
+ $output = '<ul class="wp-block-wporg-learn-workshop-details">';
+
+ foreach( $fields as $key => $value ) {
+ $output .= sprintf( '<li><b>%1$s</b><span>%2$s</span></li>', $key, $value );
+ }
+
+ $output .= '</ul>';
+
+ return $output;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Render the block content (html) on the frontend of the site.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $attributes
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string HTML output used by the calendar JS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string HTML output used by the block
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function workshop_details_render_callback( $attributes, $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,20 +87,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $level = wp_get_post_terms( $post->ID, 'level', array( 'fields' => 'names' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $captions = get_post_meta( $post->ID, 'video_caption_language' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return sprintf(
- '<ul class="wp-block-wporg-learn-workshop-details">
- <li><b>Length</b><span>%1$s</span></li>
- <li><b>Topic</b><span>%2$s</span></li>
- <li><b>Level</b><span>%3$s</span></li>
- <li><b>Language</b><span>%4$s</span></li>
- <li><b>Captions</b><span>%5$s</span></li>
- </ul>',
- get_workshop_duration( $post, 'string' ),
- implode( ', ', array_map( 'esc_html', $topics ) ),
- implode( ', ', array_map( 'esc_html', $level ) ),
- esc_html( $post->video_language ),
- implode( ', ', array_map( 'esc_html', $captions ) )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = array(
+ __( 'Length' , 'wporg-learn') => get_workshop_duration( $post, 'string' ),
+ __( 'Topic' , 'wporg-learn') => implode( ', ', array_map( 'esc_html', $topics ) ),
+ __( 'Level' , 'wporg-learn') => implode( ', ', array_map( 'esc_html', $level ) ),
+ __( 'Language' , 'wporg-learn') => esc_html( $post->video_language ),
+ __( 'Captions' , 'wporg-learn') => implode( ', ', array_map( 'esc_html', $captions ) ),
+ );
+
+ // Remove empty fields
+ $fields_to_output = array_filter( $fields );
+
+ return get_workshop_details_html_output( $fields_to_output );
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincclassmarkdownimportphp"></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/wporg-learn/inc/class-markdown-import.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/wporg-learn/inc/class-markdown-import.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/class-markdown-import.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static $meta_key = 'wporg_learn_markdown_source';
</span><span class="cx" style="display: block; padding: 0 10px"> private static $nonce_name = 'wporg-learn-markdown-source-nonce';
</span><span class="cx" style="display: block; padding: 0 10px"> private static $submit_name = 'wporg-learn-markdown-import';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private static $supported_post_types = 'lesson-plan';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $supported_post_type = 'lesson-plan';
</ins><span class="cx" style="display: block; padding: 0 10px"> private static $posts_per_page = 100;
</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">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch all lesson plan posts for comparison
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' => self::$supported_post_types,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => self::$supported_post_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => self::$posts_per_page,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private static function create_post_from_manifest_doc( $doc, $post_parent = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' => self::$supported_post_types,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => self::$supported_post_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => sanitize_text_field( wp_slash( $doc['title'] ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function action_wporg_learn_markdown_import() {
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' => self::$supported_post_types,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => self::$supported_post_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => self::$posts_per_page,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $_GET['post'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_id )
</span><span class="cx" style="display: block; padding: 0 10px"> || ! wp_verify_nonce( $_GET[ self::$nonce_name ], self::$input_name )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || ! in_array( get_post_type( $post_id ), self::$supported_post_types, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || get_post_type( $post_id ) !== self::$supported_post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add an input field for specifying Markdown source
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function action_edit_form_after_title( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $post->post_type, self::$supported_post_types, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post->post_type !== self::$supported_post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $markdown_source = get_post_meta( $post->ID, self::$meta_key, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST[ self::$input_name ] )
</span><span class="cx" style="display: block; padding: 0 10px"> || ! isset( $_POST[ self::$nonce_name ] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || ! in_array( get_post_type( $post_id ), self::$supported_post_types, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || get_post_type( $post_id ) !== self::$supported_post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -285,9 +285,9 @@
</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"> * Replace markdown checkboxes in the post-processed HTML.
</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"> * @param string $html The HTML after translation from markup.
</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"> * @return string The HTML after potentially replacing markdown checkboxes with HTML ones.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function replace_markdown_checkboxes( $html ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincpostmetaphp"></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/wporg-learn/inc/post-meta.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/wporg-learn/inc/post-meta.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return = $interval;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'string':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = human_readable_duration( $interval->format( '%H:%I:%S' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $interval->d > 0 ) {
+ $return = human_time_diff( 0, $interval->d * DAY_IN_SECONDS );
+ } elseif ( $interval->h > 0 ) {
+ $return = $hours = human_time_diff( 0, $interval->h * HOUR_IN_SECONDS );
+
+ if ( $interval->i > 0 ) {
+ $minutes = human_time_diff( 0, $interval->i * MINUTE_IN_SECONDS );
+ $return = sprintf(
+ // translators: 1 is a string like "2 hours". 2 is a string like "20 mins".
+ _x( '%1$s, %2$s', 'hours and minutes','wporg-learn' ),
+ $hours,
+ $minutes
+ );
+ }
+ } elseif ( $interval->i > 0 ) {
+ $return = human_time_diff( 0, $interval->i * MINUTE_IN_SECONDS );
+ } elseif ( $interval->s > 0 ) {
+ $return = human_time_diff( 0, $interval->s );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'raw':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincposttypephp"></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/wporg-learn/inc/post-type.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/wporg-learn/inc/post-type.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-type.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'wporg-learn/workshop-details' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'core/button', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => __( 'Join a Group Discussion', 'wporg-learn' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => 'https://wordpress.org',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => 'https://www.meetup.com/learn-wordpress-discussions/events/',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'borderRadius' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'className' => 'is-style-secondary-full-width',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnviewsmetaboxworkshopfacilitatorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-facilitators.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/wporg-learn/views/metabox-workshop-facilitators.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-facilitators.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/** @var WP_Post $post */
-/** @var array $facilitators */
-?>
-
-<?php // todo Change this to a multiselect dropdown that validates wporg usernames. ?>
-<p>
- <label for="workshop-facilitator-wporg-username"><?php _e( 'WordPress.org User Names', 'wporg_learn' ); ?></label>
- <textarea id="workshop-facilitator-wporg-username" name="facilitator-wporg-username"><?php
- echo sanitize_textarea_field( implode( ', ', $facilitators ) );
- ?></textarea>
- <span class="help">
- <?php _e( 'Separate multiple facilitator user names with a comma.', 'wporg_learn' ); ?>
- </span>
-</p>
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020csscomponents_workshopauthorscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/css/components/_workshop-author.scss</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/css/components/_workshop-author.scss 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/css/components/_workshop-author.scss 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,24 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.workshop-author {
- display: flex;
- align-items: center;
-
- /* We want to make sure a long name doesn't overlap the image */
- > div:first-child {
- min-width: $gutter-default * 3.5;
- }
-
- &_profile {
- display: flex;
- margin-right: $gutter-default * 1.5;
- height: $gutter-default * 3.5;
- border-radius: $gutter-default * 2;
- }
-
- &_name {
- color: $color__text;
- }
-
- &_handle {
- text-decoration: underline;
- }
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020frontpagephp"></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/front-page.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/front-page.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/front-page.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,62 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><span class="cx" style="display: block; padding: 0 10px"> <hr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <section class="lesson-lists clearfix">
- <div class="col">
- <h2 class="screen-reader-text"><?php _e( 'Lesson Plans' ); ?></h2>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'User-oriented Lesson Plans' ); ?></h3>
- <p><?php _e( 'User lessons are targeted towards end-users, those who actually publish content.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the lesson plans' ); ?></a>
- </div>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'Theme-oriented Lesson Plans' ); ?></h3>
- <p><?php _e( 'Theme lessons are targeted towards entry-level developers, those who actually write code.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the lesson plans' ); ?></a>
- </div>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'Plugin-oriented Lesson Plans' ); ?></h3>
- <p><?php _e( 'Plugin lessons are targeted towards entry-level developers, those who actually write code.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the lesson plans' ); ?></a>
- </div>
- </div>
-
- <div class="col">
- <h2 class="screen-reader-text"><?php _e( 'Workshop Ideas' ); ?></h2>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'Half-day Workshop Ideas' ); ?></h3>
- <p><?php _e( 'Concepts and activities for workshops that are only a few hours long.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the Workshop Ideas' ); ?></a>
- </div>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'Full-day Workshop Ideas' ); ?></h3>
- <p><?php _e( 'Concepts and activities for workshops that fill the whole day.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the Workshop Ideas' ); ?></a>
- </div>
- <div class="lesson-item">
- <h3 class="h4 title"><?php _e( 'Multi-day Workshop Ideas' ); ?></h3>
- <p><?php _e( 'Concepts and activities for workshops that span the course of 2 or more days.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the Workshop Ideas' ); ?></a>
- </div>
- </div>
-
- <div class="col">
- <div class="lesson-item">
- <h2 class="h4 title"><?php _e( 'Want to Help More People Speak at Meetups and WordCamps?' ); ?></h2>
- <p><?php _e( 'WordPress is a built on a community where diversity and inclusion are key to growth. Meetups and WordCamps are the best way to teach others about WordPress on a local level and these resources can help diversify the speakers at these events.' ); ?></p>
- <a class="viewmore" href="#"><?php _e( 'View the Speaker Diversity Lesson plans' ); ?></a>
- </div>
- <div class="lesson-item">
- <h2 class="h4 title"><?php _e( 'Helpful Links' ); ?></h2>
- <a class="viewmore" href="#"><?php _e( 'WordCamp Central' ); ?></a> <br />
- <a class="viewmore" href="#"><?php _e( 'WordPress Meetups' ); ?></a>
- </div>
- </div>
- </section>
-
- <hr>
-
</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 wporg_submit_idea_cta(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! is_active_sidebar( 'front-page-blocks' ) ) : ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020headerphp"></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/header.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/header.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,12 +24,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#content">' . esc_html__( 'Skip to content', 'wporg-forums' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> wporg_get_global_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_front_page() ) {
- $home_page = 'home ';
-}
</del><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">-<div id="page" class="<?php echo esc_html( $home_page ); ?>site">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="page" class="site">
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="skip-link screen-reader-text" href="#main"><?php esc_html_e( 'Skip to content', 'wporg-forums' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentauthorphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-author.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/component-author.php 2020-08-11 21:43:27 UTC (rev 10146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-author.php 2020-08-12 01:23:13 UTC (rev 10147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="workshop-author">
- <div>
- <img class="workshop-author_profile" src="https://secure.gravatar.com/avatar/1064bd40c9ade0b3c9cf0e27d9e3432a?s=200&d=mm&r=g" />
- </div>
- <div>
- <div class="workshop-author_name"><?php echo get_the_author_meta( 'display_name' ); ?></div>
- <a class="workshop-author_handle" href="">@spykro</a>
- </div>
-</div>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>