<!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>[8598] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks: WC Blocks: Move shared files to \includes for logical file structure</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/8598">8598</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/8598","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:43 +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: Move shared files to \includes for logical file structure
Files for `featured-image` and `grid-layout` are not pure views and have a lot of php logic inside them. So it makes more sense for them to live inside `includes` folder instead of `shared` folder.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksblocksphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/</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_htmlwpcontentmupluginsblocksincludessharedgridlayoutphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedfeaturedimagephp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/featured-image.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedgridlayoutphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/grid-layout.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksblocksphp"></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/blocks.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/blocks.php 2019-04-05 01:16:28 UTC (rev 8597)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php 2019-04-05 10:44:43 UTC (rev 8598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once PLUGIN_DIR . 'view/shared/grid-layout.php';
- require_once PLUGIN_DIR . 'view/shared/featured-image.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once PLUGIN_DIR . 'includes/shared/grid-layout.php';
+ require_once PLUGIN_DIR . 'includes/shared/featured-image.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/shared.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/organizers.php';
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedfeaturedimagephpfromrev8597sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedfeaturedimagephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/featured-image.php (from rev 8597, sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/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 (rev 0)
+++ 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)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,36 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Blocks\Shared\Components;
+
+/**
+ * Provides render backend for FeaturedImage component.
+ *
+ * @param array $class_names Additional classes to add inside <img> tag.
+ * @param \WP_Post $post Current post object. This will be used to calculate srcset attribute.
+ * @param int $height Height of the image.
+ * @param int $width Width of the image.
+ *
+ * @return string Output markup for featured image.
+ */
+function render_featured_image( $class_names, $post, $height, $width ) {
+ $class_names[] = 'wordcamp-featured-image';
+ $class_names[] = 'wordcamp-featured-image-' . $post->post_name;
+ $class_names = implode( ' ', $class_names );
+ $attachment_id = get_post_thumbnail_id( $post->ID );
+ $image_data = wp_get_attachment_metadata( $attachment_id );
+ $size = 'post-thumbnail';
+ if ( is_array( $image_data ) && isset( $image_data['sizes'] ) && isset( $image_data['sizes']['full'] ) ) {
+ $aspect_ratio = $image_data['sizes']['full']['height'] / $image_data['sizes']['full']['width'];
+ $height = $aspect_ratio * $width;
+ $size = array( $width, $height );
+ }
+
+ return get_the_post_thumbnail(
+ $post,
+ $size,
+ array(
+ 'class' => esc_attr( $class_names ),
+ 'alt' => esc_attr( $post->post_name ),
+ )
+ );
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedgridlayoutphpfromrev8597sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedgridlayoutphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php (from rev 8597, sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/grid-layout.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/grid-layout.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/grid-layout.php 2019-04-05 10:44:43 UTC (rev 8598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,41 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+namespace WordCamp\Blocks\Shared\Components;
+
+/**
+ * @since Blocks v1.0
+ * Provides rendering for grid-layout component.
+ *
+ * @param string $layout Whether the layout is `grid` or `list`.
+ * @param int $columns Number of columns if layout is `grid`. Assumed to be 1 if layout is grid.
+ * @param array $children Array of posts to rendered inside layout. Should be output markup.
+ * @param array $container_classes Array of classes that will be added to container.
+ *
+ * @return string Markup of output layout.
+ */
+function render_grid_layout( $layout, $columns, $children, $container_classes ) {
+ if ( ! is_array( $children ) || count( $children ) === 0 ) {
+ return '';
+ }
+
+ $container_classes[] = 'layout-' . sanitize_html_class( $layout );
+ $container_classes[] = 'wordcamp-block-post-list';
+
+ if ( 'grid' === $layout ) {
+ $container_classes[] = 'grid-columns-' . absint( $columns );
+ }
+ $container_classes = implode( ' ', $container_classes );
+
+ ob_start();
+ ?>
+ <ul class="<?php echo esc_attr( $container_classes ); ?>">
+ <?php foreach ( $children as $child ) { ?>
+ <li class="wordcamp-block-post-list-item wordcamp-grid-layout-item wordcamp-clearfix">
+ <?php printf( wp_kses_post( $child ) ); ?>
+ </li>
+ <?php } ?>
+ </ul>
+ <?php
+
+ return ob_get_clean();
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedfeaturedimagephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/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/view/shared/featured-image.php 2019-04-05 01:16:28 UTC (rev 8597)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/featured-image.php 2019-04-05 10:44:43 UTC (rev 8598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,36 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-namespace WordCamp\Blocks\Shared\Components;
-
-/**
- * Provides render backend for FeaturedImage component.
- *
- * @param array $class_names Additional classes to add inside <img> tag.
- * @param \WP_Post $post Current post object. This will be used to calculate srcset attribute.
- * @param int $height Height of the image.
- * @param int $width Width of the image.
- *
- * @return string Output markup for featured image.
- */
-function render_featured_image( $class_names, $post, $height, $width ) {
- $class_names[] = 'wordcamp-featured-image';
- $class_names[] = 'wordcamp-featured-image-' . $post->post_name;
- $class_names = implode( ' ', $class_names );
- $attachment_id = get_post_thumbnail_id( $post->ID );
- $image_data = wp_get_attachment_metadata( $attachment_id );
- $size = 'post-thumbnail';
- if ( is_array( $image_data ) && isset( $image_data['sizes'] ) && isset( $image_data['sizes']['full'] ) ) {
- $aspect_ratio = $image_data['sizes']['full']['height'] / $image_data['sizes']['full']['width'];
- $height = $aspect_ratio * $width;
- $size = array( $width, $height );
- }
-
- return get_the_post_thumbnail(
- $post,
- $size,
- array(
- 'class' => esc_attr( $class_names ),
- 'alt' => esc_attr( $post->post_name ),
- )
- );
-}
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsharedgridlayoutphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/grid-layout.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/shared/grid-layout.php 2019-04-05 01:16:28 UTC (rev 8597)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/shared/grid-layout.php 2019-04-05 10:44:43 UTC (rev 8598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,41 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-namespace WordCamp\Blocks\Shared\Components;
-
-/**
- * @since Blocks v1.0
- * Provides rendering for grid-layout component.
- *
- * @param string $layout Whether the layout is `grid` or `list`.
- * @param int $columns Number of columns if layout is `grid`. Assumed to be 1 if layout is grid.
- * @param array $children Array of posts to rendered inside layout. Should be output markup.
- * @param array $container_classes Array of classes that will be added to container.
- *
- * @return string Markup of output layout.
- */
-function render_grid_layout( $layout, $columns, $children, $container_classes ) {
- if ( ! is_array( $children ) || count( $children ) === 0 ) {
- return '';
- }
-
- $container_classes[] = 'layout-' . sanitize_html_class( $layout );
- $container_classes[] = 'wordcamp-block-post-list';
-
- if ( 'grid' === $layout ) {
- $container_classes[] = 'grid-columns-' . absint( $columns );
- }
- $container_classes = implode( ' ', $container_classes );
-
- ob_start();
- ?>
- <ul class="<?php echo esc_attr( $container_classes ); ?>">
- <?php foreach ( $children as $child ) { ?>
- <li class="wordcamp-block-post-list-item wordcamp-grid-layout-item wordcamp-clearfix">
- <?php printf( wp_kses_post( $child ) ); ?>
- </li>
- <?php } ?>
- </ul>
- <?php
-
- return ob_get_clean();
-}
</del></span></pre>
</div>
</div>
</body>
</html>