<!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>[39618] trunk/src/wp-content/themes/twentyseventeen: Twenty Seventeen: Improves code readability and code standards in files</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="https://core.trac.wordpress.org/changeset/39618">39618</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39618","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>davidakennedy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-16 22:07:41 +0000 (Fri, 16 Dec 2016)</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'>Twenty Seventeen: Improves code readability and code standards in files
Adds better DocBlock comments and fixes some spacing issues based on PHP_CodeSniffer WordPress coding standards.
Props sstoqnov.
Fixes <a href="https://core.trac.wordpress.org/ticket/39152">#39152</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyseventeencommentsphp">trunk/src/wp-content/themes/twentyseventeen/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccolorpatternsphp">trunk/src/wp-content/themes/twentyseventeen/inc/color-patterns.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomheaderphp">trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomizerphp">trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninctemplatetagsphp">trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeensearchformphp">trunk/src/wp-content/themes/twentyseventeen/searchform.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeensinglephp">trunk/src/wp-content/themes/twentyseventeen/single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsheadersitebrandingphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsnavigationnavigationtopphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentaudiophp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentexcerptphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentgalleryphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentimagephp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentvideophp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyseventeencommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/comments.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/comments.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,24 +30,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( have_comments() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="comments-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments_number = get_comments_number();
- if ( '1' === $comments_number ) {
- /* translators: %s: post title */
- printf( _x( 'One Reply to “%s”', 'comments title', 'twentyseventeen' ), get_the_title() );
- } else {
- printf(
- /* translators: 1: number of comments, 2: post title */
- _nx(
- '%1$s Reply to “%2$s”',
- '%1$s Replies to “%2$s”',
- $comments_number,
- 'comments title',
- 'twentyseventeen'
- ),
- number_format_i18n( $comments_number ),
- get_the_title()
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_number = get_comments_number();
+ if ( '1' === $comments_number ) {
+ /* translators: %s: post title */
+ printf( _x( 'One Reply to “%s”', 'comments title', 'twentyseventeen' ), get_the_title() );
+ } else {
+ printf(
+ /* translators: 1: number of comments, 2: post title */
+ _nx(
+ '%1$s Reply to “%2$s”',
+ '%1$s Replies to “%2$s”',
+ $comments_number,
+ 'comments title',
+ 'twentyseventeen'
+ ),
+ number_format_i18n( $comments_number ),
+ get_the_title()
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/functions.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/functions.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,6 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Seventeen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $link Link to single post/page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string 'Continue reading' link prepended with an ellipsis.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_excerpt_more( $link ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninccolorpatternsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/color-patterns.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/color-patterns.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/color-patterns.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .site-footer .widget-area a,
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .posts-navigation a,
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .widget_authors a strong {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -webkit-box-shadow: inset 0 -1px 0 hsl( ' . $hue . ', ' . $saturation . ', 6% ); /* base: rgba(15, 15, 15, 1); */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: inset 0 -1px 0 hsl( ' . $hue . ', ' . $saturation . ', 6% ); /* base: rgba(15, 15, 15, 1); */
</ins><span class="cx" style="display: block; padding: 0 10px"> box-shadow: inset 0 -1px 0 hsl( ' . $hue . ', ' . $saturation . ', 6% ); /* base: rgba(15, 15, 15, 1); */
</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">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .widget ul li a:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .colors-custom .widget ul li a:hover {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: inset 0 0 0 hsl( ' . $hue . ', ' . $saturation . ', 13% ), 0 3px 0 hsl( ' . $hue . ', ' . $saturation . ', 13% );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- box-shadow: inset 0 0 0 hsl( ' . $hue . ', ' . $saturation. ' , 13% ), 0 3px 0 hsl( ' . $hue . ', ' . $saturation . ', 13% );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ box-shadow: inset 0 0 0 hsl( ' . $hue . ', ' . $saturation . ' , 13% ), 0 3px 0 hsl( ' . $hue . ', ' . $saturation . ', 13% );
</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"> body.colors-custom,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters Twenty Seventeen custom colors CSS.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/custom-header.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,6 +111,8 @@
</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"> * Customize video play/pause button in the custom header.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $settings Video settings.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_video_controls( $settings ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['l10n']['play'] = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,6 +123,8 @@
</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"> * Sanitize the page layout options.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $input Page layout.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_sanitize_page_layout( $input ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $valid = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,11 +141,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"> * Sanitize the colorscheme.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $input Color scheme.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_sanitize_colorscheme( $input ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $valid = array( 'light', 'dark', 'custom' );
</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 ( in_array( $input, $valid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $input, $valid, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $input;
</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="trunksrcwpcontentthemestwentyseventeeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/template-tags.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,8 +128,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Display a front page section.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param $partial WP_Customize_Partial Partial associated with a selective refresh request.
- * @param $id integer Front page section to display.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Partial $partial Partial associated with a selective refresh request.
+ * @param integer $id Front page section to display.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyseventeen_front_page_section( $partial = null, $id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_a( $partial, 'WP_Customize_Partial' ) ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeensearchformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/searchform.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/searchform.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/searchform.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @version 1.0
</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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $unique_id = esc_attr( uniqid( 'search-form-' ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeensinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/single.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/single.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,22 +17,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <main id="main" class="site-main" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* Start the Loop */
- while ( have_posts() ) : the_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Start the Loop */
+ while ( have_posts() ) : the_post();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_template_part( 'template-parts/post/content', get_post_format() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_template_part( 'template-parts/post/content', get_post_format() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If comments are open or we have at least one comment, load up the comment template.
- if ( comments_open() || get_comments_number() ) :
- comments_template();
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() ) :
+ comments_template();
+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- the_post_navigation( array(
- 'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
- 'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ the_post_navigation( array(
+ 'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
+ 'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endwhile; // End of the loop.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endwhile; // End of the loop.
</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="trunksrcwpcontentthemestwentyseventeentemplatepartsheadersitebrandingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $description = get_bloginfo( 'description', 'display' );
- if ( $description || is_customize_preview() ) : ?>
- <p class="site-description"><?php echo $description; ?></p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $description = get_bloginfo( 'description', 'display' );
+
+ if ( $description || is_customize_preview() ) :
+ ?>
+ <p class="site-description"><?php echo $description; ?></p>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-branding-text -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && ! has_nav_menu( 'top' ) ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartsnavigationnavigationtopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,14 @@
</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"> <nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php _e( 'Top Menu', 'twentyseventeen' ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button class="menu-toggle" aria-controls="top-menu" aria-expanded="false"><?php echo twentyseventeen_get_svg( array( 'icon' => 'bars' ) ); echo twentyseventeen_get_svg( array( 'icon' => 'close' ) ); _e( 'Menu', 'twentyseventeen' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button class="menu-toggle" aria-controls="top-menu" aria-expanded="false">
+ <?php
+ echo twentyseventeen_get_svg( array( 'icon' => 'bars' ) );
+ echo twentyseventeen_get_svg( array( 'icon' => 'close' ) );
+ _e( 'Menu', 'twentyseventeen' );
+ ?>
+ </button>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nav_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_location' => 'top',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_id' => 'top-menu',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentaudiophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,22 +14,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_sticky() && is_home() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_sticky() && is_home() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === get_post_type() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-meta">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_posted_on();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_time_link();
</span><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_edit_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</div><!-- .entry-meta -->';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_single() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title">', '</h1>' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,20 +60,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If not a single post, highlight the audio file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $audio ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $audio ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $audio as $audio_html ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-audio">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $audio_html;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div><!-- .entry-audio -->';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><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_single() || empty( $audio ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() || empty( $audio ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,12 +89,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</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">- endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() ) : ?>
- <?php twentyseventeen_entry_footer(); ?>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_single() ) {
+ twentyseventeen_entry_footer();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentexcerptphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'post' === get_post_type() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo twentyseventeen_time_link();
- twentyseventeen_edit_link();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo twentyseventeen_time_link();
+ twentyseventeen_edit_link();
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'page' === get_post_type() && get_edit_post_link() ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentgalleryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,32 +9,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @version 1.0
</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><span class="cx" style="display: block; padding: 0 10px">
</span><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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_sticky() && is_home() ) :
- echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_sticky() && is_home() ) {
+ echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === get_post_type() ) :
- echo '<div class="entry-meta">';
- if ( is_single() ) :
- twentyseventeen_posted_on();
- else :
- echo twentyseventeen_time_link();
- twentyseventeen_edit_link();
- endif;
- echo '</div><!-- .entry-meta -->';
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
+ echo '<div class="entry-meta">';
+ if ( is_single() ) {
+ twentyseventeen_posted_on();
+ } else {
+ echo twentyseventeen_time_link();
+ twentyseventeen_edit_link();
+ };
+ echo '</div><!-- .entry-meta -->';
+ };
</ins><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_single() ) {
- the_title( '<h1 class="entry-title">', '</h1>' );
- } else {
- the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) {
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ } else {
+ the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,18 +49,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If not a single post, highlight the gallery.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_post_gallery() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_gallery() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-gallery">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_post_gallery();
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><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_single() || ! get_post_gallery() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() || ! get_post_gallery() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,12 +76,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</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">- endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() ) : ?>
- <?php twentyseventeen_entry_footer(); ?>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_single() ) {
+ twentyseventeen_entry_footer();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-image.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,26 +9,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @version 1.0
</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><span class="cx" style="display: block; padding: 0 10px">
</span><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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_sticky() && is_home() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_sticky() && is_home() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === get_post_type() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-meta">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_posted_on();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_time_link();
</span><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_edit_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</div><!-- .entry-meta -->';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_single() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title">', '</h1>' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() || '' === get_the_post_thumbnail() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_single() || '' === get_the_post_thumbnail() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only show content if is a single post, or if there's no featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,12 +65,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</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">- endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() ) : ?>
- <?php twentyseventeen_entry_footer(); ?>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_single() ) {
+ twentyseventeen_entry_footer();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentvideophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,26 +9,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @version 1.0
</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><span class="cx" style="display: block; padding: 0 10px">
</span><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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_sticky() && is_home() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_sticky() && is_home() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === get_post_type() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-meta">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_posted_on();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo twentyseventeen_time_link();
</span><span class="cx" style="display: block; padding: 0 10px"> twentyseventeen_edit_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</div><!-- .entry-meta -->';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_single() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title">', '</h1>' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,20 +59,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! is_single() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! is_single() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If not a single post, highlight the video file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $video ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $video ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $video as $video_html ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="entry-video">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $video_html;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><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_single() || empty( $video ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() || empty( $video ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,13 +87,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '<span class="page-number">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() ) : ?>
- <?php twentyseventeen_entry_footer(); ?>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_single() ) {
+ twentyseventeen_entry_footer();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content.php 2016-12-16 20:29:26 UTC (rev 39617)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content.php 2016-12-16 22:07:41 UTC (rev 39618)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,28 +14,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_sticky() && is_home() ) :
- echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_sticky() && is_home() ) :
+ echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+ endif;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' === get_post_type() ) :
- echo '<div class="entry-meta">';
- if ( is_single() ) :
- twentyseventeen_posted_on();
- else :
- echo twentyseventeen_time_link();
- twentyseventeen_edit_link();
- endif;
- echo '</div><!-- .entry-meta -->';
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
+ echo '<div class="entry-meta">';
+ if ( is_single() ) {
+ twentyseventeen_posted_on();
+ } else {
+ echo twentyseventeen_time_link();
+ twentyseventeen_edit_link();
+ };
+ echo '</div><!-- .entry-meta -->';
+ };
</ins><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_single() ) {
- the_title( '<h1 class="entry-title">', '</h1>' );
- } else {
- the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_single() ) {
+ the_title( '<h1 class="entry-title">', '</h1>' );
+ } else {
+ the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,23 +49,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Name of current post */
- the_content( sprintf(
- __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
- get_the_title()
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Name of current post */
+ the_content( sprintf(
+ __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+ get_the_title()
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_link_pages( array(
- 'before' => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
- 'after' => '</div>',
- 'link_before' => '<span class="page-number">',
- 'link_after' => '</span>',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_link_pages( array(
+ 'before' => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+ 'after' => '</div>',
+ 'link_before' => '<span class="page-number">',
+ 'link_after' => '</span>',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_single() ) : ?>
- <?php twentyseventeen_entry_footer(); ?>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( is_single() ) {
+ twentyseventeen_entry_footer();
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre>
</div>
</div>
</body>
</html>