<!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>[8599] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks: WC Blocks: Change output markup to suppot links for consistency</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/8599">8599</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/8599","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-05 10:44:58 +0000 (Fri, 05 Apr 2019)</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'>WC Blocks: Change output markup to suppot links for consistency
We already support linking featured image in editor. This patch adds support for linked image in rendered post as well. Also markup is changed a bit (especially classnames) to make both editor and rendered post consistent.
Towards https://github.com/WordPress/wordcamp.org/issues/36</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedfeaturedimageindexjs">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/featured-image/index.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedfeaturedimagephp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksassetssrcsharedfeaturedimageindexjs"></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/mu-plugins/blocks/assets/src/shared/featured-image/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/featured-image/index.js 2019-04-05 10:44:43 UTC (rev 8598)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/assets/src/shared/featured-image/index.js 2019-04-05 10:44:58 UTC (rev 8599)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @param props Props for function.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param props.wpMediaDetails Available sizes of images in the format as returned by WP API. This is the `sizes` object inside `media_details` inside `wp:featuredMedia` object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param props.height Height in pixels for image.
</del><span class="cx" style="display: block; padding: 0 10px"> * @param props.width Width in pixels for image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param props.className Classname for image element
</span><span class="cx" style="display: block; padding: 0 10px"> * @param props.alt Alt text for image
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedfeaturedimagephp"></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/mu-plugins/blocks/includes/shared/featured-image.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/mu-plugins/blocks/includes/shared/featured-image.php 2019-04-05 10:44:43 UTC (rev 8598)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php 2019-04-05 10:44:58 UTC (rev 8599)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,15 +7,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $class_names Additional classes to add inside <img> tag.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param \WP_Post $post Current post object. This will be used to calculate srcset attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $height Height of the image.
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $width Width of the image.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Output markup for featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function render_featured_image( $class_names, $post, $height, $width ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function render_featured_image( $class_names, $post, $width, $image_link = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_names[] = 'wordcamp-featured-image';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_names[] = 'wordcamp-featured-image-' . $post->post_name;
</del><span class="cx" style="display: block; padding: 0 10px"> $class_names = implode( ' ', $class_names );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $container_classes = "wordcamp-image-container wordcamp-featured-image-container $class_names";
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = get_post_thumbnail_id( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_data = wp_get_attachment_metadata( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $size = 'post-thumbnail';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +24,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $size = array( $width, $height );
</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">+ $image = render_featured_image_element( $post, $size, $class_names );
+ ob_start();
+ ?>
+ <div class="<?php echo esc_attr( $container_classes ); ?>">
+ <?php if ( '' !== $image_link ) { ?>
+ <div class="components-disabled">
+ <a href="<?php echo esc_html( $image_link ); ?>" class="wordcamp-image-link wordcamp-featured-image-link">
+ <?php echo wp_kses_post( $image ); ?>
+ </a>
+ </div>
+ <?php } else { ?>
+ <?php echo wp_kses_post( $image ); ?>
+ <?php } ?>
+ </div>
+ <?php
+
+ return ob_get_clean();
+}
+
+/**
+ * Helper method to render thumbnail image.
+ *
+ * @param \WP_Post $post
+ * @param string|array $size
+ * @param string $class_names
+ *
+ * @return string
+ */
+function render_featured_image_element( $post, $size, $class_names ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_the_post_thumbnail(
</span><span class="cx" style="display: block; padding: 0 10px"> $post,
</span><span class="cx" style="display: block; padding: 0 10px"> $size,
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp"></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/mu-plugins/blocks/view/sessions.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/mu-plugins/blocks/view/sessions.php 2019-04-05 10:44:43 UTC (rev 8598)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php 2019-04-05 10:44:58 UTC (rev 8599)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_kses_post( render_featured_image(
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'wordcamp-session-image-container', 'align-' . esc_attr( $attributes['image_align'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> $session,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attributes['featured_image_height'],
- $attributes['featured_image_width']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attributes['featured_image_width'],
+ get_permalink( $session )
</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 endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsponsorsphp"></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/mu-plugins/blocks/view/sponsors.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/mu-plugins/blocks/view/sponsors.php 2019-04-05 10:44:43 UTC (rev 8598)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php 2019-04-05 10:44:58 UTC (rev 8599)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,10 +23,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $attributes['show_logo'] ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo wp_kses_post(
</span><span class="cx" style="display: block; padding: 0 10px"> render_featured_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'wordcamp-sponsor-featured-image' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wordcamp-sponsor-featured-image', 'wordcamp-sponsor-logo' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $sponsor,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attributes['featured_image_height'],
- $attributes['featured_image_width']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attributes['featured_image_width'],
+ get_permalink( $sponsor )
</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 } ?>
</span></span></pre>
</div>
</div>
</body>
</html>